Skip to content

Commit eef1173

Browse files
author
Kristan Kenney
committed
Merge branch 'refactor/v1.4.0-ui-cleanup' into main
2 parents c374942 + d27d338 commit eef1173

Some content is hidden

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

57 files changed

+1204
-1103
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1097,7 +1097,7 @@ a.button.cancel {
10971097
}
10981098

10991099
.page-title {
1100-
color: #dbdbdb !important;
1100+
color: #e8e8e8 !important;
11011101
}
11021102

11031103
.qr-code {

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

Lines changed: 53 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
src: local('Exo Light'), local('Exo-Light'),
1111
url('../../webfonts/exo-v8-latin-ext_latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
1212
url('../../webfonts/exo-v8-latin-ext_latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
13+
font-display: swap;
1314
}
1415

1516
/* exo-300italic - latin-ext_latin */
@@ -20,6 +21,7 @@
2021
src: local('Exo Light Italic'), local('Exo-LightItalic'),
2122
url('../../webfonts/exo-v8-latin-ext_latin-300italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
2223
url('../../webfonts/exo-v8-latin-ext_latin-300italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
24+
font-display: swap;
2325
}
2426

2527
/* exo-regular - latin-ext_latin */
@@ -30,6 +32,7 @@
3032
src: local('Exo Regular'), local('Exo-Regular'),
3133
url('../../webfonts/exo-v8-latin-ext_latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
3234
url('../../webfonts/exo-v8-latin-ext_latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
35+
font-display: swap;
3336
}
3437

3538
/* exo-italic - latin-ext_latin */
@@ -40,6 +43,7 @@
4043
src: local('Exo Italic'), local('Exo-Italic'),
4144
url('../../webfonts/exo-v8-latin-ext_latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
4245
url('../../webfonts/exo-v8-latin-ext_latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
46+
font-display: swap;
4347
}
4448

4549
/* exo-500 - latin-ext_latin */
@@ -50,6 +54,7 @@
5054
src: local('Exo Medium'), local('Exo-Medium'),
5155
url('../../webfonts/exo-v8-latin-ext_latin-500.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
5256
url('../../webfonts/exo-v8-latin-ext_latin-500.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
57+
font-display: swap;
5358
}
5459

5560
/* exo-500italic - latin-ext_latin */
@@ -60,6 +65,7 @@
6065
src: local('Exo Medium Italic'), local('Exo-MediumItalic'),
6166
url('../../webfonts/exo-v8-latin-ext_latin-500italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
6267
url('../../webfonts/exo-v8-latin-ext_latin-500italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
68+
font-display: swap;
6369
}
6470

6571
/* exo-600 - latin-ext_latin */
@@ -70,6 +76,7 @@
7076
src: local('Exo SemiBold'), local('Exo-SemiBold'),
7177
url('../../webfonts/exo-v8-latin-ext_latin-600.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
7278
url('../../webfonts/exo-v8-latin-ext_latin-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
79+
font-display: swap;
7380
}
7481

7582
/* exo-600italic - latin-ext_latin */
@@ -80,6 +87,7 @@
8087
src: local('Exo SemiBold Italic'), local('Exo-SemiBoldItalic'),
8188
url('../../webfonts/exo-v8-latin-ext_latin-600italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
8289
url('../../webfonts/exo-v8-latin-ext_latin-600italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
90+
font-display: swap;
8391
}
8492

8593
/* exo-700 - latin-ext_latin */
@@ -90,6 +98,7 @@
9098
src: local('Exo Bold'), local('Exo-Bold'),
9199
url('../../webfonts/exo-v8-latin-ext_latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
92100
url('../../webfonts/exo-v8-latin-ext_latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
101+
font-display: swap;
93102
}
94103

95104
/* exo-700italic - latin-ext_latin */
@@ -100,6 +109,7 @@
100109
src: local('Exo Bold Italic'), local('Exo-BoldItalic'),
101110
url('../../webfonts/exo-v8-latin-ext_latin-700italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
102111
url('../../webfonts/exo-v8-latin-ext_latin-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
112+
font-display: swap;
103113
}
104114

105115
/* ==========================================================================
@@ -115,6 +125,7 @@
115125
url('../../webfonts/Inconsolata-Bold.woff') format('woff');
116126
font-weight: bold;
117127
font-style: normal;
128+
font-display: swap;
118129
}
119130

120131
/* Inconsolata - latin */
@@ -125,6 +136,7 @@
125136
url('../../webfonts/Inconsolata-Regular.woff') format('woff');
126137
font-weight: normal;
127138
font-style: normal;
139+
font-display: swap;
128140
}
129141

130142
/* Base
@@ -453,7 +465,7 @@ input[type="radio"] {
453465
/* 2 */
454466
margin-left: 0px;
455467
margin-right: 8px;
456-
margin-top: 6px;
468+
margin-top: 2px;
457469
}
458470

459471
/**
@@ -930,7 +942,6 @@ a {
930942
display: block;
931943
font-size: 0.8rem;
932944
font-weight: 400;
933-
margin-top: 1rem;
934945
padding: 0.8rem;
935946
position: relative;
936947
text-align: left;
@@ -1143,7 +1154,7 @@ form#vstobjects .alert {
11431154
}
11441155

11451156
.l-stat__col li {
1146-
color: #a0a0a0;
1157+
color: #7b7b7b;
11471158
margin-bottom: 8px;
11481159
text-transform: lowercase;
11491160
}
@@ -1488,7 +1499,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
14881499
}
14891500

14901501
.l-unit-toolbar__buttonstrip .fas {
1491-
padding-right: 4px;
1502+
padding-right: 6px;
14921503
}
14931504

14941505
.subtitle {
@@ -1629,7 +1640,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
16291640
border-bottom: 1px solid #d0d0d0 !important;
16301641
border-top: 1px solid #d0d0d0 !important;
16311642
text-shadow: 0px 1px rgba(255,255,255,1);
1632-
box-shadow: inset 0px 1px 1px rgba(255,255,255,1), inset 0px 0px 1px rgba(255,255,255,1), inset 0px 0px 4px rgba(255,255,255,0.8), 0px 2px 6px rgba(140,140,140,0.35) !important;
1643+
box-shadow: inset 0 1px 1px rgba(255,255,255,1),inset 0 0 1px rgba(255,255,255,1),inset 0 0 4px rgba(255,255,255,.8),0 1px 4px rgba(140,140,140,.35)!important;
16331644
border-top-left-radius: 0px;
16341645
border-top-right-radius: 0px;
16351646
border-bottom-left-radius: 6px;
@@ -1643,6 +1654,8 @@ div.l-content > div.l-separator:nth-of-type(4) {
16431654
position: sticky;
16441655
top: 145px;
16451656
z-index: 100;
1657+
padding-top: 4px;
1658+
padding-bottom: 4px;
16461659
}
16471660

16481661
.table-header:hover {
@@ -1800,9 +1813,9 @@ div.l-content > div.l-separator:nth-of-type(4) {
18001813

18011814
.l-unit__col {
18021815
display: table-cell;
1803-
padding-top: 15px;
1816+
padding-top: 12px;
18041817
vertical-align: top;
1805-
padding-bottom: 15px;
1818+
padding-bottom: 10px;
18061819
cursor: default;
18071820
}
18081821

@@ -2129,7 +2142,7 @@ body.mobile .l-unit-toolbar__col--right {
21292142
}
21302143

21312144
.actions-panel {
2132-
line-height: 1rem;
2145+
line-height: 1.1rem;
21332146
}
21342147

21352148
.actions-panel__col {
@@ -2169,8 +2182,11 @@ body.mobile .l-unit-toolbar__col--right {
21692182
display: inline-block;
21702183
}
21712184

2185+
.icon-pad-left {
2186+
margin-right: 6px;
2187+
}
21722188
.icon-pad-right {
2173-
margin-right: 5px;
2189+
margin-right: 6px;
21742190
}
21752191

21762192
.l-icon-up-arrow, .l-icon-down-arrow, .l-icon-star, .l-icon-to-top, .l-icon-shortcuts, .l-icon-star-orange, .l-icon-star-blue {
@@ -2503,19 +2519,22 @@ body.mobile .l-icon-shortcuts {
25032519
.data td {
25042520
color: #4b4b4b;
25052521
font-size: 0.85rem;
2506-
padding-bottom: 3px;
2522+
padding-bottom: 6px;
25072523
font-weight: 600;
25082524
}
25092525

25102526
.input-label {
2511-
padding-top: 8px;
2527+
padding-top: 6px;
25122528
}
25132529

25142530
.data input[type="checkbox"] {
25152531
display: inline;
25162532
cursor: pointer;
25172533
}
25182534

2535+
input[type=radio] {
2536+
margin-top: 10px;
2537+
}
25192538
.step-top {
25202539
padding-top: 18px;
25212540
}
@@ -2791,6 +2810,10 @@ a.vst-text:active b{
27912810
text-transform: none;
27922811
}
27932812

2813+
.body-web .vst-advanced:focus {
2814+
background: none !inportant;
2815+
}
2816+
27942817
.login-box .vst-advanced:hover {
27952818
color: #cc3366;
27962819
background-color: transparent;
@@ -2929,7 +2952,7 @@ a.vst-text:active b{
29292952
.hint,
29302953
td.hint {
29312954
color: #777;
2932-
font-size: 0.85rem;
2955+
font-size: 0.8rem;
29332956
font-style: italic;
29342957
font-weight: normal;
29352958
}
@@ -3134,12 +3157,12 @@ a.button.cancel {
31343157
font-size: 0.85rem;
31353158
color: #777;
31363159
border: 1px solid #d9d9d9;
3137-
padding: 0px 5px 12px 20px;
3138-
margin-top: 83px;
3160+
padding: 6px 6px 6px 18px;
3161+
margin-top: 102px;
31393162
min-width: 320px;
31403163
overflow: hidden;
31413164
box-shadow: 0px 1px 4px rgba(0,0,0,0.15);
3142-
border-radius: 5px;
3165+
border-radius: 4px;
31433166
}
31443167

31453168
.mail-infoblock:hover {
@@ -3175,9 +3198,10 @@ a.button.cancel {
31753198
}
31763199

31773200
.additional-info td {
3178-
font-size: 0.8rem;
3179-
height: 22px;
3201+
font-size: 0.75rem;
3202+
height: 20px;
31803203
font-weight: normal;
3204+
line-height: 0.95rem;
31813205
}
31823206

31833207
.additional-info td.details {
@@ -3217,9 +3241,9 @@ a.button.cancel {
32173241
}
32183242

32193243
.page-title {
3220-
font-size: 1.3rem !important;
3221-
font-weight: 400 !important;
3222-
padding-bottom: 30px !important;
3244+
font-size: 1.4rem!important;
3245+
font-weight: 500!important;
3246+
padding-bottom: 30px!important;
32233247
letter-spacing: -0.01em;
32243248
cursor: default;
32253249
}
@@ -3840,10 +3864,10 @@ form#vstobjects.suspended {
38403864
.helper-container {
38413865
float: right;
38423866
margin-bottom: -450px;
3843-
margin-top: 410px;
3867+
margin-top: 420px;
38443868
margin-right: 22px;
3845-
padding-top: 3px;
3846-
width: 563px;
3869+
padding-top: 0px;
3870+
width: 600px;
38473871
box-shadow: 0px 1px 4px rgba(0,0,0,0.15);
38483872
border: 1px solid #cfcfcf;
38493873
border-radius: 4px;
@@ -3967,8 +3991,9 @@ form#vstobjects.suspended {
39673991
}
39683992

39693993
.server-info-name {
3970-
margin-top: 5px;
3971-
margin-bottom: 30px;
3994+
margin-top: 8px;
3995+
margin-bottom: 24px;
3996+
font-weight: 400;
39723997
}
39733998

39743999
.server-info-output {
@@ -3991,7 +4016,9 @@ form#vstobjects.suspended {
39914016
}
39924017

39934018
.userlist-username {
3994-
font-size: 1.05em;
4019+
font-size: 1.0em;
4020+
margin-top: -2px;
4021+
line-height: 1.2rem;
39954022
}
39964023

39974024
.lang-es .userlist-email {

‎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/admin/add_db.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@
5151
</td>
5252
</tr>
5353
<tr>
54-
<td class="step-top hint">
54+
<td class="hint">
5555
<?php print sprintf(_('Prefix %s will be automatically added to database name and database user'),'<b>'.$user.'_</b>'); ?>
5656
</td>
5757
</td>
5858
</tr>
5959
<tr>
60-
<td class="vst-text input-label">
60+
<td class="vst-text step-top input-label">
6161
<?php print _('Database');?>
6262
</td>
6363
</tr>
@@ -83,7 +83,7 @@
8383
</tr>
8484
<tr>
8585
<td class="vst-text input-label">
86-
<?php print _('Password');?> / <a href="javascript:randomString();" class="generate"><?php print _('generate');?></a>
86+
<?php print _('Password');?> <a href="javascript:randomString();" title="<?php print _('generate');?>"><i class="fas fa-sync status-icon green icon-large"></i></a>
8787
</td>
8888
</tr>
8989
<tr>
@@ -94,7 +94,7 @@
9494
</tr>
9595
<tr>
9696
<td class="vst-text">
97-
<?php print _('Your password must have at least');?>
97+
<?php print _('Your password must have at least');?>:
9898
<ul>
9999
<li><?php print _('8 characters long');?></li>
100100
<li><?php print _('1 uppercase & 1 lowercase character');?></li>

‎web/templates/admin/add_dns.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@
8181
</td>
8282
</tr>
8383
<tr>
84-
<td class="vst-text input-label">
84+
<td class="vst-text input-label step-top">
8585
<a href="javascript:elementHideShow('advtable');" class="vst-advanced"><?php print _('Advanced options');?>&nbsp;<i class="fas fa-arrow-circle-right"></i></a>
8686
</td>
8787
</tr>
8888
<tr>
89-
<td class="vst-text">
89+
<td class="vst-text step-top">
9090
<table style="display:<?php if (empty($v_adv)) echo 'none';?> ;" id="advtable">
9191
<tr>
9292
<td class="vst-text input-label">

‎web/templates/admin/add_ip.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
</td>
9696
</tr>
9797
<tr>
98-
<td class="step-left">
98+
<td>
9999
<table style="display:<?php if (empty($v_dedicated)) { echo 'none';} else {echo 'block';}?> ;" id="usrtable">
100100
<tr>
101101
<td class="vst-text input-label">

‎web/templates/admin/add_mail.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
</tr>
8585
<?php } ?>
8686
<tr>
87-
<td class="vst-text input-label">
87+
<td class="vst-text input-label step-top">
8888
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_antispam" <?php if ((empty($v_antispam)) || ($v_antispam == 'yes')) echo "checked=yes"; ?>><?php print _('AntiSpam Support');?></label>
8989
</td>
9090
</tr>
@@ -99,7 +99,7 @@
9999
</td>
100100
</tr>
101101
<tr>
102-
<td class="vst-text step-top">
102+
<td class="vst-text input-label">
103103
<label><input type="checkbox" size="20" class="vst-checkbox" name="v_smtp_relay" <?php if ($v_smtp_relay == 'true') echo "checked=yes"; ?> onclick="javascript:elementHideShow('smtp_relay_table');"><?php print _('SMTP Relay');?></label>
104104
</td>
105105
</tr>

0 commit comments

Comments
 (0)