Просмотр исходного кода

Minor UI fixes (#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
Alec Rust 3 лет назад
Родитель
Сommit
a3837f20bf

+ 1 - 1
package.json

@@ -27,7 +27,7 @@
 		"@typescript-eslint/parser": "^5.54.0",
 		"@typescript-eslint/parser": "^5.54.0",
 		"cssnano": "^5.1.15",
 		"cssnano": "^5.1.15",
 		"eslint": "^8.35.0",
 		"eslint": "^8.35.0",
-		"eslint-config-prettier": "^8.6.0",
+		"eslint-config-prettier": "^8.7.0",
 		"eslint-plugin-editorconfig": "^4.0.2",
 		"eslint-plugin-editorconfig": "^4.0.2",
 		"husky": "^8.0.3",
 		"husky": "^8.0.3",
 		"lint-staged": "^13.1.2",
 		"lint-staged": "^13.1.2",

+ 8 - 0
web/css/src/themes/default.css

@@ -270,12 +270,16 @@
 	position: absolute;
 	position: absolute;
 	top: 100%;
 	top: 100%;
 	right: 0;
 	right: 0;
+	animation-name: fadeIn;
+	animation-duration: var(--animate-duration);
 
 
 	@media (--viewport-medium) {
 	@media (--viewport-medium) {
 		display: flex !important; /* NOTE: Overrides inline style set by JS */
 		display: flex !important; /* NOTE: Overrides inline style set by JS */
 		background-color: transparent;
 		background-color: transparent;
 		box-shadow: none;
 		box-shadow: none;
 		position: static;
 		position: static;
+		animation-name: none;
+		animation-duration: 0s;
 	}
 	}
 }
 }
 
 
@@ -1392,6 +1396,10 @@
 	max-width: 920px;
 	max-width: 920px;
 }
 }
 
 
+.form-container-narrow {
+	max-width: 810px;
+}
+
 @media (--viewport-medium) {
 @media (--viewport-medium) {
 	.sidebar-right-container {
 	.sidebar-right-container {
 		display: grid;
 		display: grid;

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
web/css/themes/default.min.css


+ 1 - 1
web/templates/includes/panel.php

@@ -125,7 +125,7 @@
 						<span class="u-hidden"><?= _("Toggle menu") ?></span>
 						<span class="u-hidden"><?= _("Toggle menu") ?></span>
 					</button>
 					</button>
 
 
-					<ul x-cloak x-show="open" class="top-bar-menu-list animate__animated animate__fadeIn">
+					<ul x-cloak x-show="open" class="top-bar-menu-list">
 
 
 						<!-- File Manager -->
 						<!-- File Manager -->
 						<?php if (isset($_SESSION["FILE_MANAGER"]) && !empty($_SESSION["FILE_MANAGER"]) && $_SESSION["FILE_MANAGER"] == "true") { ?>
 						<?php if (isset($_SESSION["FILE_MANAGER"]) && !empty($_SESSION["FILE_MANAGER"]) && $_SESSION["FILE_MANAGER"] == "true") { ?>

+ 2 - 2
web/templates/pages/add_user.php

@@ -61,13 +61,13 @@
 				<li><?= _("1 uppercase & 1 lowercase character") ?></li>
 				<li><?= _("1 uppercase & 1 lowercase character") ?></li>
 				<li><?= _("1 number") ?></li>
 				<li><?= _("1 number") ?></li>
 			</ul>
 			</ul>
-			<div class="form-check u-mb10">
+			<div class="form-check">
 				<input x-model="loginDisabled" class="form-check-input" type="checkbox" name="v_login_disabled" id="v_login_disabled">
 				<input x-model="loginDisabled" class="form-check-input" type="checkbox" name="v_login_disabled" id="v_login_disabled">
 				<label for="v_login_disabled">
 				<label for="v_login_disabled">
 					<?= _("Do not allow user to log in to Control Panel") ?>
 					<?= _("Do not allow user to log in to Control Panel") ?>
 				</label>
 				</label>
 			</div>
 			</div>
-			<div x-cloak x-show="loginDisabled" id="send-welcome">
+			<div x-cloak x-show="!loginDisabled" id="send-welcome">
 				<div class="form-check u-mb10">
 				<div class="form-check u-mb10">
 					<input class="form-check-input" type="checkbox" name="v_email_notice" id="v_email_notify" tabindex="5">
 					<input class="form-check-input" type="checkbox" name="v_email_notice" id="v_email_notify" tabindex="5">
 					<label for="v_email_notify">
 					<label for="v_email_notify">

+ 1 - 1
web/templates/pages/edit_user.php

@@ -122,7 +122,7 @@
 					</div>
 					</div>
 				<?php } ?>
 				<?php } ?>
 				<div x-cloak x-show="!loginDisabled" id="password-options">
 				<div x-cloak x-show="!loginDisabled" id="password-options">
-					<div class="form-check u-mt15">
+					<div class="form-check">
 						<input class="form-check-input" type="checkbox" name="v_twofa" id="v_twofa" <?php if(!empty($v_twofa)) echo 'checked' ?>>
 						<input class="form-check-input" type="checkbox" name="v_twofa" id="v_twofa" <?php if(!empty($v_twofa)) echo 'checked' ?>>
 						<label for="v_twofa">
 						<label for="v_twofa">
 							<?= _("Enable 2FA") ?>
 							<?= _("Enable 2FA") ?>

+ 1 - 1
web/templates/pages/list_rrd.php

@@ -16,7 +16,7 @@
 <!-- End toolbar -->
 <!-- End toolbar -->
 
 
 <div class="container animate__animated animate__fadeIn">
 <div class="container animate__animated animate__fadeIn">
-	<div class="form-container form-container-wide">
+	<div class="form-container form-container-narrow">
 		<!-- Begin graph list item loop -->
 		<!-- Begin graph list item loop -->
 		<?php foreach ($data as $key => $value) { ?>
 		<?php foreach ($data as $key => $value) { ?>
 			<div class="u-mb40">
 			<div class="u-mb40">

+ 1 - 1
web/templates/pages/list_server_info.php

@@ -23,7 +23,7 @@
 							<i class="fas fa-bars"></i>
 							<i class="fas fa-bars"></i>
 							<span class="u-hidden"><?= _("Toggle menu") ?></span>
 							<span class="u-hidden"><?= _("Toggle menu") ?></span>
 						</button>
 						</button>
-						<ul x-cloak x-show="open" class="top-bar-menu-list animate__animated animate__fadeIn">
+						<ul x-cloak x-show="open" class="top-bar-menu-list">
 							<li class="top-bar-menu-item">
 							<li class="top-bar-menu-item">
 								<a class="top-bar-menu-link" href="/list/rrd/" title="<?= _("Back") ?>">
 								<a class="top-bar-menu-link" href="/list/rrd/" title="<?= _("Back") ?>">
 									<i class="fas fa-circle-left"></i>
 									<i class="fas fa-circle-left"></i>

+ 1 - 1
web/templates/pages/list_weblog.php

@@ -23,7 +23,7 @@
 							<i class="fas fa-bars"></i>
 							<i class="fas fa-bars"></i>
 							<span class="u-hidden"><?= _("Toggle menu") ?></span>
 							<span class="u-hidden"><?= _("Toggle menu") ?></span>
 						</button>
 						</button>
-						<ul x-cloak x-show="open" class="top-bar-menu-list animate__animated animate__fadeIn">
+						<ul x-cloak x-show="open" class="top-bar-menu-list">
 							<li class="top-bar-menu-item">
 							<li class="top-bar-menu-item">
 								<a class="top-bar-menu-link" href="/list/web/">
 								<a class="top-bar-menu-link" href="/list/web/">
 									<i class="fas fa-circle-left"></i>
 									<i class="fas fa-circle-left"></i>

+ 56 - 55
yarn.lock

@@ -1193,13 +1193,13 @@ __metadata:
   linkType: hard
   linkType: hard
 
 
 "agentkeepalive@npm:^4.2.1":
 "agentkeepalive@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "agentkeepalive@npm:4.2.1"
+  version: 4.3.0
+  resolution: "agentkeepalive@npm:4.3.0"
   dependencies:
   dependencies:
     debug: ^4.1.0
     debug: ^4.1.0
-    depd: ^1.1.2
+    depd: ^2.0.0
     humanize-ms: ^1.2.1
     humanize-ms: ^1.2.1
-  checksum: 39cb49ed8cf217fd6da058a92828a0a84e0b74c35550f82ee0a10e1ee403c4b78ade7948be2279b188b7a7303f5d396ea2738b134731e464bf28de00a4f72a18
+  checksum: 982453aa44c11a06826c836025e5162c846e1200adb56f2d075400da7d32d87021b3b0a58768d949d824811f5654223d5a8a3dad120921a2439625eb847c6260
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
@@ -1690,6 +1690,13 @@ __metadata:
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
+"commander@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "commander@npm:10.0.0"
+  checksum: 9f6495651f878213005ac744dd87a85fa3d9f2b8b90d1c19d0866d666bda7f735adfd7c2f10dfff345782e2f80ea258f98bb4efcef58e4e502f25f883940acfd
+  languageName: node
+  linkType: hard
+
 "commander@npm:^2.19.0":
 "commander@npm:^2.19.0":
   version: 2.20.3
   version: 2.20.3
   resolution: "commander@npm:2.20.3"
   resolution: "commander@npm:2.20.3"
@@ -1704,13 +1711,6 @@ __metadata:
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
-"commander@npm:^9.4.1":
-  version: 9.5.0
-  resolution: "commander@npm:9.5.0"
-  checksum: c7a3e27aa59e913b54a1bafd366b88650bc41d6651f0cbe258d4ff09d43d6a7394232a4dadd0bf518b3e696fdf595db1028a0d82c785b88bd61f8a440cecfade
-  languageName: node
-  linkType: hard
-
 "concat-map@npm:0.0.1":
 "concat-map@npm:0.0.1":
   version: 0.0.1
   version: 0.0.1
   resolution: "concat-map@npm:0.0.1"
   resolution: "concat-map@npm:0.0.1"
@@ -1980,10 +1980,10 @@ __metadata:
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
-"depd@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "depd@npm:1.1.2"
-  checksum: 6b406620d269619852885ce15965272b829df6f409724415e0002c8632ab6a8c0a08ec1f0bd2add05dc7bd7507606f7e2cc034fa24224ab829580040b835ecd9
+"depd@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "depd@npm:2.0.0"
+  checksum: abbe19c768c97ee2eed6282d8ce3031126662252c58d711f646921c9623f9052e3e1906443066beec1095832f534e57c523b7333f8e7e0d93051ab6baef5ab3a
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
@@ -2079,9 +2079,9 @@ __metadata:
   linkType: hard
   linkType: hard
 
 
 "electron-to-chromium@npm:^1.4.284":
 "electron-to-chromium@npm:^1.4.284":
-  version: 1.4.319
-  resolution: "electron-to-chromium@npm:1.4.319"
-  checksum: 3c800a8c7c575bcf257367ccb1c9917796f7cc17b90145af1bf2cd6bb58f0c2a9a827a282b3cc147c0114e20f790c681e5450d5636b5b62b3d05df673b04dc69
+  version: 1.4.320
+  resolution: "electron-to-chromium@npm:1.4.320"
+  checksum: ea2c02bc286c0471ed7ad9b61225f6561921cf5f24a060cd1c46c2ea9932283ab924f66c370fbe5a229225dc1f747b395c943a0f5a9d058b72f561b1d8225787
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
@@ -2243,14 +2243,14 @@ __metadata:
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
-"eslint-config-prettier@npm:^8.6.0":
-  version: 8.6.0
-  resolution: "eslint-config-prettier@npm:8.6.0"
+"eslint-config-prettier@npm:^8.7.0":
+  version: 8.7.0
+  resolution: "eslint-config-prettier@npm:8.7.0"
   peerDependencies:
   peerDependencies:
     eslint: ">=7.0.0"
     eslint: ">=7.0.0"
   bin:
   bin:
     eslint-config-prettier: bin/cli.js
     eslint-config-prettier: bin/cli.js
-  checksum: ff0d0dfc839a556355422293428637e8d35693de58dabf8638bf0b6529131a109d0b2ade77521aa6e54573bb842d7d9d322e465dd73dd61c7590fa3834c3fa81
+  checksum: b05bc7f2296ce3e0925c14147849706544870e0382d38af2352d709a6cf8521bdaff2bd8e5021f1780e570775a8ffa1d2bac28b8065d90d43a3f1f98fd26ce52
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
@@ -2417,20 +2417,20 @@ __metadata:
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
-"execa@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "execa@npm:6.1.0"
+"execa@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "execa@npm:7.0.0"
   dependencies:
   dependencies:
     cross-spawn: ^7.0.3
     cross-spawn: ^7.0.3
     get-stream: ^6.0.1
     get-stream: ^6.0.1
-    human-signals: ^3.0.1
+    human-signals: ^4.3.0
     is-stream: ^3.0.0
     is-stream: ^3.0.0
     merge-stream: ^2.0.0
     merge-stream: ^2.0.0
     npm-run-path: ^5.1.0
     npm-run-path: ^5.1.0
     onetime: ^6.0.0
     onetime: ^6.0.0
     signal-exit: ^3.0.7
     signal-exit: ^3.0.7
     strip-final-newline: ^3.0.0
     strip-final-newline: ^3.0.0
-  checksum: 1a4af799839134f5c72eb63d525b87304c1114a63aa71676c91d57ccef2e26f2f53e14c11384ab11c4ec479be1efa83d11c8190e00040355c2c5c3364327fa8e
+  checksum: be7c7b6d1e5473f628e46888b0cf8279da483c1a6000dd494a2059cc26591ded57ba46be1c9bdde1ec895e7eb8b18911174aba425cd971d41d140a9405da9a02
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
@@ -2819,7 +2819,7 @@ __metadata:
     "@typescript-eslint/parser": ^5.54.0
     "@typescript-eslint/parser": ^5.54.0
     cssnano: ^5.1.15
     cssnano: ^5.1.15
     eslint: ^8.35.0
     eslint: ^8.35.0
-    eslint-config-prettier: ^8.6.0
+    eslint-config-prettier: ^8.7.0
     eslint-plugin-editorconfig: ^4.0.2
     eslint-plugin-editorconfig: ^4.0.2
     husky: ^8.0.3
     husky: ^8.0.3
     lint-staged: ^13.1.2
     lint-staged: ^13.1.2
@@ -2894,10 +2894,10 @@ __metadata:
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
-"human-signals@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "human-signals@npm:3.0.1"
-  checksum: f252a7769c8094a5c9dc6772816bdb417b188820b04c8b42d0fc468e03a0ba905b1dd07afabe9385cc83504af1ccc2b985cd1e4aeeeb8e0029896c5af2e6f354
+"human-signals@npm:^4.3.0":
+  version: 4.3.0
+  resolution: "human-signals@npm:4.3.0"
+  checksum: 662b976b1063a8afb8fd7fa50bde6975997e17ea6ceba2aad54aacf1dc239a2cd7d14d27b3ceca0c6288627f4b45c56c2c89618455ff52cd9377c02d6328cd7c
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
@@ -3230,14 +3230,7 @@ __metadata:
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
-"lilconfig@npm:2.0.6":
-  version: 2.0.6
-  resolution: "lilconfig@npm:2.0.6"
-  checksum: 40a3cd72f103b1be5975f2ac1850810b61d4053e20ab09be8d3aeddfe042187e1ba70b4651a7e70f95efa1642e7dc8b2ae395b317b7d7753b241b43cef7c0f7d
-  languageName: node
-  linkType: hard
-
-"lilconfig@npm:^2.0.3, lilconfig@npm:^2.0.5":
+"lilconfig@npm:2.1.0, lilconfig@npm:^2.0.3, lilconfig@npm:^2.0.5":
   version: 2.1.0
   version: 2.1.0
   resolution: "lilconfig@npm:2.1.0"
   resolution: "lilconfig@npm:2.1.0"
   checksum: 8549bb352b8192375fed4a74694cd61ad293904eee33f9d4866c2192865c44c4eb35d10782966242634e0cbc1e91fe62b1247f148dc5514918e3a966da7ea117
   checksum: 8549bb352b8192375fed4a74694cd61ad293904eee33f9d4866c2192865c44c4eb35d10782966242634e0cbc1e91fe62b1247f148dc5514918e3a966da7ea117
@@ -3268,29 +3261,30 @@ __metadata:
   linkType: hard
   linkType: hard
 
 
 "lint-staged@npm:^13.1.2":
 "lint-staged@npm:^13.1.2":
-  version: 13.1.2
-  resolution: "lint-staged@npm:13.1.2"
+  version: 13.1.3
+  resolution: "lint-staged@npm:13.1.3"
   dependencies:
   dependencies:
     cli-truncate: ^3.1.0
     cli-truncate: ^3.1.0
     colorette: ^2.0.19
     colorette: ^2.0.19
-    commander: ^9.4.1
+    commander: ^10.0.0
     debug: ^4.3.4
     debug: ^4.3.4
-    execa: ^6.1.0
-    lilconfig: 2.0.6
-    listr2: ^5.0.5
+    execa: ^7.0.0
+    lilconfig: 2.1.0
+    listr2: ^5.0.7
     micromatch: ^4.0.5
     micromatch: ^4.0.5
     normalize-path: ^3.0.0
     normalize-path: ^3.0.0
-    object-inspect: ^1.12.2
+    object-inspect: ^1.12.3
     pidtree: ^0.6.0
     pidtree: ^0.6.0
     string-argv: ^0.3.1
     string-argv: ^0.3.1
-    yaml: ^2.1.3
+    supports-color: 9.3.1
+    yaml: ^2.2.1
   bin:
   bin:
     lint-staged: bin/lint-staged.js
     lint-staged: bin/lint-staged.js
-  checksum: f854ad5c88542b8f06e27f3b4046927a4f3d4a451a04e079526559d819a325762268f65bd2df7156bcc0cb5f531f621c42cdb824b403f537c78305adc9e56a54
+  checksum: 98a0410b98e8941059b477b38812d3c5ce8b93f3d8f65cfa4836f4b9ca861e7c935491a420b2f48d95acd8fd712dab10d95fffdd7868b072615d3d0fdec11e3c
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
-"listr2@npm:^5.0.5":
+"listr2@npm:^5.0.7":
   version: 5.0.7
   version: 5.0.7
   resolution: "listr2@npm:5.0.7"
   resolution: "listr2@npm:5.0.7"
   dependencies:
   dependencies:
@@ -3389,9 +3383,9 @@ __metadata:
   linkType: hard
   linkType: hard
 
 
 "lru-cache@npm:^7.7.1":
 "lru-cache@npm:^7.7.1":
-  version: 7.18.1
-  resolution: "lru-cache@npm:7.18.1"
-  checksum: ab0ec1360c552f1ffa54b1eaf0026126c5116a07bee156b92d1e971f4c8c88e9160f0fad4ab6fed4e0fdea84f25a4590ece085bc57ed9ab1d90b17f0b138c556
+  version: 7.18.3
+  resolution: "lru-cache@npm:7.18.3"
+  checksum: e550d772384709deea3f141af34b6d4fa392e2e418c1498c078de0ee63670f1f46f5eee746e8ef7e69e1c895af0d4224e62ee33e66a543a14763b0f2e74c1356
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
@@ -3931,7 +3925,7 @@ __metadata:
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
-"object-inspect@npm:^1.12.2":
+"object-inspect@npm:^1.12.3":
   version: 1.12.3
   version: 1.12.3
   resolution: "object-inspect@npm:1.12.3"
   resolution: "object-inspect@npm:1.12.3"
   checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db
   checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db
@@ -5722,6 +5716,13 @@ __metadata:
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
+"supports-color@npm:9.3.1":
+  version: 9.3.1
+  resolution: "supports-color@npm:9.3.1"
+  checksum: 00c4d1082a7ba0ee21cba1d4e4a466642635412e40476777b530aa5110d035e99a420cd048e1fb6811f2254c0946095fbb87a1eccf1af1d1ca45ab0a4535db93
+  languageName: node
+  linkType: hard
+
 "supports-color@npm:^5.3.0, supports-color@npm:^5.4.0":
 "supports-color@npm:^5.3.0, supports-color@npm:^5.4.0":
   version: 5.5.0
   version: 5.5.0
   resolution: "supports-color@npm:5.5.0"
   resolution: "supports-color@npm:5.5.0"
@@ -6238,7 +6239,7 @@ __metadata:
   languageName: node
   languageName: node
   linkType: hard
   linkType: hard
 
 
-"yaml@npm:2.2.1, yaml@npm:^2.1.1, yaml@npm:^2.1.3":
+"yaml@npm:2.2.1, yaml@npm:^2.1.1, yaml@npm:^2.2.1":
   version: 2.2.1
   version: 2.2.1
   resolution: "yaml@npm:2.2.1"
   resolution: "yaml@npm:2.2.1"
   checksum: 84f68cbe462d5da4e7ded4a8bded949ffa912bc264472e5a684c3d45b22d8f73a3019963a32164023bdf3d83cfb6f5b58ff7b2b10ef5b717c630f40bd6369a23
   checksum: 84f68cbe462d5da4e7ded4a8bded949ffa912bc264472e5a684c3d45b22d8f73a3019963a32164023bdf3d83cfb6f5b58ff7b2b10ef5b717c630f40bd6369a23

Некоторые файлы не были показаны из-за большого количества измененных файлов