Skip to content

Commit a3837f2

Browse files
AlecRustAlecRust
authored
Minor UI fixes (hestiacp#3333)
* Bump eslint-config-prettier * Fix menu items fading in on desktop * Add User: Fix "Send welcome email" displaying inverse of when it should * Improve alignment of RRD charts * Tighten up checkbox spacing
1 parent b3f66f6 commit a3837f2

File tree

10 files changed

+73
-64
lines changed

10 files changed

+73
-64
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@typescript-eslint/parser": "^5.54.0",
2828
"cssnano": "^5.1.15",
2929
"eslint": "^8.35.0",
30-
"eslint-config-prettier": "^8.6.0",
30+
"eslint-config-prettier": "^8.7.0",
3131
"eslint-plugin-editorconfig": "^4.0.2",
3232
"husky": "^8.0.3",
3333
"lint-staged": "^13.1.2",

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,16 @@
270270
position: absolute;
271271
top: 100%;
272272
right: 0;
273+
animation-name: fadeIn;
274+
animation-duration: var(--animate-duration);
273275

274276
@media (--viewport-medium) {
275277
display: flex !important; /* NOTE: Overrides inline style set by JS */
276278
background-color: transparent;
277279
box-shadow: none;
278280
position: static;
281+
animation-name: none;
282+
animation-duration: 0s;
279283
}
280284
}
281285

@@ -1392,6 +1396,10 @@
13921396
max-width: 920px;
13931397
}
13941398

1399+
.form-container-narrow {
1400+
max-width: 810px;
1401+
}
1402+
13951403
@media (--viewport-medium) {
13961404
.sidebar-right-container {
13971405
display: grid;

‎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/includes/panel.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class="top-bar-notification-delete-all"
125125
<span class="u-hidden"><?= _("Toggle menu") ?></span>
126126
</button>
127127

128-
<ul x-cloak x-show="open" class="top-bar-menu-list animate__animated animate__fadeIn">
128+
<ul x-cloak x-show="open" class="top-bar-menu-list">
129129

130130
<!-- File Manager -->
131131
<?php if (isset($_SESSION["FILE_MANAGER"]) && !empty($_SESSION["FILE_MANAGER"]) && $_SESSION["FILE_MANAGER"] == "true") { ?>

‎web/templates/pages/add_user.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@
6161
<li><?= _("1 uppercase & 1 lowercase character") ?></li>
6262
<li><?= _("1 number") ?></li>
6363
</ul>
64-
<div class="form-check u-mb10">
64+
<div class="form-check">
6565
<input x-model="loginDisabled" class="form-check-input" type="checkbox" name="v_login_disabled" id="v_login_disabled">
6666
<label for="v_login_disabled">
6767
<?= _("Do not allow user to log in to Control Panel") ?>
6868
</label>
6969
</div>
70-
<div x-cloak x-show="loginDisabled" id="send-welcome">
70+
<div x-cloak x-show="!loginDisabled" id="send-welcome">
7171
<div class="form-check u-mb10">
7272
<input class="form-check-input" type="checkbox" name="v_email_notice" id="v_email_notify" tabindex="5">
7373
<label for="v_email_notify">

‎web/templates/pages/edit_user.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class="<?= $v_status ?>"
122122
</div>
123123
<?php } ?>
124124
<div x-cloak x-show="!loginDisabled" id="password-options">
125-
<div class="form-check u-mt15">
125+
<div class="form-check">
126126
<input class="form-check-input" type="checkbox" name="v_twofa" id="v_twofa" <?php if(!empty($v_twofa)) echo 'checked' ?>>
127127
<label for="v_twofa">
128128
<?= _("Enable 2FA") ?>

‎web/templates/pages/list_rrd.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<!-- End toolbar -->
1717

1818
<div class="container animate__animated animate__fadeIn">
19-
<div class="form-container form-container-wide">
19+
<div class="form-container form-container-narrow">
2020
<!-- Begin graph list item loop -->
2121
<?php foreach ($data as $key => $value) { ?>
2222
<div class="u-mb40">

‎web/templates/pages/list_server_info.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<i class="fas fa-bars"></i>
2424
<span class="u-hidden"><?= _("Toggle menu") ?></span>
2525
</button>
26-
<ul x-cloak x-show="open" class="top-bar-menu-list animate__animated animate__fadeIn">
26+
<ul x-cloak x-show="open" class="top-bar-menu-list">
2727
<li class="top-bar-menu-item">
2828
<a class="top-bar-menu-link" href="/list/rrd/" title="<?= _("Back") ?>">
2929
<i class="fas fa-circle-left"></i>

‎web/templates/pages/list_weblog.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<i class="fas fa-bars"></i>
2424
<span class="u-hidden"><?= _("Toggle menu") ?></span>
2525
</button>
26-
<ul x-cloak x-show="open" class="top-bar-menu-list animate__animated animate__fadeIn">
26+
<ul x-cloak x-show="open" class="top-bar-menu-list">
2727
<li class="top-bar-menu-item">
2828
<a class="top-bar-menu-link" href="/list/web/">
2929
<i class="fas fa-circle-left"></i>

‎yarn.lock‎

Lines changed: 56 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,13 +1193,13 @@ __metadata:
11931193
linkType: hard
11941194

11951195
"agentkeepalive@npm:^4.2.1":
1196-
version: 4.2.1
1197-
resolution: "agentkeepalive@npm:4.2.1"
1196+
version: 4.3.0
1197+
resolution: "agentkeepalive@npm:4.3.0"
11981198
dependencies:
11991199
debug: ^4.1.0
1200-
depd: ^1.1.2
1200+
depd: ^2.0.0
12011201
humanize-ms: ^1.2.1
1202-
checksum: 39cb49ed8cf217fd6da058a92828a0a84e0b74c35550f82ee0a10e1ee403c4b78ade7948be2279b188b7a7303f5d396ea2738b134731e464bf28de00a4f72a18
1202+
checksum: 982453aa44c11a06826c836025e5162c846e1200adb56f2d075400da7d32d87021b3b0a58768d949d824811f5654223d5a8a3dad120921a2439625eb847c6260
12031203
languageName: node
12041204
linkType: hard
12051205

@@ -1690,6 +1690,13 @@ __metadata:
16901690
languageName: node
16911691
linkType: hard
16921692

1693+
"commander@npm:^10.0.0":
1694+
version: 10.0.0
1695+
resolution: "commander@npm:10.0.0"
1696+
checksum: 9f6495651f878213005ac744dd87a85fa3d9f2b8b90d1c19d0866d666bda7f735adfd7c2f10dfff345782e2f80ea258f98bb4efcef58e4e502f25f883940acfd
1697+
languageName: node
1698+
linkType: hard
1699+
16931700
"commander@npm:^2.19.0":
16941701
version: 2.20.3
16951702
resolution: "commander@npm:2.20.3"
@@ -1704,13 +1711,6 @@ __metadata:
17041711
languageName: node
17051712
linkType: hard
17061713

1707-
"commander@npm:^9.4.1":
1708-
version: 9.5.0
1709-
resolution: "commander@npm:9.5.0"
1710-
checksum: c7a3e27aa59e913b54a1bafd366b88650bc41d6651f0cbe258d4ff09d43d6a7394232a4dadd0bf518b3e696fdf595db1028a0d82c785b88bd61f8a440cecfade
1711-
languageName: node
1712-
linkType: hard
1713-
17141714
"concat-map@npm:0.0.1":
17151715
version: 0.0.1
17161716
resolution: "concat-map@npm:0.0.1"
@@ -1980,10 +1980,10 @@ __metadata:
19801980
languageName: node
19811981
linkType: hard
19821982

1983-
"depd@npm:^1.1.2":
1984-
version: 1.1.2
1985-
resolution: "depd@npm:1.1.2"
1986-
checksum: 6b406620d269619852885ce15965272b829df6f409724415e0002c8632ab6a8c0a08ec1f0bd2add05dc7bd7507606f7e2cc034fa24224ab829580040b835ecd9
1983+
"depd@npm:^2.0.0":
1984+
version: 2.0.0
1985+
resolution: "depd@npm:2.0.0"
1986+
checksum: abbe19c768c97ee2eed6282d8ce3031126662252c58d711f646921c9623f9052e3e1906443066beec1095832f534e57c523b7333f8e7e0d93051ab6baef5ab3a
19871987
languageName: node
19881988
linkType: hard
19891989

@@ -2079,9 +2079,9 @@ __metadata:
20792079
linkType: hard
20802080

20812081
"electron-to-chromium@npm:^1.4.284":
2082-
version: 1.4.319
2083-
resolution: "electron-to-chromium@npm:1.4.319"
2084-
checksum: 3c800a8c7c575bcf257367ccb1c9917796f7cc17b90145af1bf2cd6bb58f0c2a9a827a282b3cc147c0114e20f790c681e5450d5636b5b62b3d05df673b04dc69
2082+
version: 1.4.320
2083+
resolution: "electron-to-chromium@npm:1.4.320"
2084+
checksum: ea2c02bc286c0471ed7ad9b61225f6561921cf5f24a060cd1c46c2ea9932283ab924f66c370fbe5a229225dc1f747b395c943a0f5a9d058b72f561b1d8225787
20852085
languageName: node
20862086
linkType: hard
20872087

@@ -2243,14 +2243,14 @@ __metadata:
22432243
languageName: node
22442244
linkType: hard
22452245

2246-
"eslint-config-prettier@npm:^8.6.0":
2247-
version: 8.6.0
2248-
resolution: "eslint-config-prettier@npm:8.6.0"
2246+
"eslint-config-prettier@npm:^8.7.0":
2247+
version: 8.7.0
2248+
resolution: "eslint-config-prettier@npm:8.7.0"
22492249
peerDependencies:
22502250
eslint: ">=7.0.0"
22512251
bin:
22522252
eslint-config-prettier: bin/cli.js
2253-
checksum: ff0d0dfc839a556355422293428637e8d35693de58dabf8638bf0b6529131a109d0b2ade77521aa6e54573bb842d7d9d322e465dd73dd61c7590fa3834c3fa81
2253+
checksum: b05bc7f2296ce3e0925c14147849706544870e0382d38af2352d709a6cf8521bdaff2bd8e5021f1780e570775a8ffa1d2bac28b8065d90d43a3f1f98fd26ce52
22542254
languageName: node
22552255
linkType: hard
22562256

@@ -2417,20 +2417,20 @@ __metadata:
24172417
languageName: node
24182418
linkType: hard
24192419

2420-
"execa@npm:^6.1.0":
2421-
version: 6.1.0
2422-
resolution: "execa@npm:6.1.0"
2420+
"execa@npm:^7.0.0":
2421+
version: 7.0.0
2422+
resolution: "execa@npm:7.0.0"
24232423
dependencies:
24242424
cross-spawn: ^7.0.3
24252425
get-stream: ^6.0.1
2426-
human-signals: ^3.0.1
2426+
human-signals: ^4.3.0
24272427
is-stream: ^3.0.0
24282428
merge-stream: ^2.0.0
24292429
npm-run-path: ^5.1.0
24302430
onetime: ^6.0.0
24312431
signal-exit: ^3.0.7
24322432
strip-final-newline: ^3.0.0
2433-
checksum: 1a4af799839134f5c72eb63d525b87304c1114a63aa71676c91d57ccef2e26f2f53e14c11384ab11c4ec479be1efa83d11c8190e00040355c2c5c3364327fa8e
2433+
checksum: be7c7b6d1e5473f628e46888b0cf8279da483c1a6000dd494a2059cc26591ded57ba46be1c9bdde1ec895e7eb8b18911174aba425cd971d41d140a9405da9a02
24342434
languageName: node
24352435
linkType: hard
24362436

@@ -2819,7 +2819,7 @@ __metadata:
28192819
"@typescript-eslint/parser": ^5.54.0
28202820
cssnano: ^5.1.15
28212821
eslint: ^8.35.0
2822-
eslint-config-prettier: ^8.6.0
2822+
eslint-config-prettier: ^8.7.0
28232823
eslint-plugin-editorconfig: ^4.0.2
28242824
husky: ^8.0.3
28252825
lint-staged: ^13.1.2
@@ -2894,10 +2894,10 @@ __metadata:
28942894
languageName: node
28952895
linkType: hard
28962896

2897-
"human-signals@npm:^3.0.1":
2898-
version: 3.0.1
2899-
resolution: "human-signals@npm:3.0.1"
2900-
checksum: f252a7769c8094a5c9dc6772816bdb417b188820b04c8b42d0fc468e03a0ba905b1dd07afabe9385cc83504af1ccc2b985cd1e4aeeeb8e0029896c5af2e6f354
2897+
"human-signals@npm:^4.3.0":
2898+
version: 4.3.0
2899+
resolution: "human-signals@npm:4.3.0"
2900+
checksum: 662b976b1063a8afb8fd7fa50bde6975997e17ea6ceba2aad54aacf1dc239a2cd7d14d27b3ceca0c6288627f4b45c56c2c89618455ff52cd9377c02d6328cd7c
29012901
languageName: node
29022902
linkType: hard
29032903

@@ -3230,14 +3230,7 @@ __metadata:
32303230
languageName: node
32313231
linkType: hard
32323232

3233-
"lilconfig@npm:2.0.6":
3234-
version: 2.0.6
3235-
resolution: "lilconfig@npm:2.0.6"
3236-
checksum: 40a3cd72f103b1be5975f2ac1850810b61d4053e20ab09be8d3aeddfe042187e1ba70b4651a7e70f95efa1642e7dc8b2ae395b317b7d7753b241b43cef7c0f7d
3237-
languageName: node
3238-
linkType: hard
3239-
3240-
"lilconfig@npm:^2.0.3, lilconfig@npm:^2.0.5":
3233+
"lilconfig@npm:2.1.0, lilconfig@npm:^2.0.3, lilconfig@npm:^2.0.5":
32413234
version: 2.1.0
32423235
resolution: "lilconfig@npm:2.1.0"
32433236
checksum: 8549bb352b8192375fed4a74694cd61ad293904eee33f9d4866c2192865c44c4eb35d10782966242634e0cbc1e91fe62b1247f148dc5514918e3a966da7ea117
@@ -3268,29 +3261,30 @@ __metadata:
32683261
linkType: hard
32693262

32703263
"lint-staged@npm:^13.1.2":
3271-
version: 13.1.2
3272-
resolution: "lint-staged@npm:13.1.2"
3264+
version: 13.1.3
3265+
resolution: "lint-staged@npm:13.1.3"
32733266
dependencies:
32743267
cli-truncate: ^3.1.0
32753268
colorette: ^2.0.19
3276-
commander: ^9.4.1
3269+
commander: ^10.0.0
32773270
debug: ^4.3.4
3278-
execa: ^6.1.0
3279-
lilconfig: 2.0.6
3280-
listr2: ^5.0.5
3271+
execa: ^7.0.0
3272+
lilconfig: 2.1.0
3273+
listr2: ^5.0.7
32813274
micromatch: ^4.0.5
32823275
normalize-path: ^3.0.0
3283-
object-inspect: ^1.12.2
3276+
object-inspect: ^1.12.3
32843277
pidtree: ^0.6.0
32853278
string-argv: ^0.3.1
3286-
yaml: ^2.1.3
3279+
supports-color: 9.3.1
3280+
yaml: ^2.2.1
32873281
bin:
32883282
lint-staged: bin/lint-staged.js
3289-
checksum: f854ad5c88542b8f06e27f3b4046927a4f3d4a451a04e079526559d819a325762268f65bd2df7156bcc0cb5f531f621c42cdb824b403f537c78305adc9e56a54
3283+
checksum: 98a0410b98e8941059b477b38812d3c5ce8b93f3d8f65cfa4836f4b9ca861e7c935491a420b2f48d95acd8fd712dab10d95fffdd7868b072615d3d0fdec11e3c
32903284
languageName: node
32913285
linkType: hard
32923286

3293-
"listr2@npm:^5.0.5":
3287+
"listr2@npm:^5.0.7":
32943288
version: 5.0.7
32953289
resolution: "listr2@npm:5.0.7"
32963290
dependencies:
@@ -3389,9 +3383,9 @@ __metadata:
33893383
linkType: hard
33903384

33913385
"lru-cache@npm:^7.7.1":
3392-
version: 7.18.1
3393-
resolution: "lru-cache@npm:7.18.1"
3394-
checksum: ab0ec1360c552f1ffa54b1eaf0026126c5116a07bee156b92d1e971f4c8c88e9160f0fad4ab6fed4e0fdea84f25a4590ece085bc57ed9ab1d90b17f0b138c556
3386+
version: 7.18.3
3387+
resolution: "lru-cache@npm:7.18.3"
3388+
checksum: e550d772384709deea3f141af34b6d4fa392e2e418c1498c078de0ee63670f1f46f5eee746e8ef7e69e1c895af0d4224e62ee33e66a543a14763b0f2e74c1356
33953389
languageName: node
33963390
linkType: hard
33973391

@@ -3931,7 +3925,7 @@ __metadata:
39313925
languageName: node
39323926
linkType: hard
39333927

3934-
"object-inspect@npm:^1.12.2":
3928+
"object-inspect@npm:^1.12.3":
39353929
version: 1.12.3
39363930
resolution: "object-inspect@npm:1.12.3"
39373931
checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db
@@ -5722,6 +5716,13 @@ __metadata:
57225716
languageName: node
57235717
linkType: hard
57245718

5719+
"supports-color@npm:9.3.1":
5720+
version: 9.3.1
5721+
resolution: "supports-color@npm:9.3.1"
5722+
checksum: 00c4d1082a7ba0ee21cba1d4e4a466642635412e40476777b530aa5110d035e99a420cd048e1fb6811f2254c0946095fbb87a1eccf1af1d1ca45ab0a4535db93
5723+
languageName: node
5724+
linkType: hard
5725+
57255726
"supports-color@npm:^5.3.0, supports-color@npm:^5.4.0":
57265727
version: 5.5.0
57275728
resolution: "supports-color@npm:5.5.0"
@@ -6238,7 +6239,7 @@ __metadata:
62386239
languageName: node
62396240
linkType: hard
62406241

6241-
"yaml@npm:2.2.1, yaml@npm:^2.1.1, yaml@npm:^2.1.3":
6242+
"yaml@npm:2.2.1, yaml@npm:^2.1.1, yaml@npm:^2.2.1":
62426243
version: 2.2.1
62436244
resolution: "yaml@npm:2.2.1"
62446245
checksum: 84f68cbe462d5da4e7ded4a8bded949ffa912bc264472e5a684c3d45b22d8f73a3019963a32164023bdf3d83cfb6f5b58ff7b2b10ef5b717c630f40bd6369a23

0 commit comments

Comments
 (0)