Skip to content

Commit 4049dfd

Browse files
AlecRustAlecRust
authored
Remove old script reference, tidy some CSS (hestiacp#3117)
1 parent 0cbae2d commit 4049dfd

File tree

16 files changed

+260
-229
lines changed

16 files changed

+260
-229
lines changed

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
},
2424
"devDependencies": {
2525
"@prettier/plugin-php": "^0.19.2",
26-
"@typescript-eslint/eslint-plugin": "^5.45.0",
27-
"@typescript-eslint/parser": "^5.45.0",
26+
"@typescript-eslint/eslint-plugin": "^5.45.1",
27+
"@typescript-eslint/parser": "^5.45.1",
2828
"cssnano": "^5.1.14",
2929
"eslint": "^8.29.0",
3030
"eslint-config-prettier": "^8.5.0",
@@ -45,7 +45,7 @@
4545
"stylelint-config-prettier": "^9.0.4",
4646
"stylelint-config-standard": "^29.0.0",
4747
"typescript": "^4.9.3",
48-
"vitepress": "1.0.0-alpha.29",
48+
"vitepress": "1.0.0-alpha.30",
4949
"vue": "^3.2.45"
5050
}
5151
}

‎web/css/src/themes/dark.css‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,15 +208,14 @@ strong {
208208
========================================================================== */
209209

210210
.card {
211-
background: #454545;
212-
color: #fafafa;
213-
text-shadow: 0 1px rgb(0 0 0 / 95%) !important;
211+
background-color: #454545;
214212
border-color: #606060;
215213
box-shadow: 0 1px 4px rgb(0 0 0 / 20%), inset 0 0 60px rgb(0 0 0 / 25%);
216214
}
217215

218-
.card-title {
216+
.card-content {
219217
color: #fafafa;
218+
text-shadow: 0 1px rgb(0 0 0 / 95%) !important;
220219
}
221220

222221
/* Toolbar

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

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,15 @@
7979
box-shadow: 0 4px 10px rgb(100 100 100 / 40%);
8080
border-bottom: 1px solid #fff;
8181
position: fixed;
82-
width: 100%;
82+
display: flex;
83+
size: 100% 40px;
8384
z-index: 2;
8485
top: 0;
8586
}
8687

8788
.top-bar-inner {
8889
display: flex;
89-
height: 40px;
90+
flex-grow: 1;
9091
padding-left: 20px;
9192
padding-right: 20px;
9293
justify-content: space-between;
@@ -652,15 +653,14 @@
652653
background-color: #f5f5f5;
653654
border: 1px solid #d3d3d3;
654655
box-shadow: 0 1px 4px rgb(0 0 0 / 20%);
655-
color: #353535;
656656
border-radius: 4px;
657657
margin-bottom: 20px;
658658

659659
@media (--viewport-small) {
660660
margin-bottom: 0;
661661
}
662662

663-
&.disable {
663+
&.disabled {
664664
color: #b6b6b6;
665665

666666
& .card-thumb {
@@ -670,17 +670,6 @@
670670
}
671671
}
672672

673-
.card-details {
674-
padding: 10px;
675-
border-top: 1px solid #e6e6e6;
676-
text-align: center;
677-
}
678-
679-
.card-title {
680-
font-size: 1rem;
681-
font-weight: 600;
682-
}
683-
684673
.card-thumb {
685674
background-color: #fff;
686675
display: flex;
@@ -695,6 +684,18 @@
695684
}
696685
}
697686

687+
.card-content {
688+
padding: 10px;
689+
color: #353535;
690+
border-top: 1px solid #e6e6e6;
691+
text-align: center;
692+
}
693+
694+
.card-title {
695+
font-size: 1rem;
696+
font-weight: 600;
697+
}
698+
698699
/* Toolbar
699700
========================================================================== */
700701

@@ -1313,18 +1314,18 @@
13131314
box-shadow: none !important;
13141315
background: none !important;
13151316
}
1316-
}
13171317

1318-
.l-unit__stats table {
1319-
table-layout: fixed;
1320-
margin-top: -54px;
1321-
margin-left: -20px;
1322-
}
1318+
& table {
1319+
table-layout: fixed;
1320+
margin-top: -54px;
1321+
margin-left: -20px;
1322+
}
13231323

1324-
.l-unit__stats td {
1325-
height: 32px;
1326-
padding-bottom: 4px;
1327-
vertical-align: middle;
1324+
& td {
1325+
height: 32px;
1326+
padding-bottom: 4px;
1327+
vertical-align: middle;
1328+
}
13281329
}
13291330

13301331
.body-stats .l-unit__stat-col--left {
@@ -1539,6 +1540,9 @@
15391540
padding-right: 4px;
15401541
}
15411542

1543+
/* Spinner
1544+
========================================================================== */
1545+
15421546
.spinner {
15431547
-webkit-mask-box-image: radial-gradient(
15441548
center,
@@ -1668,10 +1672,6 @@
16681672
}
16691673
}
16701674

1671-
.paused div {
1672-
animation-play-state: paused;
1673-
}
1674-
16751675
/* Forms
16761676
========================================================================== */
16771677

@@ -1816,10 +1816,6 @@
18161816
border-color: #cfcfcf;
18171817
}
18181818

1819-
#advanced-options .u-console {
1820-
min-height: 600px;
1821-
}
1822-
18231819
.generate {
18241820
color: #326b9b;
18251821
text-decoration: underline;

‎web/css/src/utilities.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@
125125
min-height: 300px !important;
126126
}
127127

128+
.u-min-height600 {
129+
min-height: 600px !important;
130+
}
131+
128132
.u-side-by-side {
129133
display: flex !important;
130134
justify-content: space-between !important;

‎web/css/themes/dark.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/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/includes/js.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<script defer src="/js/vendor/jquery-ui.min.js?<?=JS_LATEST_UPDATE?>"></script>
66
<script defer src="/js/vendor/chart.min.js?<?=JS_LATEST_UPDATE?>"></script>
77
<script defer src="/js/events.js?<?=JS_LATEST_UPDATE?>"></script>
8-
<script defer src="/js/app.js?<?=JS_LATEST_UPDATE?>"></script>
98
<script defer src="/js/init.js?<?=JS_LATEST_UPDATE?>"></script>
109
<script>
1110
// TODO: REMOVE
@@ -48,4 +47,3 @@
4847
require_once($customScript->getPathname());
4948
}
5049
} ?>
51-

‎web/templates/pages/edit_mail.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class="<?=$v_status?>"
3939
<input type="text" class="form-control" name="v_domain" id="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>" disabled>
4040
<input type="hidden" name="v_domain" value="<?=htmlentities(trim($v_domain, "'"))?>">
4141
</div>
42-
<?php if($_SESSION['WEBMAIL_SYSTEM']){?>
42+
<?php if($_SESSION['WEBMAIL_SYSTEM']) {?>
4343
<div class="u-mb10">
4444
<label for="v_webmail" class="form-label"><?=_('Webmail Client');?></label>
4545
<select class="form-select" name="v_webmail" id="v_webmail" tabindex="6">
@@ -132,16 +132,16 @@ class="<?=$v_status?>"
132132
<textarea x-bind:disabled="!letsEncryptEnabled" class="form-control u-min-height100 u-console" name="v_ssl_ca" id="v_ssl_ca"><?=htmlentities(trim($v_ssl_ca, "'"))?></textarea>
133133
</div>
134134
</div>
135-
<?php if ($v_ssl != 'no' ) { ?>
135+
<?php if ($v_ssl != 'no') {?>
136136
<ul class="values-list">
137137
<li class="values-list-item">
138138
<span class="values-list-label"><?=_('SUBJECT');?></span>
139139
<span class="values-list-value"><?=htmlentities($v_ssl_subject);?></span>
140140
</li>
141-
<?php if ($v_ssl_aliases){?>
141+
<?php if ($v_ssl_aliases) {?>
142142
<li class="values-list-item">
143143
<span class="values-list-label"><?=_('Aliases');?></span>
144-
<span class="values-list-value"><?=htmlentities($v_ssl_aliases)?></span>
144+
<span class="values-list-value"><?=htmlentities($v_ssl_aliases);?></span>
145145
</li>
146146
<?php } ?>
147147
<li class="values-list-item">
@@ -165,7 +165,7 @@ class="<?=$v_status?>"
165165
<span class="values-list-value"><?=htmlentities($v_ssl_issuer)?></span>
166166
</li>
167167
</ul>
168-
<? } // if ssl is enabled ?>
168+
<?php } ?>
169169
</div>
170170
<div class="form-check u-mb10">
171171
<input x-model="hasSmtpRelay" class="form-check-input" type="checkbox" name="v_smtp_relay" id="v_smtp_relay">

‎web/templates/pages/edit_server.php‎

Lines changed: 49 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -157,22 +157,31 @@
157157
<div class="collapse-content">
158158
<?php if (!empty($_SESSION['PROXY_SYSTEM'])) { ?>
159159
<p>
160-
<?=_('Proxy Server');?>: <span class="optional"><?=$_SESSION['PROXY_SYSTEM']; ?> <a href="/edit/server/<? echo $_SESSION['PROXY_SYSTEM'] ?>/"><i class="fas fa-pencil status-icon orange icon-pad-right"></i></a></span>
160+
<?=_('Proxy Server');?>: <span class="u-ml5"><?=$_SESSION['PROXY_SYSTEM']; ?></span>
161+
<a href="/edit/server/<? echo $_SESSION['PROXY_SYSTEM'] ?>/" class="u-ml5">
162+
<i class="fas fa-pencil status-icon orange"></i>
163+
</a>
161164
</p>
162165
<?php } ?>
163166
<?php if (!empty($_SESSION['WEB_SYSTEM'])) { ?>
164167
<p>
165-
<?=_('Web Server');?>: <span class="optional"><?=$_SESSION['WEB_SYSTEM']; ?> <a href="/edit/server/<? echo $_SESSION['WEB_SYSTEM'] ?>/"><i class="fas fa-pencil status-icon orange icon-pad-right"></i></a></span>
168+
<?=_('Web Server');?>: <span class="u-ml5"><?=$_SESSION['WEB_SYSTEM']; ?></span>
169+
<a href="/edit/server/<? echo $_SESSION['WEB_SYSTEM'] ?>/" class="u-ml5">
170+
<i class="fas fa-pencil status-icon orange"></i>
171+
</a>
166172
</p>
167173
<?php } ?>
168174
<?php if (!empty($_SESSION['WEB_BACKEND'])) { ?>
169175
<p>
170-
<?=_('Backend Server');?>: <span class="optional"><?=$_SESSION['WEB_BACKEND']; ?> <a href="/edit/server/<? echo $_SESSION['WEB_BACKEND'] ?>/"><i class="fas fa-pencil status-icon orange icon-pad-right"></i></a></span>
176+
<?=_('Backend Server');?>: <span class="u-ml5"><?=$_SESSION['WEB_BACKEND']; ?></span>
177+
<a href="/edit/server/<? echo $_SESSION['WEB_BACKEND'] ?>/" class="u-ml5">
178+
<i class="fas fa-pencil status-icon orange"></i>
179+
</a>
171180
</p>
172181
<?php } ?>
173182
<?php if (!empty($_SESSION['WEB_BACKEND_POOL'])) { ?>
174183
<p>
175-
<?=_('Backend Pool Mode');?>: <span class="optional"><?=$_SESSION['WEB_BACKEND_POOL']; ?></span>
184+
<?=_('Backend Pool Mode');?>: <span class="u-ml5"><?=$_SESSION['WEB_BACKEND_POOL']; ?></span>
176185
</p>
177186
<?php } ?>
178187
<?php if(count($v_php_versions)): ?>
@@ -234,10 +243,13 @@
234243
</summary>
235244
<div class="collapse-content">
236245
<p>
237-
<?=_('DNS Server');?>: <span class="optional"><?=$_SESSION['DNS_SYSTEM']; ?> <a href="/edit/server/<? echo $_SESSION['DNS_SYSTEM'] ?>/"><i class="fas fa-pencil status-icon orange icon-pad-right"></i></a></span>
246+
<?=_('DNS Server');?>: <span class="u-ml5"><?=$_SESSION['DNS_SYSTEM']; ?></span>
247+
<a href="/edit/server/<? echo $_SESSION['DNS_SYSTEM'] ?>/" class="u-ml5">
248+
<i class="fas fa-pencil status-icon orange"></i>
249+
</a>
238250
</p>
239251
<p>
240-
<?=_('DNS Cluster');?>: <span class="optional"><?php if ($v_dns_cluster == 'yes') { echo _('Yes'); } else { echo _('No'); } ?></span>
252+
<?=_('DNS Cluster');?>: <span class="u-ml5"><?php if ($v_dns_cluster == 'yes') { echo _('Yes'); } else { echo _('No'); } ?></span>
241253
</p>
242254
<?php if ($v_dns_cluster == 'yes') {
243255
$i = 0;
@@ -261,16 +273,25 @@
261273
</summary>
262274
<div class="collapse-content">
263275
<p>
264-
<?=_('Mail Server');?>: <span class="optional"><?=$_SESSION['MAIL_SYSTEM']; ?> <a href="/edit/server/<? echo $_SESSION['MAIL_SYSTEM'] ?>/"><i class="fas fa-pencil status-icon orange icon-pad-right"></i></a></span>
276+
<?=_('Mail Server');?>: <span class="u-ml5"><?=$_SESSION['MAIL_SYSTEM']; ?></span>
277+
<a href="/edit/server/<? echo $_SESSION['MAIL_SYSTEM'] ?>/" class="u-ml5">
278+
<i class="fas fa-pencil status-icon orange"></i>
279+
</a>
265280
</p>
266281
<?php if (!empty($_SESSION['ANTIVIRUS_SYSTEM'])) { ?>
267282
<p>
268-
<?=_('Antivirus');?>: <span class="optional"><?=$_SESSION['ANTIVIRUS_SYSTEM']; ?> <a href="/edit/server/<? echo $_SESSION['ANTIVIRUS_SYSTEM'] ?>/"><i class="fas fa-pencil status-icon orange icon-pad-right"></i></a></span>
283+
<?=_('Antivirus');?>: <span class="u-ml5"><?=$_SESSION['ANTIVIRUS_SYSTEM']; ?></span>
284+
<a href="/edit/server/<? echo $_SESSION['ANTIVIRUS_SYSTEM'] ?>/" class="u-ml5">
285+
<i class="fas fa-pencil status-icon orange"></i>
286+
</a>
269287
</p>
270288
<?php } ?>
271289
<?php if (!empty($_SESSION['ANTISPAM_SYSTEM'])) { ?>
272290
<p>
273-
<?=_('AntiSpam');?>: <span class="optional"><?=$_SESSION['ANTISPAM_SYSTEM']; ?> <a href="/edit/server/<? echo $_SESSION['ANTISPAM_SYSTEM'] ?>/"><i class="fas fa-pencil status-icon orange icon-pad-right"></i></a></span>
291+
<?=_('AntiSpam');?>: <span class="u-ml5"><?=$_SESSION['ANTISPAM_SYSTEM']; ?></span>
292+
<a href="/edit/server/<? echo $_SESSION['ANTISPAM_SYSTEM'] ?>/" class="u-ml5">
293+
<i class="fas fa-pencil status-icon orange"></i>
294+
</a>
274295
</p>
275296
<?php } ?>
276297
<?php if($_SESSION['WEBMAIL_SYSTEM']){?>
@@ -320,7 +341,7 @@
320341
<div class="collapse-content">
321342
<div class="u-mb10">
322343
<label for="v_mysql" class="form-label">
323-
<?=_('MySQL Support');?> <a href="/edit/server/mysql/"><i class="fas fa-pencil status-icon orange icon-pad-right"></i></a>
344+
<?=_('MySQL Support');?> <a href="/edit/server/mysql/" class="u-ml5"><i class="fas fa-pencil status-icon orange"></i></a>
324345
</label>
325346
<select class="form-select" name="v_mysql" id="v_mysql" disabled>
326347
<option value="no"><?=_('No');?></option>
@@ -377,7 +398,7 @@
377398
<?php if ($v_pgsql == 'yes') { ?>
378399
<div class="u-mb10">
379400
<label for="v_pgsql" class="form-label">
380-
<?=_('PostgreSQL Support');?> <a href="/edit/server/postgresql/"><i class="fas fa-pencil status-icon orange icon-pad-right"></i></a>
401+
<?=_('PostgreSQL Support');?> <a href="/edit/server/postgresql/" class="u-ml5"><i class="fas fa-pencil status-icon orange"></i></a>
381402
</label>
382403
<select class="form-select" name="v_pgsql" id="v_pgsql" disabled>
383404
<option value="no"><?=_('No');?></option>
@@ -434,7 +455,10 @@
434455
</div>
435456
<div class="u-mb10">
436457
<label for="v_backup_mode" class="form-label">
437-
<?=_('Compression');?> <a target="_blank" href="http://docs.hestiacp.com/admin_docs/backups.html#what-is-the-difference-between-zstd-and-gzip"><i class="fas fa-circle-question"></i></a>
458+
<?=_('Compression');?>
459+
<a target="_blank" class="u-ml5" href="http://docs.hestiacp.com/admin_docs/backups.html#what-is-the-difference-between-zstd-and-gzip">
460+
<i class="fas fa-circle-question"></i>
461+
</a>
438462
</label>
439463
<select class="form-select" name="v_backup_mode" id="v_backup_mode">
440464
<option value="gzip" <?php if($v_backup_mode != 'zstd') echo 'selected' ?>>gzip</option>
@@ -443,7 +467,10 @@
443467
</div>
444468
<div class="u-mb10">
445469
<label for="v_backup_gzip" class="form-label">
446-
<?=_('Compression level');?> <a target="_blank" href="http://docs.hestiacp.com/admin_docs/backups.html#what-is-the-optimal-compression-ratio"><i class="fas fa-circle-question"></i></a>
470+
<?=_('Compression level');?>
471+
<a target="_blank" class="u-ml5" href="http://docs.hestiacp.com/admin_docs/backups.html#what-is-the-optimal-compression-ratio">
472+
<i class="fas fa-circle-question"></i>
473+
</a>
447474
</label>
448475
<select class="form-select" name="v_backup_gzip" id="v_backup_gzip">
449476
<?php for ($level = 1; $level < 20; $level++) { ?>
@@ -453,7 +480,10 @@
453480
</div>
454481
<div class="u-mb20">
455482
<label for="v_backup_dir" class="form-label">
456-
<?=_('Directory');?> <a target="_blank" href="https://docs.hestiacp.com/admin_docs/backups.html#how-to-change-default-backup-folder"><i class="fas fa-circle-question"></i></a>
483+
<?=_('Directory');?>
484+
<a target="_blank" class="u-ml5" href="https://docs.hestiacp.com/admin_docs/backups.html#how-to-change-default-backup-folder">
485+
<i class="fas fa-circle-question"></i>
486+
</a>
457487
</label>
458488
<input type="text" class="form-control" name="v_backup_dir" id="v_backup_dir" value="<?=trim($v_backup_dir, "'")?>" disabled="disabled">
459489
</div>
@@ -466,7 +496,10 @@
466496
<div x-cloak x-show="remoteBackupEnabled" id="remote_backup" class="u-pl30 u-mt20">
467497
<div class="u-mb10">
468498
<label for="backup_type" class="form-label">
469-
<?=_('Protocol');?> <a target="_blank" href="http://docs.hestiacp.com/admin_docs/backups.html#what-kind-of-protocols-are-currently-supported"><i class="fas fa-circle-question"></i></a>
499+
<?=_('Protocol');?>
500+
<a target="_blank" class="u-ml5" href="http://docs.hestiacp.com/admin_docs/backups.html#what-kind-of-protocols-are-currently-supported">
501+
<i class="fas fa-circle-question"></i>
502+
</a>
470503
</label>
471504
<select class="form-select" name="v_backup_type" id="backup_type">
472505
<option value='ftp'><?=_('ftp');?></option>
@@ -549,7 +582,7 @@
549582
<span class="values-list-label"><?=_('SUBJECT');?></span>
550583
<span class="values-list-value"><?=$v_ssl_subject?></span>
551584
</li>
552-
<?php if ($v_ssl_aliases){?>
585+
<?php if ($v_ssl_aliases) {?>
553586
<li class="values-list-item">
554587
<span class="values-list-label"><?=_('Aliases');?></span>
555588
<span class="values-list-value"><?=$v_ssl_aliases?></span>

‎web/templates/pages/edit_server_mysql.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
</div>
5656
<div class="u-mb20">
5757
<label for="v_config" class="form-label"><?=$v_config_path;?></label>
58-
<textarea class="form-control u-min-height300 u-allow-resize u-console" name="v_config" id="v_config"><?=$v_config;?></textarea>
58+
<textarea class="form-control u-min-height600 u-allow-resize u-console" name="v_config" id="v_config"><?=$v_config;?></textarea>
5959
</div>
6060
<div class="form-check">
6161
<input class="form-check-input" type="checkbox" name="v_restart" id="v_restart" checked>

0 commit comments

Comments
 (0)