Skip to content

Commit e1b8d61

Browse files
author
Kristan Kenney
committed
Merge branch 'fixes/ui' into staging/fixes
2 parents 311b723 + 8e120f0 commit e1b8d61

File tree

87 files changed

+205
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+205
-191
lines changed

‎install/deb/templates/web/awstats/nav.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<body>
1111
<table width="100%" border="0" cellspacing="0" cellpadding="0">
1212
<tr>
13-
<td><img src="logo.svg" alt="hestia"></td>
13+
<td><img src="logo.svg" title="Hestia Control Panel"></td>
1414
<td><form name="period" action="" method="get">
1515
<select name="select" ONCHANGE="change()">
1616
%select_month%

‎install/deb/themes/dark.css‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,8 +506,17 @@ div.l-content > div.l-separator:nth-of-type(4) {
506506

507507
.units .l-unit.l-unit--outdated {
508508
color: #d4d4d4;
509+
background-color: #760000;
509510
}
510511

512+
.l-unit--outdated.selected {
513+
background: #b70000 !important;
514+
color: #fff !important;
515+
text-shadow: none !important;
516+
}
517+
.l-unit--outdated.selected b {
518+
color: #fff !important;
519+
}
511520
.l-unit--suspended .l-unit__name,
512521
.l-unit--suspended b,
513522
.l-unit--outdated .l-unit__name,

‎web/css/src/styles.css‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1712,8 +1712,6 @@ div.l-content > div.l-separator:nth-of-type(4) {
17121712
.units .l-unit.l-unit--outdated {
17131713
background-color: #ffcaca;
17141714
color: #4b4b4b;
1715-
border-left: 5px solid #ff6f6f;
1716-
border-bottom: 1px solid #fff;
17171715
}
17181716

17191717
.l-unit--suspended .l-unit__name,
@@ -1755,8 +1753,9 @@ div.l-content > div.l-separator:nth-of-type(4) {
17551753
}
17561754

17571755
.l-unit--outdated.selected {
1758-
background: #765D5D !important;
1756+
background: #ff9494 !important;
17591757
color: #333 !important;
1758+
text-shadow: none !important;
17601759
}
17611760

17621761
.l-unit--suspended.selected .l-unit__name,
@@ -1979,6 +1978,12 @@ div.l-content > div.l-separator:nth-of-type(4) {
19791978
border-left: 1px solid transparent;
19801979
}
19811980

1981+
.l-unit__stat-col--left.truncate {
1982+
overflow: hidden;
1983+
text-overflow: ellipsis;
1984+
white-space: nowrap;
1985+
}
1986+
19821987
.l-unit__stat-col--left.super-compact {
19831988
width: 50px;
19841989
}

‎web/css/styles.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎web/templates/admin/add_cron.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<a class="ui-button cancel" id="btn-back" href="/list/cron/"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
55
</div>
66
<div class="l-unit-toolbar__buttonstrip float-right">
7-
<a href="#" class="ui-button" title="<?=_('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=_('Save')?></a>
7+
<a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=_('Save')?></a>
88
</div>
99
</div>
1010
</div>

‎web/templates/admin/add_db.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<a class="ui-button cancel" id="btn-back" href="/list/db/"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
55
</div>
66
<div class="l-unit-toolbar__buttonstrip float-right">
7-
<a href="#" class="ui-button" title="<?=_('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=_('Save')?></a>
7+
<a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=_('Save')?></a>
88
</div>
99
</div>
1010
</div>

‎web/templates/admin/add_dns.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<a class="ui-button cancel" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
55
</div>
66
<div class="l-unit-toolbar__buttonstrip float-right">
7-
<a href="#" class="ui-button" title="<?=_('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=_('Save')?></a>
7+
<a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=_('Save')?></a>
88
</div>
99
</div>
1010
</div>

‎web/templates/admin/add_dns_rec.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<a class="ui-button cancel" id="btn-back" href="/list/dns/?domain=<?=htmlentities(trim($v_domain, "'"))?>&token=<?=$_SESSION['token']?>"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
55
</div>
66
<div class="l-unit-toolbar__buttonstrip float-right">
7-
<a href="#" class="ui-button" title="<?=_('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=_('Save')?></a>
7+
<a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=_('Save')?></a>
88
</div>
99
</div>
1010
</div>

‎web/templates/admin/add_firewall.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<a class="ui-button cancel" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
55
</div>
66
<div class="l-unit-toolbar__buttonstrip float-right">
7-
<a href="#" class="ui-button" title="<?=_('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=_('Save')?></a>
7+
<a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=_('Save')?></a>
88
</div>
99
</div>
1010
</div>

‎web/templates/admin/add_firewall_banlist.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<a class="ui-button cancel" id="btn-back" href="/list/firewall/banlist/"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
55
</div>
66
<div class="l-unit-toolbar__buttonstrip float-right">
7-
<a href="#" class="ui-button" title="<?=_('Save')?>" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=_('Save')?></a>
7+
<a href="#" class="ui-button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i> <?=_('Save')?></a>
88
</div>
99
</div>
1010
</div>

0 commit comments

Comments
 (0)