Merge pull request #4754 from Ansuel/improvesysupg

luci-mod-system: improve sysupgrade page

3 files changed, 14 insertions, 19 deletions

diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
index 5b5b7ac2dc..cc7e84d133 100644
--- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
@@ -1752,6 +1752,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 	border-style: solid;
 	border-radius: 4px;
 	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+	white-space: unset;
 }
 
 .alert-message .close {
diff --git a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
index 10d8a02bdd..450aeca9fc 100644
--- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
+++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
@@ -189,7 +189,7 @@ button,
 select,
 input,
 .cbi-dropdown {
-	height: 1.8rem;
+	min-height: 1.8rem;
 	padding: 0;
 	color: rgba(0, 0, 0, .87);
 	border: 0;
@@ -1661,6 +1661,7 @@ body:not(.Interfaces) .cbi-rowstyle-2:first-child {
 
 .modal ul {
 	margin-left: 2.2em;
+	word-break: break-word;
 }
 
 .modal li {
@@ -1673,23 +1674,20 @@ body:not(.Interfaces) .cbi-rowstyle-2:first-child {
 	word-break: break-word;
 }
 
-.modal .label {
-	font-size: .6rem;
-	font-weight: normal;
-	padding: .1rem .3rem;
-	padding-bottom: 0;
-	cursor: default;
-	border-radius: 0;
+.modal label.btn {
+	display: flex;
+	align-items: center;
+	white-space: normal;
+	text-align: left;
+	text-transform: none;
+	padding-bottom: 0.2rem;
+	padding-top: 0.2rem;
 }
 
-.modal .label.warning {
+.modal label.warning {
 	background-color: #f0ad4e !important;
 }
 
-.modal .btn {
-	padding: .3rem .6rem;
-}
-
 .modal.cbi-modal {
 	max-width: 90%;
 	max-height: none;
@@ -2124,11 +2122,7 @@ span[data-tooltip] .label {
 
 label > input[type="checkbox"],
 label > input[type="radio"] {
-	position: relative;
-	top: .4rem;
-	right: .2rem;
-	margin: 0;
-	vertical-align: bottom;
+	margin-right: 0.8rem;
 }
 
 label[data-index][data-depends] {
diff --git a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
index e9880a3809..a3a9165d5b 100644
--- a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
@@ -658,7 +658,7 @@ img.cbi-image-button {
 	text-align: center;
 	font-weight: bold;
 	line-height: 12px;
-	height: 22px;
+	min-height: 22px;
 	line-height: 20px;
 	box-sizing: border-box;
 	cursor: pointer;