Merge remote-tracking branch 'upstream/main' into ipv6

web/css/src/themes/dark.css

@@ -313,7 +313,7 @@ strong {
 
 .card-content {
 	color: #fafafa;
-	text-shadow: 0 1px rgb(0 0 0 / 95%) !important;
+	text-shadow: 0 1px rgb(0 0 0 / 95%);
 }
 
 /* Server summary component
@@ -448,17 +448,15 @@ strong {
 	color: #dadada;
 }
 
-.l-unit__stats:hover {
-	background: transparent !important;
-}
-
-.l-unit__stat-col--left a,
-.l-unit__stat-col--left a:visited {
-	color: #fafafa;
-}
+.l-unit__stat-col--left {
+	& a,
+	& a:visited {
+		color: #fafafa;
+	}
 
-.l-unit__stat-col--left a:hover {
-	color: #fff;
+	& a:hover {
+		color: #fff;
+	}
 }
 
 /* Forms

web/css/src/themes/default.css

@@ -474,8 +474,8 @@
 	}
 
 	@media (--viewport-large) {
-		padding-left: 30px;
-		padding-right: 30px;
+		padding-left: 25px;
+		padding-right: 25px;
 	}
 }
 
@@ -485,7 +485,7 @@
 
 	& .fas {
 		color: #999;
-		margin-left: 5px;
+		margin-left: 6px;
 	}
 
 	@media (--viewport-medium) {
@@ -1169,14 +1169,14 @@
 .l-unit__stats {
 	margin-bottom: 10px;
 	margin-left: 15%;
-	border-left: 1px solid transparent !important;
-	border-right: 1px solid transparent !important;
+	border-left: 1px solid transparent;
+	border-right: 1px solid transparent;
 
 	&:hover {
-		border-left: 1px solid transparent !important;
-		border-right: 1px solid transparent !important;
-		box-shadow: none !important;
-		background: none !important;
+		border-left: 1px solid transparent;
+		border-right: 1px solid transparent;
+		box-shadow: none;
+		background: none;
 	}
 
 	& table {
@@ -1200,83 +1200,83 @@
 	float: right;
 }
 
-.l-unit__stat-col--left a,
-.l-unit__stat-col--left a:visited {
-	color: #353535;
-}
-
-.l-unit__stat-col--left a:hover {
-	color: #4c8bbe;
-}
-
 .l-unit__stat-col--left {
 	float: left;
 	width: 110px;
-}
 
-.l-unit__stat-col--left.border {
-	border-left: 1px solid #ebebeb;
-}
+	&.border {
+		border-left: 1px solid #ebebeb;
+	}
 
-.l-unit__stat-col--left.border-clear {
-	border-left: 1px solid transparent;
-}
+	&.border-clear {
+		border-left: 1px solid transparent;
+	}
 
-.l-unit__stat-col--left.super-compact {
-	width: 50px;
-	white-space: nowrap;
-}
+	& a,
+	& a:visited {
+		color: #353535;
+	}
 
-.l-unit__stat-col--left.compact {
-	width: 60px;
-}
+	& a:hover {
+		color: #4c8bbe;
+	}
 
-.l-unit__stat-col--left.compact-1 {
-	width: 70px;
-}
+	&.super-compact {
+		width: 50px;
+		white-space: nowrap;
+	}
 
-.l-unit__stat-col--left.compact-2 {
-	width: 80px;
-}
+	&.compact {
+		width: 60px;
+	}
 
-.l-unit__stat-col--left.compact-3 {
-	width: 90px;
-}
+	&.compact-1 {
+		width: 70px;
+	}
 
-.l-unit__stat-col--left.compact-4 {
-	width: 130px;
-}
+	&.compact-2 {
+		width: 80px;
+	}
 
-.l-unit__stat-col--left.compact-5 {
-	width: 160px;
-}
+	&.compact-3 {
+		width: 90px;
+	}
 
-.l-unit__stat-col--left.wide {
-	width: 190px;
-}
+	&.compact-4 {
+		width: 130px;
+	}
 
-.l-unit__stat-col--left.wide-2 {
-	width: 230px;
-}
+	&.compact-5 {
+		width: 160px;
+	}
 
-.l-unit__stat-col--left.wide-3 {
-	width: 250px;
-}
+	&.wide {
+		width: 190px;
+	}
 
-.l-unit__stat-col--left.wide-4 {
-	width: 320px;
-}
+	&.wide-2 {
+		width: 230px;
+	}
 
-.l-unit__stat-col--left.wide-5 {
-	width: 350px;
-}
+	&.wide-3 {
+		width: 250px;
+	}
 
-.l-unit__stat-col--left.wide-6 {
-	width: 440px;
-}
+	&.wide-4 {
+		width: 320px;
+	}
+
+	&.wide-5 {
+		width: 350px;
+	}
 
-.l-unit__stat-col--left.wide-7 {
-	width: 550px;
+	&.wide-6 {
+		width: 440px;
+	}
+
+	&.wide-7 {
+		width: 550px;
+	}
 }
 
 .l-unit__stat-col--right {
@@ -1284,18 +1284,6 @@
 	max-width: 170px;
 }
 
-.l-unit-toolbar__col--left {
-	float: left;
-	margin-left: -15px;
-	margin-top: 0;
-	padding-bottom: 0;
-	padding-left: 15px;
-	padding-top: 15px;
-	width: 30px;
-	cursor: pointer;
-	display: none;
-}
-
 .l-unit-toolbar__col--right {
 	float: right;
 }

web/css/src/themes/flat.css

@@ -66,13 +66,15 @@ strong {
 	box-shadow: none;
 }
 
-.l-unit__stat-col--left a,
-.l-unit__stat-col--left a:visited {
-	color: #5f7eb3;
-}
+.l-unit__stat-col--left {
+	& a,
+	& a:visited {
+		color: #5f7eb3;
+	}
 
-.l-unit__stat-col--left a:hover {
-	color: #474747;
+	& a:hover {
+		color: #5f7eb3;
+	}
 }
 
 .l-unit:hover,

web/css/src/themes/vestia.css

@@ -218,13 +218,15 @@ strong {
 	box-shadow: none;
 }
 
-.l-unit__stat-col--left a,
-.l-unit__stat-col--left a:visited {
-	color: #111;
-}
+.l-unit__stat-col--left {
+	& a,
+	& a:visited {
+		color: #111;
+	}
 
-.l-unit__stat-col--left a:hover {
-	color: #ff6701;
+	& a:hover {
+		color: #ff6701;
+	}
 }
 
 .l-unit:hover,

web/css/themes/flat.min.css

@@ -1 +1 @@
-:root{--alert-box-shadow:none;--alert-text-shadow:none}b,strong{font-weight:600}.top-bar{background:#5070a6;box-shadow:none}.top-bar-usage-inner{text-shadow:none}.top-bar-notifications-list{border:1px solid #ccc;box-shadow:none}.top-bar-menu-link{text-shadow:none}.top-bar-menu-link:active,.top-bar-menu-link:hover{background:#fff;box-shadow:none}.top-bar-menu-link.active{background:#fff}.toolbar-sorting-menu{background-color:#fff;border-color:#ccc;box-shadow:none}.table-header{background:#fafafa}.l-unit:hover,.table-header{box-shadow:none}.l-unit__stat-col--left a,.l-unit__stat-col--left a:visited{color:#5f7eb3}.l-unit__stat-col--left a:hover{color:#474747}.badge,.l-unit:hover,.units .l-unit:hover{box-shadow:none}.collapse-header{background:#fafafa;box-shadow:none}.button,.form-control,.form-select{box-shadow:none}.button{background:linear-gradient(180deg,#ebf3f9 0,#dfebf5)}.button:hover{background:linear-gradient(180deg,#f1f8fd 0,#e3f0fb);box-shadow:none;color:#6986b7}.button:active,.button:focus{background:linear-gradient(180deg,#d2e8fa 0,#c2e0f8);box-shadow:none}.button-secondary{background:linear-gradient(180deg,#fafafa 0,#f1f1f1);box-shadow:none}.button-danger:hover{background:#fcd3cf;border-color:#f27e71;color:#f4301a}.button-danger :focus,.button-danger:active{background:#a91200;border-color:#f4301a;color:#fff}.ui-dialog{box-shadow:0 2px 11px 0 rgba(0,0,0,.5)}.ui-dialog .ui-dialog-buttonpane button:nth-of-type(2){box-shadow:none}.body-login,.body-reset{background:#5f7eb3}@media (min-width:480px){.login{background-color:hsla(0,0%,100%,.8);box-shadow:0 2px 10px rgba(0,0,0,.3),inset 0 0 2px #fff}}
+:root{--alert-box-shadow:none;--alert-text-shadow:none}b,strong{font-weight:600}.top-bar{background:#5070a6;box-shadow:none}.top-bar-usage-inner{text-shadow:none}.top-bar-notifications-list{border:1px solid #ccc;box-shadow:none}.top-bar-menu-link{text-shadow:none}.top-bar-menu-link:active,.top-bar-menu-link:hover{background:#fff;box-shadow:none}.top-bar-menu-link.active{background:#fff}.toolbar-sorting-menu{background-color:#fff;border-color:#ccc;box-shadow:none}.table-header{background:#fafafa}.l-unit:hover,.table-header{box-shadow:none}.l-unit__stat-col--left a,.l-unit__stat-col--left a:hover,.l-unit__stat-col--left a:visited{color:#5f7eb3}.badge,.l-unit:hover,.units .l-unit:hover{box-shadow:none}.collapse-header{background:#fafafa;box-shadow:none}.button,.form-control,.form-select{box-shadow:none}.button{background:linear-gradient(180deg,#ebf3f9 0,#dfebf5)}.button:hover{background:linear-gradient(180deg,#f1f8fd 0,#e3f0fb);box-shadow:none;color:#6986b7}.button:active,.button:focus{background:linear-gradient(180deg,#d2e8fa 0,#c2e0f8);box-shadow:none}.button-secondary{background:linear-gradient(180deg,#fafafa 0,#f1f1f1);box-shadow:none}.button-danger:hover{background:#fcd3cf;border-color:#f27e71;color:#f4301a}.button-danger :focus,.button-danger:active{background:#a91200;border-color:#f4301a;color:#fff}.ui-dialog{box-shadow:0 2px 11px 0 rgba(0,0,0,.5)}.ui-dialog .ui-dialog-buttonpane button:nth-of-type(2){box-shadow:none}.body-login,.body-reset{background:#5f7eb3}@media (min-width:480px){.login{background-color:hsla(0,0%,100%,.8);box-shadow:0 2px 10px rgba(0,0,0,.3),inset 0 0 2px #fff}}

web/js/pages/add_dns_rec.js

@@ -2,6 +2,7 @@
 //
 // Updates database dns record dynamically, showing its full domain path
 App.Actions.DB.update_dns_record_hint = function (elm, hint) {
+	domain = $('input[name="v_domain"]').val();
 	// clean hint
 	if (hint.trim() == '') {
 		$(elm).parent().find('.hint').text('');
@@ -13,7 +14,7 @@ App.Actions.DB.update_dns_record_hint = function (elm, hint) {
 	}
 
 	// dont show pregix if domain name = rec value
-	if (hint == Alpine.store('globals').DNS_REC_PREFIX + '.') {
+	if (hint == domain) {
 		hint = '';
 	}
 
@@ -25,7 +26,7 @@ App.Actions.DB.update_dns_record_hint = function (elm, hint) {
 	$(elm)
 		.parent()
 		.find('.hint')
-		.text(hint + Alpine.store('globals').DNS_REC_PREFIX);
+		.text(hint + domain);
 };
 
 //

web/js/pages/edit_dns_rec.js

@@ -3,6 +3,7 @@
 // Updates database dns record dynamically, showing its full domain path
 App.Actions.DB.update_dns_record_hint = function (elm, hint) {
 	// clean hint
+	domain = $('input[name="v_domain"]').val();
 	if (hint.trim() == '') {
 		$(elm).parent().find('.hint').text('');
 	}
@@ -13,7 +14,7 @@ App.Actions.DB.update_dns_record_hint = function (elm, hint) {
 	}
 
 	// dont show prefix if domain name = rec value
-	if (hint == Alpine.store('globals').DNS_REC_PREFIX + '.') {
+	if (hint == domain) {
 		hint = '';
 	}
 
@@ -25,7 +26,7 @@ App.Actions.DB.update_dns_record_hint = function (elm, hint) {
 	$(elm)
 		.parent()
 		.find('.hint')
-		.text(hint + Alpine.store('globals').DNS_REC_PREFIX);
+		.text(hint + domain);
 };
 
 //