Skip to content

Commit 10430bc

Browse files
authored
Set global box-sizing (hestiacp#3002)
* Global box-sizing, better .u-side-by-side * Updates
1 parent 5ede735 commit 10430bc

Some content is hidden

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

54 files changed

+702
-682
lines changed

web/css/src/themes/dark.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,11 @@ div.l-content > div.l-separator:nth-of-type(4) {
602602
color: #d4d4d4;
603603
}
604604

605+
.form-label,
606+
.form-check label {
607+
color: #d4d4d4;
608+
}
609+
605610
.form-control {
606611
background-color: #454545;
607612
border: 1px solid #606060;
@@ -764,7 +769,6 @@ a.vst-text:active b {
764769
border-bottom: none;
765770
color: #326b9b;
766771
font-size: 0.85em !important;
767-
padding: 2px 2px 0;
768772
text-decoration: none;
769773
text-transform: uppercase;
770774
border: none !important;
@@ -1038,7 +1042,7 @@ a.button.cancel {
10381042
color: #fff !important;
10391043
}
10401044

1041-
.page-title {
1045+
.form-title {
10421046
color: #e8e8e8;
10431047
}
10441048

web/css/src/themes/default.css

Lines changed: 52 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,16 @@
142142
/* Base
143143
========================================================================== */
144144

145-
* {
146-
-webkit-tap-highlight-color: transparent;
145+
html {
146+
height: 100%;
147+
box-sizing: border-box;
148+
font-family: sans-serif;
149+
}
150+
151+
*,
152+
*::before,
153+
*::after {
154+
box-sizing: inherit;
147155
}
148156

149157
html,
@@ -155,12 +163,8 @@ button {
155163
-moz-osx-font-smoothing: grayscale;
156164
}
157165

158-
html {
159-
height: 100%;
160-
}
161-
162166
body {
163-
font-family: Exo, Arial, sans-serif;
167+
font-family: Exo, Arial, Helvetica, sans-serif;
164168
font-size: 0.9rem;
165169
height: 100%;
166170
color: #7c7c7c;
@@ -242,7 +246,7 @@ a {
242246
position: fixed;
243247
width: 100%;
244248
z-index: 900;
245-
height: 38px;
249+
height: 39px;
246250
text-shadow: 1px 1px rgb(0 0 0 / 25%);
247251
box-shadow: 0 4px 10px rgb(100 100 100 / 40%);
248252
border-bottom: 1px solid #fff;
@@ -507,7 +511,6 @@ a {
507511
}
508512

509513
.alert {
510-
box-sizing: border-box;
511514
border-radius: 4px;
512515
font-size: 0.8rem;
513516
font-weight: 400;
@@ -578,17 +581,11 @@ a {
578581
justify-content: center;
579582
}
580583

581-
.app-form {
582-
padding: 2em 1em 2em 9rem;
583-
}
584-
585-
.app-form label {
586-
font-size: 0.85rem;
587-
font-weight: 600;
584+
.form-container {
585+
padding: 1em 1em 2em 9rem;
588586
}
589587

590588
.card {
591-
box-sizing: border-box;
592589
overflow: hidden;
593590
background-color: #f5f5f5;
594591
border: 1px solid #d3d3d3;
@@ -629,7 +626,6 @@ a {
629626
}
630627

631628
.card .card-thumb {
632-
box-sizing: border-box;
633629
background-color: #fff;
634630
display: flex;
635631
align-items: center;
@@ -666,7 +662,7 @@ a {
666662
.l-stat__col a {
667663
display: inline-block;
668664
padding-bottom: 36px;
669-
min-height: 70px;
665+
min-height: 113px;
670666
width: 136px;
671667
border-bottom: 4px solid #fff;
672668
overflow: hidden;
@@ -770,7 +766,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
770766
background-color: #fff;
771767
z-index: 120;
772768
margin-top: 181px;
773-
height: 44px;
769+
height: 43px;
774770
}
775771

776772
.l-sort__create-btn {
@@ -1584,6 +1580,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
15841580

15851581
.l-unit__stat-col--left.super-compact {
15861582
width: 50px;
1583+
white-space: nowrap;
15871584
}
15881585

15891586
.l-unit__stat-col--left.compact {
@@ -1926,8 +1923,8 @@ body.mobile .l-icon-shortcuts {
19261923
0 2px 4px rgb(120 120 120 / 25%),
19271924
inset 0 0 1px rgb(255 255 255 / 90%);
19281925
z-index: 200;
1929-
width: 16px;
1930-
height: 16px;
1926+
width: 34px;
1927+
height: 34px;
19311928
text-align: center;
19321929
}
19331930

@@ -1945,8 +1942,8 @@ body.mobile .l-icon-shortcuts {
19451942
0 2px 4px rgb(120 120 120 / 25%),
19461943
inset 0 0 1px rgb(255 255 255 / 90%);
19471944
z-index: 200;
1948-
height: 16px;
1949-
width: 16px;
1945+
height: 34px;
1946+
width: 34px;
19501947
text-align: center;
19511948
}
19521949

@@ -2181,9 +2178,15 @@ body.mobile .l-icon-shortcuts {
21812178
display: inline-block;
21822179
}
21832180

2181+
.form-label,
2182+
.form-check label {
2183+
color: #4b4b4b;
2184+
font-size: .85rem;
2185+
font-weight: 600;
2186+
}
2187+
21842188
.form-control {
21852189
background-color: #fff;
2186-
box-sizing: border-box;
21872190
border: 1px solid #cfcfcf;
21882191
display: block;
21892192
width: 100%;
@@ -2224,7 +2227,6 @@ body.mobile .l-icon-shortcuts {
22242227
}
22252228

22262229
.form-select {
2227-
box-sizing: border-box;
22282230
display: block;
22292231
width: 100%;
22302232
font-weight: normal;
@@ -2384,13 +2386,15 @@ a.vst-text:active b {
23842386
.login-box .vst-advanced {
23852387
border-bottom: none;
23862388
color: #326b9b;
2387-
padding: 2px !important;
23882389
text-decoration: none;
23892390
text-transform: uppercase;
23902391
font-size: 0.85em !important;
23912392
box-shadow: none !important;
23922393
background: none !important;
23932394
border: none !important;
2395+
height: auto !important;
2396+
padding: 0 !important;
2397+
min-width: 0 !important;
23942398
}
23952399

23962400
.lets-encrypt-note {
@@ -2759,14 +2763,9 @@ a.button.cancel {
27592763
box-shadow:
27602764
0 8px 25px rgb(0 0 0 / 30%),
27612765
inset 0 0 2px rgb(255 255 255 / 100%);
2762-
font-family: Exo, Tahoma, Arial, Helvetica, sans-serif;
2763-
margin: 0;
2764-
padding: 0;
2765-
text-align: left;
27662766
vertical-align: top;
27672767
width: 500px;
27682768
border-radius: 6px;
2769-
cursor: default;
27702769
}
27712770

27722771
.login .form-control {
@@ -2783,10 +2782,10 @@ a.button.cancel {
27832782
padding-bottom: 30px !important;
27842783
}
27852784

2786-
.page-title {
2785+
.form-title {
27872786
font-size: 1.4rem;
27882787
font-weight: 500;
2789-
padding-bottom: 20px;
2788+
padding-bottom: 30px;
27902789
letter-spacing: -0.01em;
27912790
}
27922791

@@ -2891,7 +2890,7 @@ div.l-content.collapsed .l-sort {
28912890
.l-content > .units.l-center::before {
28922891
content: "";
28932892
display: block;
2894-
height: 225px;
2893+
height: 224px;
28952894
}
28962895

28972896
.console-output {
@@ -3170,11 +3169,11 @@ form#vstobjects.suspended {
31703169
.search-input {
31713170
background-color: #fff;
31723171
border: 1px solid #ddd;
3173-
height: 26px;
3172+
height: 30px;
31743173
line-height: 28px;
31753174
padding-left: 7px;
31763175
float: left;
3177-
width: 120px;
3176+
width: 130px;
31783177
border-top-left-radius: 4px;
31793178
border-bottom-left-radius: 4px;
31803179
border-right: 0;
@@ -3190,7 +3189,7 @@ form#vstobjects.suspended {
31903189
}
31913190

31923191
.search-input.activated {
3193-
width: 120px;
3192+
width: 150px;
31943193
visibility: visible;
31953194
}
31963195

@@ -3322,7 +3321,6 @@ form#vstobjects.suspended {
33223321
border-top-right-radius: 6px;
33233322
box-shadow: 0 4px 30px rgb(0 0 0 / 50%);
33243323
line-height: 0.9rem;
3325-
cursor: default;
33263324
}
33273325

33283326
.shortcuts .header {
@@ -3360,10 +3358,14 @@ form#vstobjects.suspended {
33603358
line-height: 1.4rem;
33613359
}
33623360

3361+
.shortcuts-inner {
3362+
display: flex;
3363+
width: 100%;
3364+
}
3365+
33633366
.shortcuts ul {
3367+
flex-grow: 1;
33643368
padding: 30px 20px;
3365-
float: left;
3366-
width: 360px;
33673369
}
33683370

33693371
.shortcuts ul li {
@@ -3493,10 +3495,10 @@ form#vstobjects.suspended {
34933495
.helper-container {
34943496
float: right;
34953497
margin-bottom: -450px;
3496-
margin-top: 423px;
3497-
margin-right: 22px;
3498+
margin-top: 420px;
3499+
margin-right: 14px;
34983500
padding-top: 0;
3499-
width: 600px;
3501+
width: 610px;
35003502
box-shadow: 0 1px 4px rgb(0 0 0 / 15%);
35013503
border: 1px solid #cfcfcf;
35023504
border-radius: 4px;
@@ -3558,7 +3560,7 @@ li[aria-expanded="true"] a {
35583560

35593561
.cron-helper-tabs .form-label.first {
35603562
display: inline-block;
3561-
width: 100px;
3563+
width: 120px;
35623564
padding-left: 0;
35633565
}
35643566

@@ -3824,6 +3826,10 @@ li[aria-expanded="true"] a {
38243826
padding-top: 30px !important;
38253827
}
38263828

3829+
.u-pl30 {
3830+
padding-left: 30px !important;
3831+
}
3832+
38273833
.u-pl50 {
38283834
padding-left: 50px !important;
38293835
}
@@ -3850,6 +3856,7 @@ li[aria-expanded="true"] a {
38503856

38513857
.u-side-by-side {
38523858
display: flex !important;
3859+
justify-content: space-between !important;
38533860
align-items: center !important;
38543861
}
38553862

web/css/src/themes/vestia.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ a.vst-text:hover b,
340340

341341
.form-control:focus,
342342
.login .form-control:focus {
343-
border: 1px solid #ff6701;
343+
border-color: #ff6701;
344344
background-color: #fff4ed;
345345
color: #333;
346346
}
@@ -363,7 +363,7 @@ a.vst-text:hover b,
363363
text-align: left;
364364
}
365365

366-
.page-title {
366+
.form-title {
367367
font-weight: 600;
368368
font-size: 1.2rem;
369369
}
@@ -698,7 +698,7 @@ a.vst-advanced:focus {
698698
}
699699

700700
.login .form-control {
701-
border: 1px solid #bbb;
701+
border-color: #bbb;
702702
}
703703

704704
.body-login button.button,

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/css/themes/vestia.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.

0 commit comments

Comments
 (0)