Skip to content

Commit aa9331c

Browse files
authored
Improve Edit Server expand/collapse (hestiacp#3018)
1 parent 242837d commit aa9331c

File tree

11 files changed

+783
-789
lines changed

11 files changed

+783
-789
lines changed

web/css/src/themes/dark.css

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -662,35 +662,6 @@ textarea:focus::placeholder {
662662
box-shadow: 0 1px 6px rgb(0 52 91 / 75%);
663663
}
664664

665-
a.vst-text,
666-
a.vst-text b {
667-
color: #fff;
668-
}
669-
670-
a.vst-text:hover,
671-
a.vst-text:hover b {
672-
color: #ff3478;
673-
}
674-
675-
a.vst-text:active,
676-
a.vst-text:active b {
677-
color: #ff3478;
678-
}
679-
680-
.advanced-options {
681-
background: #454545;
682-
border: 1px solid #505050;
683-
text-shadow: 0 1px rgb(0 0 0 / 40%);
684-
box-shadow:
685-
inset 0 0 2px rgb(0 0 0 / 50%),
686-
0 2px 6px rgb(0 0 0 / 40%);
687-
color: #fff;
688-
}
689-
690-
.advanced-options a {
691-
color: #fff !important;
692-
}
693-
694665
.generate {
695666
color: #29a9ff;
696667
border-radius: 4px;
@@ -1479,3 +1450,16 @@ li[aria-expanded="true"] a {
14791450
.ui-button.button-suspended i {
14801451
color: #999 !important;
14811452
}
1453+
1454+
/* Collapse component
1455+
========================================================================== */
1456+
1457+
.collapse-header {
1458+
background: #454545;
1459+
border: 1px solid #505050;
1460+
text-shadow: 0 1px rgb(0 0 0 / 40%);
1461+
box-shadow:
1462+
inset 0 0 2px rgb(0 0 0 / 50%),
1463+
0 2px 6px rgb(0 0 0 / 40%);
1464+
color: #fff;
1465+
}

web/css/src/themes/default.css

Lines changed: 55 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -842,14 +842,14 @@ div.l-content > div.l-separator:nth-of-type(4) {
842842
.context-menu.sort-order span.name {
843843
display: inline-block;
844844
padding: 12px;
845-
width: 117px;
845+
width: 141px;
846846
font-weight: 500;
847847
}
848848

849849
.context-menu.sort-order span.up {
850850
display: inline-block;
851851
padding: 12px 14px;
852-
width: 16px;
852+
width: 44px;
853853
}
854854

855855
.context-menu.sort-order span.active {
@@ -1134,9 +1134,10 @@ div.l-content > div.l-separator:nth-of-type(4) {
11341134
height: 28px;
11351135
min-width: 175px;
11361136
padding-left: 10px;
1137-
background-image: url("/images/arrow.png");
1138-
background-position: 160px;
1137+
background-image: url(/images/arrow.svg);
11391138
background-repeat: no-repeat;
1139+
background-size: 14px auto;
1140+
background-position: right 7px center;
11401141
appearance: none;
11411142
}
11421143

@@ -2197,7 +2198,8 @@ body.mobile .l-icon-shortcuts {
21972198
border: 1px solid #ccc;
21982199
color: #4e4e4e;
21992200
appearance: none;
2200-
background-image: url(/images/arrow.png);
2201+
background-image: url(/images/arrow.svg);
2202+
background-size: 16px auto;
22012203
background-repeat: no-repeat;
22022204
background-position: right 9px center;
22032205
text-shadow: 0 0 0 #4b4b4b;
@@ -2242,41 +2244,6 @@ body.mobile .l-icon-shortcuts {
22422244
border-color: #cfcfcf;
22432245
}
22442246

2245-
a.vst-text,
2246-
a.vst-text b {
2247-
color: #326b9b;
2248-
}
2249-
2250-
a.vst-text:hover,
2251-
a.vst-text:hover b {
2252-
color: #c36;
2253-
}
2254-
2255-
a.vst-text:active,
2256-
a.vst-text:active b {
2257-
color: #c36;
2258-
}
2259-
2260-
.advanced-options {
2261-
background: linear-gradient(to bottom, rgb(247 247 247 / 100%) 0%, rgb(255 255 255 / 100%) 100%);
2262-
border: 1px solid #ddd;
2263-
text-shadow: 0 1px rgb(255 255 255 / 95%);
2264-
box-shadow: inset 0 0 1px rgb(255 255 255 / 100%), inset 0 0 4px rgb(255 255 255 / 80%), 0 4px 6px rgb(190 190 190 / 40%);
2265-
color: #30659d;
2266-
padding: 9px 18px;
2267-
overflow: hidden;
2268-
font-size: 0.85rem;
2269-
}
2270-
2271-
.advanced-options a {
2272-
color: #30659d !important;
2273-
}
2274-
2275-
.advanced-options .fas {
2276-
margin-right: 20px;
2277-
width: 14px;
2278-
}
2279-
22802247
#advanced-options .u-console {
22812248
width: 833px;
22822249
height: 600px !important;
@@ -3690,6 +3657,50 @@ li[aria-expanded="true"] a {
36903657
.password-meter[value="3"]::-moz-meter-bar { background: yellow; }
36913658
.password-meter[value="4"]::-moz-meter-bar { background: green; }
36923659

3660+
/* Collapse component
3661+
========================================================================== */
3662+
3663+
.collapse {}
3664+
3665+
.collapse[open] .collapse-header::after {
3666+
transform: rotate(180deg);
3667+
}
3668+
3669+
.collapse-header {
3670+
background: linear-gradient(to bottom, rgb(247 247 247 / 100%) 0%, rgb(255 255 255 / 100%) 100%);
3671+
border: 1px solid #ddd;
3672+
text-shadow: 0 1px rgb(255 255 255 / 95%);
3673+
box-shadow: inset 0 0 1px rgb(255 255 255 / 100%), inset 0 0 4px rgb(255 255 255 / 80%), 0 4px 6px rgb(190 190 190 / 40%);
3674+
font-weight: 600;
3675+
color: #30659d;
3676+
cursor: pointer;
3677+
position: relative;
3678+
padding: 9px 18px;
3679+
}
3680+
3681+
.collapse-header:hover {
3682+
color: #ff3478;
3683+
}
3684+
3685+
.collapse-header::after {
3686+
content: "";
3687+
display: block;
3688+
background-image: url(/images/arrow.svg);
3689+
background-size: 22px auto;
3690+
background-repeat: no-repeat;
3691+
background-position: center;
3692+
width: 22px;
3693+
height: 100%;
3694+
position: absolute;
3695+
top: 0;
3696+
right: 15px;
3697+
}
3698+
3699+
.collapse-content {
3700+
box-sizing: border-box; /* Work around box-sizing not inheriting in <details> in many browsers */
3701+
padding: 20px 20px 10px;
3702+
}
3703+
36933704
/* Extend animate.css
36943705
========================================================================== */
36953706

@@ -3756,6 +3767,10 @@ li[aria-expanded="true"] a {
37563767
margin-left: 10px !important;
37573768
}
37583769

3770+
.u-mr15 {
3771+
margin-right: 15px !important;
3772+
}
3773+
37593774
.u-mb5 {
37603775
margin-bottom: 5px !important;
37613776
}

web/css/src/themes/flat.css

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ strong {
2323
background: #fafafa !important;
2424
}
2525

26-
.advanced-options {
27-
background: #fafafa;
28-
}
29-
3026
.to-top,
3127
.to-shortcuts,
3228
.to-top:hover,
@@ -94,10 +90,6 @@ strong {
9490
box-shadow: none;
9591
}
9692

97-
.advanced-options {
98-
box-shadow: none;
99-
}
100-
10193
.ui-button,
10294
.button,
10395
.ui-button.ui-widget.ui-state-default.ui-corner-all.ui-button-text-only.submit,
@@ -198,3 +190,11 @@ strong {
198190
0 2px 10px rgb(0 0 0 / 30%),
199191
inset 0 0 2px rgb(255 255 255 / 100%);
200192
}
193+
194+
/* Collapse component
195+
========================================================================== */
196+
197+
.collapse-header {
198+
background: #fafafa;
199+
box-shadow: none;
200+
}

web/css/src/themes/vestia.css

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ strong {
2828
line-height: 1.2rem !important;
2929
}
3030

31-
.advanced-options {
32-
background: #fafafa;
33-
box-shadow: none;
34-
}
35-
3631
.l-header {
3732
box-shadow: none;
3833
background: #5d5d5d;
@@ -319,18 +314,6 @@ strong {
319314
border: 1px solid #f16100;
320315
}
321316

322-
a.vst-text,
323-
a.vst-text b,
324-
.advanced-options a {
325-
color: #444 !important;
326-
}
327-
328-
a.vst-text:hover,
329-
a.vst-text:hover b,
330-
.advanced-options a:hover {
331-
color: #ff791f !important;
332-
}
333-
334317
.form-control:focus,
335318
.login .form-control:focus {
336319
border-color: #ff6701;
@@ -553,10 +536,6 @@ a.vst-text:hover b,
553536
margin-right: 15px;
554537
}
555538

556-
.advanced-options .fas {
557-
display: none !important;
558-
}
559-
560539
a#btn-back {
561540
color: #30659d !important;
562541
background: none !important;
@@ -738,6 +717,23 @@ a.vst-advanced {
738717
margin-left: -10px;
739718
}
740719

720+
/* Collapse component
721+
========================================================================== */
722+
723+
.collapse-header {
724+
background: #fafafa;
725+
box-shadow: none;
726+
color: #444;
727+
}
728+
729+
.collapse-header:hover {
730+
color: #ff791f;
731+
}
732+
733+
.collapse-header .fas {
734+
display: none;
735+
}
736+
741737
/* Extend animate.css
742738
========================================================================== */
743739

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)