Skip to content

Commit 20514d9

Browse files
AlecRustAlecRust
authored
Fix inconsistent spacing in buttons (hestiacp#3467)
* Fix alignment of Configure Server panel headings * Fix inconsistent spacing in buttons
1 parent 6a6644d commit 20514d9

25 files changed

+157
-96
lines changed

‎web/css/src/themes/default.css‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1844,7 +1844,9 @@
18441844

18451845
.button {
18461846
cursor: pointer;
1847-
display: inline-block;
1847+
display: flex;
1848+
align-items: center;
1849+
justify-content: center;
18481850
line-height: 21px;
18491851
font-size: 0.85rem;
18501852
font-weight: 500;
@@ -2101,6 +2103,10 @@
21012103
top: 0;
21022104
right: 15px;
21032105
}
2106+
2107+
& .fas {
2108+
min-width: 20px;
2109+
}
21042110
}
21052111

21062112
.collapse-content {

‎web/css/src/utilities.css‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,6 @@
7777
margin-right: 10px !important;
7878
}
7979

80-
.u-mr15 {
81-
margin-right: 15px !important;
82-
}
83-
8480
.u-mb5 {
8581
margin-bottom: 5px !important;
8682
}

‎web/css/themes/default.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/pages/edit_server.php‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,20 @@
33
<div class="toolbar-inner">
44
<div class="toolbar-buttons">
55
<a href="/list/server/" class="button button-secondary" id="btn-back">
6-
<i class="fas fa-arrow-left icon-blue"></i>
7-
<?= _("Back") ?>
6+
<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
87
</a>
98
<a href="/list/ip/" class="button button-secondary">
10-
<i class="fas fa-ethernet icon-blue"></i>
11-
<?= _("IP") ?>
9+
<i class="fas fa-ethernet icon-blue"></i><?= _("IP") ?>
1210
</a>
1311
<?php if (isset($_SESSION["FIREWALL_SYSTEM"]) && !empty($_SESSION["FIREWALL_SYSTEM"])) { ?>
1412
<a href="/list/firewall/" class="button button-secondary">
15-
<i class="fas fa-shield-halved icon-red"></i>
16-
<?= _("Firewall") ?>
13+
<i class="fas fa-shield-halved icon-red"></i><?= _("Firewall") ?>
1714
</a>
1815
<?php } ?>
1916
</div>
2017
<div class="toolbar-buttons">
2118
<button type="submit" class="button" form="vstobjects">
22-
<i class="fas fa-floppy-disk icon-purple"></i>
23-
<?= _("Save") ?>
19+
<i class="fas fa-floppy-disk icon-purple"></i><?= _("Save") ?>
2420
</button>
2521
</div>
2622
</div>
@@ -60,8 +56,7 @@
6056
<!-- Basic options section -->
6157
<details class="collapse u-mb10">
6258
<summary class="collapse-header">
63-
<i class="fas fa-gear u-mr15"></i>
64-
<?= _("Basic options") ?>
59+
<i class="fas fa-gear u-mr10"></i><?= _("Basic options") ?>
6560
</summary>
6661
<div class="collapse-content">
6762
<div class="u-mb10">
@@ -139,8 +134,7 @@ class="form-check-input"
139134
<!-- Updates section -->
140135
<details class="collapse u-mb10">
141136
<summary class="collapse-header">
142-
<i class="fas fa-code-branch u-mr15"></i>
143-
<?= _("Updates") ?>
137+
<i class="fas fa-code-branch u-mr10"></i><?= _("Updates") ?>
144138
</summary>
145139
<div class="collapse-content">
146140
<p class="u-mb10">
@@ -219,8 +213,7 @@ class="form-check-input"
219213
<!-- Web Server section -->
220214
<details class="collapse u-mb10">
221215
<summary class="collapse-header">
222-
<i class="fas fa-earth-americas u-mr15"></i>
223-
<?= _("Web Server") ?>
216+
<i class="fas fa-earth-americas u-mr10"></i><?= _("Web Server") ?>
224217
</summary>
225218
<div class="collapse-content">
226219
<?php if (!empty($_SESSION["PROXY_SYSTEM"])) { ?>
@@ -327,8 +320,7 @@ class="form-check-input"
327320
<?php if (!empty($_SESSION["DNS_SYSTEM"])) { ?>
328321
<details class="collapse u-mb10">
329322
<summary class="collapse-header">
330-
<i class="fas fa-book-atlas u-mr15"></i>
331-
<?= _("DNS Server") ?>
323+
<i class="fas fa-book-atlas u-mr10"></i><?= _("DNS Server") ?>
332324
</summary>
333325
<div class="collapse-content">
334326
<p>
@@ -373,8 +365,7 @@ class="form-control"
373365
<?php if (!empty($_SESSION["MAIL_SYSTEM"])) { ?>
374366
<details class="collapse u-mb10">
375367
<summary class="collapse-header">
376-
<i class="fas fa-envelopes-bulk u-mr15"></i>
377-
<?= _("Mail Server") ?>
368+
<i class="fas fa-envelopes-bulk u-mr10"></i><?= _("Mail Server") ?>
378369
</summary>
379370
<div class="collapse-content">
380371
<p>
@@ -498,8 +489,7 @@ class="form-control js-password-input"
498489
<?php if (!empty($_SESSION["DB_SYSTEM"])) { ?>
499490
<details class="collapse u-mb10">
500491
<summary class="collapse-header">
501-
<i class="fas fa-database u-mr15"></i>
502-
<?= _("Databases") ?>
492+
<i class="fas fa-database u-mr10"></i><?= _("Databases") ?>
503493
</summary>
504494
<div class="collapse-content">
505495
<div class="u-mb10">
@@ -664,8 +654,7 @@ class="form-control"
664654
<!-- Backups section -->
665655
<details class="collapse u-mb10">
666656
<summary class="collapse-header">
667-
<i class="fas fa-arrow-rotate-left u-mr15"></i>
668-
<?= _("Backups") ?>
657+
<i class="fas fa-arrow-rotate-left u-mr10"></i><?= _("Backups") ?>
669658
</summary>
670659
<div class="collapse-content">
671660
<div class="u-mb10">
@@ -923,8 +912,7 @@ class="form-control"
923912
<!-- SSL tab -->
924913
<details class="collapse u-mb10">
925914
<summary class="collapse-header">
926-
<i class="fas fa-lock u-mr15"></i>
927-
<?= _("SSL") ?>
915+
<i class="fas fa-lock u-mr10"></i><?= _("SSL") ?>
928916
</summary>
929917
<div class="collapse-content">
930918
<div class="u-mb20">
@@ -995,8 +983,7 @@ class="form-control u-min-height100 u-console"
995983
<!-- Security tab -->
996984
<details class="collapse u-mb10">
997985
<summary class="collapse-header">
998-
<i class="fas fa-key u-mr15"></i>
999-
<?= _("Security") ?>
986+
<i class="fas fa-key u-mr10"></i><?= _("Security") ?>
1000987
</summary>
1001988
<div class="collapse-content">
1002989
<h2 x-on:click="showSystemOptions = !showSystemOptions" class="section-title">
@@ -1326,8 +1313,7 @@ class="form-select"
13261313
<!-- Plugins tab -->
13271314
<details class="collapse u-mb10">
13281315
<summary class="collapse-header">
1329-
<i class="fas fa-puzzle-piece u-mr15"></i>
1330-
<?= _("Hestia Control Panel Plugins") ?>
1316+
<i class="fas fa-puzzle-piece u-mr10"></i><?= _("Hestia Control Panel Plugins") ?>
13311317
</summary>
13321318
<div class="collapse-content">
13331319
<div class="u-mb10">

‎web/templates/pages/edit_server_nginx.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
77
</a>
88
<a href="/edit/server/php/" class="button button-secondary">
9-
<i class="fas fa-pencil icon-orange"></i> <?= _("Configure") ?> PHP
9+
<i class="fas fa-pencil icon-orange"></i><?= _("Configure") ?> PHP
1010
</a>
1111
</div>
1212
<div class="toolbar-buttons">

‎web/templates/pages/edit_web.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</a>
1313
<?php if ($_SESSION["PLUGIN_APP_INSTALLER"] !== "false") { ?>
1414
<a href="/add/webapp/?domain=<?= htmlentities($v_domain) ?>" class="button button-secondary">
15-
<i class="fas fa-magic icon-blue"></i> <?= _("Quick Install App") ?>
15+
<i class="fas fa-magic icon-blue"></i><?= _("Quick Install App") ?>
1616
</a>
1717
<?php } ?>
1818
<button type="submit" class="button" form="vstobjects">

‎web/templates/pages/list_access_keys.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22
<div class="toolbar">
33
<div class="toolbar-inner">
44
<div class="toolbar-buttons">
5-
<a class="button button-secondary" id="btn-back" href="/edit/user/"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
6-
<a href="/add/access-key/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus icon-green"></i><?= _("Add Access Key") ?></a>
5+
<a class="button button-secondary" id="btn-back" href="/edit/user/">
6+
<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
7+
</a>
8+
<a href="/add/access-key/" class="button button-secondary" id="btn-create">
9+
<i class="fas fa-circle-plus icon-green"></i><?= _("Add Access Key") ?>
10+
</a>
711
</div>
812
<div class="toolbar-right">
913
<div class="toolbar-sorting">

‎web/templates/pages/list_backup_exclusions.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22
<div class="toolbar">
33
<div class="toolbar-inner">
44
<div class="toolbar-buttons">
5-
<a class="button button-secondary" id="btn-back" href="/list/backup/"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
6-
<a href="/edit/backup/exclusions/" class="button button-secondary"><i class="fas fa-pencil icon-orange"></i><?= _("Editing Backup Exclusions") ?></a>
5+
<a class="button button-secondary" id="btn-back" href="/list/backup/">
6+
<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
7+
</a>
8+
<a href="/edit/backup/exclusions/" class="button button-secondary">
9+
<i class="fas fa-pencil icon-orange"></i><?= _("Editing Backup Exclusions") ?>
10+
</a>
711
</div>
812
<div class="toolbar-right">
913
<div class="toolbar-search">

‎web/templates/pages/list_dns_rec.php‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,16 @@
22
<div class="toolbar">
33
<div class="toolbar-inner">
44
<div class="toolbar-buttons">
5-
<a class="button button-secondary" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
5+
<a class="button button-secondary" id="btn-back" href="/list/dns/">
6+
<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
7+
</a>
68
<?php if ($read_only !== "true") { ?>
7-
<a href="/add/dns/?domain=<?= htmlentities($_GET["domain"]) ?>" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus icon-green"></i> <?= _("Add Record") ?></a>
8-
<a href="/edit/dns/?domain=<?= htmlentities($_GET["domain"]) ?>" class="button button-secondary" id="btn-create"><i class="fas fa-pencil icon-blue"></i> <?= _("Editing DNS Domain") ?></a>
9+
<a href="/add/dns/?domain=<?= htmlentities($_GET["domain"]) ?>" class="button button-secondary" id="btn-create">
10+
<i class="fas fa-circle-plus icon-green"></i><?= _("Add Record") ?>
11+
</a>
12+
<a href="/edit/dns/?domain=<?= htmlentities($_GET["domain"]) ?>" class="button button-secondary" id="btn-create">
13+
<i class="fas fa-pencil icon-blue"></i><?= _("Editing DNS Domain") ?>
14+
</a>
915
<?php } ?>
1016
</div>
1117
<div class="toolbar-right">

‎web/templates/pages/list_firewall.php‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,19 @@
22
<div class="toolbar">
33
<div class="toolbar-inner">
44
<div class="toolbar-buttons">
5-
<a class="button button-secondary" id="btn-back" href="/edit/server/"><i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?></a>
6-
<a href="/add/firewall/" class="button button-secondary" id="btn-create"><i class="fas fa-circle-plus icon-green"></i><?= _("Add Rule") ?></a>
5+
<a class="button button-secondary" id="btn-back" href="/edit/server/">
6+
<i class="fas fa-arrow-left icon-blue"></i><?= _("Back") ?>
7+
</a>
8+
<a href="/add/firewall/" class="button button-secondary" id="btn-create">
9+
<i class="fas fa-circle-plus icon-green"></i><?= _("Add Rule") ?>
10+
</a>
711
<?php if (!empty($_SESSION["FIREWALL_EXTENSION"])): ?>
8-
<a class="button button-secondary" href="/list/firewall/banlist/"><i class="fas fa-eye icon-red"></i><?= _("list fail2ban") ?></a>
9-
<a class="button button-secondary" href="/list/firewall/ipset/"><i class="fas fa-list icon-blue"></i><?= _("list ipset") ?></a>
12+
<a class="button button-secondary" href="/list/firewall/banlist/">
13+
<i class="fas fa-eye icon-red"></i><?= _("list fail2ban") ?>
14+
</a>
15+
<a class="button button-secondary" href="/list/firewall/ipset/">
16+
<i class="fas fa-list icon-blue"></i><?= _("list ipset") ?>
17+
</a>
1018
<?php endif; ?>
1119
</div>
1220
<div class="toolbar-right">

0 commit comments

Comments
 (0)