Skip to content

Commit cb26535

Browse files
authored
Migrate remaining text inputs to .form-control (hestiacp#2978)
- Migrate DNS entry fields - Migrate `.vst-list-editor` fields - Fix `.form-select` height not matching `.form-control` - Fix some input widths - Add `.js-` to JS-specific classes
1 parent eb2600c commit cb26535

31 files changed

+328
-328
lines changed

web/css/src/themes/dark.css

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -623,36 +623,25 @@ div.l-content > div.l-separator:nth-of-type(4) {
623623
.data a {
624624
}
625625

626-
label {
627-
}
628-
629-
label:hover {
630-
color: #d4d4d4 !important;
631-
}
632-
633-
.vst-input,
634626
.form-control {
635627
background-color: #454545;
636628
border: 1px solid #606060;
637629
color: #d4d4d4;
638630
box-shadow: 0 1px 4px rgb(0 0 0 / 35%);
639631
}
640632

641-
.vst-input:hover,
642633
.form-control:hover {
643634
border-color: #0090ff;
644635
background-color: #494949;
645636
}
646637

647-
.vst-input:focus,
648638
.form-control:focus {
649639
background-color: #222;
650640
border-color: #0080df;
651641
color: #fff;
652642
box-shadow: 0 1px 6px rgb(0 52 91 / 75%);
653643
}
654644

655-
.vst-input:disabled,
656645
.form-control:disabled,
657646
.form-select:disabled {
658647
background-color: #303030;
@@ -661,20 +650,12 @@ label:hover {
661650
border-color: #606060;
662651
}
663652

664-
.vst-input:focus:disabled {
665-
}
666-
667-
.vst-input:disabled:hover,
668653
.form-control:disabled:hover,
669654
.form-select:disabled:hover {
670655
border-color: #606060 !important;
671656
}
672657

673-
.vst-input.vst-list-editor {
674-
675-
}
676-
677-
.vst-input.vst-list-editor:focus {
658+
.form-control.list-editor:focus {
678659
background-color: #222;
679660
box-shadow: none !important;
680661
}
@@ -844,8 +825,6 @@ a.vst-text:active b {
844825

845826
.additional-control.add:active {}
846827

847-
.additional-control.remove-ns {}
848-
849828
.toggle-psw-visibility-icon {}
850829

851830
.show-passwords-enabled-action {}
@@ -1095,9 +1074,6 @@ a.button.cancel {
10951074

10961075
}
10971076

1098-
:focus { outline: none; }
1099-
::-moz-focus-inner { border: 0; }
1100-
11011077
.login {
11021078
background-color: #282828;
11031079
box-shadow: 0 8px 25px rgb(0 0 0 / 30%), inset 0 0 2px rgb(0 0 0 / 25%) !important;

web/css/src/themes/default.css

Lines changed: 24 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,9 @@ body {
185185
background-color: #fff;
186186
}
187187

188+
:focus { outline: none; }
189+
::-moz-focus-inner { border: 0; }
190+
188191
.body-login,
189192
.body-reset {
190193
height: auto;
@@ -488,7 +491,7 @@ a {
488491

489492
.notification-container a {
490493
font-weight: 600;
491-
color: #1a4492;/* #eee; */
494+
color: #1a4492;
492495
}
493496

494497
.notification-container a:hover {
@@ -600,7 +603,6 @@ form#vstobjects .alert {
600603
.app-form label {
601604
font-size: 0.85rem;
602605
font-weight: 600;
603-
cursor: default;
604606
}
605607

606608
.card {
@@ -2207,11 +2209,6 @@ body.mobile .l-icon-shortcuts {
22072209
font-weight: 600;
22082210
}
22092211

2210-
.data input[type="checkbox"] {
2211-
display: inline;
2212-
cursor: pointer;
2213-
}
2214-
22152212
.jump-top {
22162213
margin-top: -60px;
22172214
}
@@ -2224,14 +2221,6 @@ body.mobile .l-icon-shortcuts {
22242221
text-decoration: none;
22252222
}
22262223

2227-
label {
2228-
cursor: pointer;
2229-
}
2230-
2231-
label:hover {
2232-
color: #333;
2233-
}
2234-
22352224
.form-control {
22362225
background-color: #fff;
22372226
box-sizing: border-box;
@@ -2248,65 +2237,46 @@ label:hover {
22482237
box-shadow: 0 1px 4px rgb(0 0 0 / 15%);
22492238
}
22502239

2251-
.vst-input {
2252-
background-color: #fff;
2253-
border: 1px solid #cfcfcf;
2254-
border-radius: 4px;
2255-
color: #4e4e4e;
2256-
font-family: Exo, Arial, Helvetica, sans-serif;
2257-
font-size: 0.8rem;
2258-
height: 20px;
2259-
margin: 2px 6px 0 0;
2260-
padding: 8px 3px 8px 14px;
2261-
width: 360px;
2262-
font-weight: normal;
2263-
box-shadow: 0 1px 4px rgb(0 0 0 / 15%);
2264-
}
2265-
2266-
.vst-input:hover,
22672240
.form-control:hover {
22682241
border: 1px solid #94c8f0;
22692242
}
22702243

2271-
.vst-input:focus,
22722244
.form-control:focus {
22732245
border: 1px solid #008fee;
22742246
background-color: #d7f9ff;
22752247
color: #333;
22762248
}
22772249

2278-
.vst-input:disabled,
22792250
.form-control:disabled,
22802251
.form-select:disabled {
22812252
background-color: #e7e7e7;
22822253
text-shadow: 1px 1px rgb(255 255 255 / 100%);
22832254
color: #686868;
22842255
}
22852256

2286-
.vst-input:focus:disabled,
22872257
.form-control:focus:disabled {
22882258
border-color: #dedede;
22892259
background-color: #f1f1f1;
22902260
}
22912261

2292-
.vst-input:disabled:hover,
22932262
.form-control:disabled:hover,
22942263
.form-select:disabled:hover {
22952264
border-color: #cfcfcf;
22962265
}
22972266

2298-
.vst-input.vst-list-editor {
2267+
.form-control.list-editor {
22992268
border: none;
23002269
box-shadow: none;
23012270
position: absolute;
2302-
margin-top: -34px;
2303-
margin-left: 1px;
2304-
display: block;
2305-
width: 340px;
2306-
height: 1rem;
2271+
padding-top: 7px;
2272+
padding-bottom: 7px;
2273+
width: auto;
2274+
top: 2px;
2275+
left: 2px;
2276+
right: 23px;
23072277
}
23082278

2309-
.vst-input.vst-list-editor:focus {
2279+
.form-control.list-editor:focus {
23102280
background-color: #fff;
23112281
}
23122282

@@ -2434,7 +2404,7 @@ a.vst-text:active b {
24342404
width: 100%;
24352405
font-weight: normal;
24362406
font-size: .8rem;
2437-
padding: 8px 30px 7px 12px;
2407+
padding: 8px 30px 8px 12px;
24382408
line-height: 1.5;
24392409
border-radius: 4px;
24402410
background-color: #fff;
@@ -2457,14 +2427,19 @@ a.vst-text:active b {
24572427
}
24582428

24592429
.form-check {
2430+
position: relative;
24602431
padding-left: 20px;
2461-
margin-bottom: 2px;
24622432
margin-left: 3px;
24632433
min-height: 24px;
24642434
}
24652435

2436+
.form-check label {
2437+
cursor: pointer;
2438+
}
2439+
24662440
.form-check-input {
2467-
float: left;
2441+
cursor: pointer;
2442+
position: absolute;
24682443
margin-top: 3px;
24692444
margin-left: -20px;
24702445
}
@@ -2526,10 +2501,6 @@ a.vst-text:active b {
25262501
border-color: #54a6e5;
25272502
}
25282503

2529-
.additional-control.remove-ns {
2530-
display: none;
2531-
}
2532-
25332504
.toggle-password {
25342505
color: #aaa;
25352506
z-index: 1;
@@ -2841,9 +2812,6 @@ a.button.cancel {
28412812
padding-left: 20px !important;
28422813
}
28432814

2844-
:focus { outline: none; }
2845-
::-moz-focus-inner { border: 0; }
2846-
28472815
.login {
28482816
background-color: rgb(255 255 255 / 70%);
28492817
box-shadow:
@@ -2859,7 +2827,6 @@ a.button.cancel {
28592827
cursor: default;
28602828
}
28612829

2862-
.login .vst-input,
28632830
.login .form-control {
28642831
border-color: #5787c8;
28652832
}
@@ -3882,6 +3849,10 @@ li[aria-expanded="true"] a {
38823849
margin-top: 15px !important;
38833850
}
38843851

3852+
.u-ml5 {
3853+
margin-left: 5px !important;
3854+
}
3855+
38853856
.u-ml10 {
38863857
margin-left: 10px !important;
38873858
}

web/css/src/themes/flat.css

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,7 @@ strong {
8989
box-shadow: none;
9090
}
9191

92-
.vst-input,
93-
.form-control {
94-
box-shadow: none;
95-
}
96-
92+
.form-control,
9793
.form-select {
9894
box-shadow: none;
9995
}

web/css/src/themes/vestia.css

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -274,15 +274,19 @@ strong {
274274
inset 0 0 2px rgb(255 255 255 / 100%) !important;
275275
}
276276

277-
.vst-input,
278-
.form-control {
277+
.form-control,
278+
.form-select {
279279
box-shadow: none;
280280
border-radius: 0 !important;
281281
}
282282

283-
.form-select {
284-
box-shadow: none;
285-
border-radius: 0 !important;
283+
.form-label,
284+
.form-check label {
285+
font-size: 0.8rem;
286+
}
287+
288+
.form-check-input {
289+
margin-top: 1px;
286290
}
287291

288292
.pill {
@@ -347,9 +351,7 @@ a.vst-text:hover b,
347351
color: #ff791f !important;
348352
}
349353

350-
.vst-input:focus,
351354
.form-control:focus,
352-
.login .vst-input:focus,
353355
.login .form-control:focus {
354356
border: 1px solid #ff6701;
355357
background-color: #fff4ed;
@@ -361,7 +363,6 @@ a.vst-text:hover b,
361363
color: #333;
362364
}
363365

364-
.vst-input:hover,
365366
.form-control:hover,
366367
.form-select:hover {
367368
border: 1px solid #e95e00;
@@ -501,7 +502,6 @@ a.vst-text:hover b,
501502
box-shadow: none;
502503
}
503504

504-
.vst-input,
505505
.form-control,
506506
.form-select {
507507
font-family: Arial, Helvetica, sans-serif !important;
@@ -511,8 +511,8 @@ a.vst-text:hover b,
511511
line-height: 1rem !important;
512512
}
513513

514-
.vst-input.vst-list-editor:hover,
515-
.vst-input.vst-list-editor:focus {
514+
.form-control.list-editor:hover,
515+
.form-control.list-editor:focus {
516516
border: none !important;
517517
}
518518

@@ -580,10 +580,6 @@ td.advanced-options .fas {
580580
display: none !important;
581581
}
582582

583-
label {
584-
font-size: 0.8rem;
585-
}
586-
587583
a#btn-back {
588584
color: #30659d !important;
589585
background: none !important;
@@ -714,7 +710,6 @@ a.vst-advanced:focus {
714710
color: #326b9b !important;
715711
}
716712

717-
.login .vst-input,
718713
.login .form-control {
719714
border: 1px solid #bbb;
720715
}

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/flat.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)