Skip to content

Commit 7ccb451

Browse files
authored
Merge pull request hestiacp#3010 from hestiacp/tidy-css
Tidy font sizing CSS
2 parents fc2c96e + ff38645 commit 7ccb451

File tree

8 files changed

+44
-110
lines changed

8 files changed

+44
-110
lines changed

web/css/src/themes/dark.css

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ select {
139139
background-color: #ff3478;
140140
}
141141

142-
.notification-container .unseen .title a,
143-
.notification-container .unseen .title {
142+
.notification-container .unseen .notification-title a,
143+
.notification-container .unseen .notification-title {
144144
color: #fff !important;
145145
}
146146

@@ -382,10 +382,6 @@ div.l-content > div.l-separator:nth-of-type(4) {
382382
.l-unit-toolbar__buttonstrip .fas {
383383
}
384384

385-
.subtitle {
386-
color: #ff3478;
387-
}
388-
389385
.l-select {
390386
border: 1px solid #454545;
391387
box-shadow: 0 1px 1px rgb(0 0 0 / 40%) !important;
@@ -546,11 +542,6 @@ div.l-content > div.l-separator:nth-of-type(4) {
546542
color: #707070 !important;
547543
}
548544

549-
.l-unit-ft .subtitle,
550-
.l-unit .subtitle {
551-
color: #ff3478;
552-
}
553-
554545
.l-unit__name {
555546
color: #dadada;
556547
}
@@ -568,15 +559,6 @@ div.l-content > div.l-separator:nth-of-type(4) {
568559
color: #fff;
569560
}
570561

571-
.title b,
572-
.title {
573-
color: #ff3478;
574-
}
575-
576-
.title {
577-
578-
}
579-
580562
/* form styles */
581563

582564
.vst-error {
@@ -1265,14 +1247,10 @@ form#vstobjects.suspended {
12651247
border-bottom: none !important;
12661248
}
12671249

1268-
.shortcuts .header {
1250+
.shortcuts-header {
12691251
border-bottom: 1px solid #353535;
12701252
}
12711253

1272-
.shortcuts .title {
1273-
1274-
}
1275-
12761254
.shortcuts .close {
12771255

12781256
}

web/css/src/themes/default.css

Lines changed: 27 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ a {
453453
display: inline-block;
454454
}
455455

456-
.notification-container .title {
456+
.notification-container .notification-title {
457457
color: #9e9e9e;
458458
font-weight: 600;
459459
line-height: 30px;
@@ -463,20 +463,20 @@ a {
463463
display: block;
464464
}
465465

466-
.notification-container .title a {
466+
.notification-container .notification-title a {
467467
color: #9e9e9e;
468468
}
469469

470-
.notification-container .unseen .title a,
471-
.notification-container .unseen .title {
470+
.notification-container .unseen .notification-title a,
471+
.notification-container .unseen .notification-title {
472472
color: #c36;
473473
}
474474

475-
.notification-container .unseen .title a:hover {
475+
.notification-container .unseen .notification-title a:hover {
476476
color: #e83b75;
477477
}
478478

479-
.notification-container .unseen .title a:active {
479+
.notification-container .unseen .notification-title a:active {
480480
color: #e83b75;
481481
}
482482

@@ -512,7 +512,6 @@ a {
512512

513513
.alert {
514514
border-radius: 4px;
515-
font-size: 0.8rem;
516515
font-weight: 400;
517516
padding: 0.8rem;
518517
position: relative;
@@ -581,10 +580,6 @@ a {
581580
justify-content: center;
582581
}
583582

584-
.form-container {
585-
padding: 1em 1em 2em 9rem;
586-
}
587-
588583
.card {
589584
overflow: hidden;
590585
background-color: #f5f5f5;
@@ -955,10 +950,6 @@ div.l-content > div.l-separator:nth-of-type(4) {
955950
vertical-align: middle;
956951
}
957952

958-
.l-sort-toolbar.subtitle {
959-
padding-left: 96px;
960-
}
961-
962953
.l-sort-toolbar__filter-apply {
963954
float: left;
964955
width: 32px;
@@ -1064,14 +1055,6 @@ div.l-content > div.l-separator:nth-of-type(4) {
10641055
line-height: 2rem;
10651056
}
10661057

1067-
.subtitle {
1068-
color: #c36;
1069-
font-size: 0.8rem;
1070-
font-weight: 600;
1071-
margin: 20px 0 18px 129px;
1072-
text-transform: uppercase;
1073-
}
1074-
10751058
.l-select {
10761059
width: 178px;
10771060
border: 1px solid #ddd;
@@ -1421,15 +1404,6 @@ div.l-content > div.l-separator:nth-of-type(4) {
14211404
display: block;
14221405
}
14231406

1424-
.l-unit-ft .subtitle,
1425-
.l-unit .subtitle {
1426-
color: #c36;
1427-
font-size: 0.8rem;
1428-
font-weight: 600;
1429-
margin: 20px 0 18px 129px;
1430-
text-transform: uppercase;
1431-
}
1432-
14331407
.l-unit.l-unit--outdated .l-unit__date {
14341408
color: #d24c4c;
14351409
font-size: 10px;
@@ -2108,23 +2082,13 @@ body.mobile .l-icon-shortcuts {
21082082
animation-play-state: paused;
21092083
}
21102084

2111-
.title b,
2112-
.title {
2113-
color: #c36;
2114-
font-size: 0.8rem;
2115-
font-weight: 600;
2116-
padding: 0 30px 0 73px;
2117-
line-height: 30px;
2118-
text-transform: uppercase;
2119-
}
2085+
/* form styles */
21202086

2121-
.title {
2122-
display: inline-block;
2123-
float: left;
2087+
.form-container {
2088+
font-size: 0.85rem;
2089+
padding: 1em 1em 2em 9rem;
21242090
}
21252091

2126-
/* form styles */
2127-
21282092
.vst-error {
21292093
color: #f33;
21302094
font-weight: 600;
@@ -2136,6 +2100,7 @@ body.mobile .l-icon-shortcuts {
21362100

21372101
.vst-ok {
21382102
color: #53ba55;
2103+
font-weight: 600;
21392104
overflow: hidden;
21402105
max-width: 500px;
21412106
text-overflow: ellipsis;
@@ -2176,7 +2141,6 @@ body.mobile .l-icon-shortcuts {
21762141
.form-label,
21772142
.form-check label {
21782143
color: #4b4b4b;
2179-
font-size: .85rem;
21802144
font-weight: 600;
21812145
}
21822146

@@ -2225,7 +2189,7 @@ body.mobile .l-icon-shortcuts {
22252189
display: block;
22262190
width: 100%;
22272191
font-weight: normal;
2228-
font-size: .8rem;
2192+
font-size: 0.8rem;
22292193
padding: 8px 30px 8px 12px;
22302194
line-height: 1.5;
22312195
border-radius: 4px;
@@ -2301,7 +2265,7 @@ a.vst-text:active b {
23012265
color: #30659d;
23022266
padding: 9px 18px;
23032267
overflow: hidden;
2304-
font-size: .85rem;
2268+
font-size: 0.85rem;
23052269
}
23062270

23072271
.advanced-options a {
@@ -2775,6 +2739,10 @@ a.button.cancel {
27752739
font-size: 0.8rem;
27762740
}
27772741

2742+
.login .form-label {
2743+
font-size: 0.85rem;
2744+
}
2745+
27782746
.login .form-control {
27792747
border-color: #5787c8;
27802748
}
@@ -3312,26 +3280,25 @@ form#vstobjects.suspended {
33123280
line-height: 0.9rem;
33133281
}
33143282

3315-
.shortcuts .header {
3283+
.shortcuts-header {
3284+
display: flex;
3285+
align-items: center;
3286+
justify-content: space-between;
33163287
border-bottom: 1px solid #606060;
3317-
height: 43px;
3288+
padding: 10px 10px 10px 15px;
33183289
}
33193290

3320-
.shortcuts .title {
3291+
.shortcuts-title {
33213292
text-transform: uppercase;
33223293
color: #ff3478;
3323-
padding: 7px 0 7px 14px;
3324-
float: left;
33253294
font-size: 0.85rem;
33263295
letter-spacing: -0.01em;
3296+
font-weight: 600;
33273297
}
33283298

33293299
.shortcuts .close {
33303300
cursor: pointer;
3331-
float: right;
3332-
height: 32px;
3333-
padding-top: 11px;
3334-
width: 46px;
3301+
width: 20px;
33353302
}
33363303

33373304
.shortcuts .close:hover {
@@ -3354,7 +3321,7 @@ form#vstobjects.suspended {
33543321

33553322
.shortcuts ul {
33563323
flex-grow: 1;
3357-
padding: 30px 20px;
3324+
padding: 40px 20px;
33583325
}
33593326

33603327
.shortcuts ul li {
@@ -3484,7 +3451,7 @@ form#vstobjects.suspended {
34843451
.helper-container {
34853452
float: right;
34863453
margin-bottom: -450px;
3487-
margin-top: 420px;
3454+
margin-top: 418px;
34883455
margin-right: 14px;
34893456
padding-top: 0;
34903457
width: 610px;

web/css/src/themes/vestia.css

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -254,21 +254,15 @@ strong {
254254
background: #fff !important;
255255
}
256256

257+
.form-container {
257258

259+
}
258260

259261
.form-control,
260262
.form-select {
263+
font-family: Arial, Helvetica, sans-serif;
261264
box-shadow: none;
262-
border-radius: 0 !important;
263-
}
264-
265-
.form-label,
266-
.form-check label {
267-
font-size: 0.8rem;
268-
}
269-
270-
.form-check-input {
271-
margin-top: 1px;
265+
border-radius: 0;
272266
}
273267

274268
.pill {
@@ -311,8 +305,8 @@ strong {
311305
color: #ff791f;
312306
}
313307

314-
.notification-container .unseen .title a,
315-
.notification-container .unseen .title {
308+
.notification-container .unseen .notification-title a,
309+
.notification-container .unseen .notification-title {
316310
color: #111;
317311
}
318312

@@ -484,11 +478,6 @@ a.vst-text:hover b,
484478
box-shadow: none;
485479
}
486480

487-
.form-control,
488-
.form-select {
489-
font-family: Arial, Helvetica, sans-serif !important;
490-
}
491-
492481
.server-info-data {
493482
line-height: 1rem !important;
494483
}
@@ -505,9 +494,9 @@ a.vst-text:hover b,
505494
box-shadow: 0 3px 12px rgb(0 0 0 / 80%) !important;
506495
}
507496

508-
.shortcuts .title,
497+
.shortcuts-title,
509498
.shortcuts ul li span {
510-
color: #b5da0b !important;
499+
color: #b5da0b;
511500
}
512501

513502
.l-sort-toolbar .sort-by b {

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.

web/js/templates.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ App.Templates.html = {
77
hint: [''],
88
notification: [
99
'<li class="~!:UNSEEN~!"><span class="unselectable mark-seen" id="notification-~!:ID~!">&nbsp;</span>\
10-
<span class="title"><span class="unselectable icon ~!:TYPE~!">&nbsp;</span>~!:TOPIC~!</span>\
10+
<span class="notification-title"><span class="unselectable icon ~!:TYPE~!">&nbsp;</span>~!:TOPIC~!</span>\
1111
~!:NOTICE~!\
1212
<b><span class="time">~!:TIME~! ~!:DATE~!</span></b>\
1313
</li>'

web/templates/footer.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</div>
1919

2020
<div class="shortcuts animated fadeIn" style="display:none">
21-
<div class="header">
22-
<div class="title"><?=_('Shortcuts')?></div>
21+
<div class="shortcuts-header">
22+
<div class="shortcuts-title"><?=_('Shortcuts')?></div>
2323
<div class="close text-center">
2424
<i class="fas fa-times"></i>
2525
</div>

0 commit comments

Comments
 (0)