Skip to content

Commit 7ff0f81

Browse files
author
Kristan Kenney
committed
Merge branch 'fix/ui-buttons' into main
2 parents d988790 + e1015a8 commit 7ff0f81

Some content is hidden

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

80 files changed

+174
-187
lines changed

install/deb/themes/dark.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,6 @@ a {
7373
padding: 11px 11px;
7474
}
7575

76-
.lang-ar .l-menu__item a {
77-
line-height: 35px;
78-
}
79-
8076
.lang-de .l-menu__item a {
8177
padding: 11px 12px;
8278
}

web/css/src/styles.css

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,10 +1145,6 @@ form#vstobjects .alert {
11451145
text-transform: lowercase;
11461146
}
11471147

1148-
.l-stat__col span {
1149-
padding-left: 15px;
1150-
}
1151-
11521148
.l-stat__col-title {
11531149
text-transform: uppercase;
11541150
font-weight: 600;
@@ -2147,13 +2143,11 @@ body.mobile .l-unit-toolbar__col--right {
21472143
.lang-tw .actions-panel__col a {
21482144
font-size: 0.9rem;
21492145
font-weight: normal;
2150-
line-height: 29px;
21512146
}
21522147

21532148
.lang-ar .actions-panel__col a {
21542149
font-size: 0.9rem;
21552150
font-weight: normal;
2156-
line-height: 31px;
21572151
}
21582152

21592153
.l-unit__col .actions-panel .fas {

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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="l-center edit">
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a class="ui-button cancel" id="btn-back" href="/list/cron/"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
4+
<a class="ui-button cancel" dir="ltr" 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" 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="l-center edit">
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a class="ui-button cancel" id="btn-back" href="/list/db/"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
4+
<a class="ui-button cancel" dir="ltr" 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" 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="l-center edit">
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a class="ui-button cancel" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
4+
<a class="ui-button cancel" dir="ltr" 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" 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="l-center edit">
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<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>
4+
<a class="ui-button cancel" dir="ltr" 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" 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="l-center edit">
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a class="ui-button cancel" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
4+
<a class="ui-button cancel" dir="ltr" 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" 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="l-center edit">
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a class="ui-button cancel" id="btn-back" href="/list/firewall/banlist/"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
4+
<a class="ui-button cancel" dir="ltr" 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" 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_ipset.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="l-center edit">
22
<div class="l-sort clearfix">
33
<div class="l-unit-toolbar__buttonstrip">
4-
<a class="ui-button cancel" id="btn-back" href="/list/firewall/ipset/"><i class="fas fa-arrow-left status-icon blue"></i> <?=_('Back')?></a>
4+
<a class="ui-button cancel" dir="ltr" id="btn-back" href="/list/firewall/ipset/"><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" 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)