2 files changed, 73 insertions, 15 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 d0348a197e..a85d95a95f 100644
--- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
@@ -1451,6 +1451,32 @@ footer {
 	opacity: .6;
 }
 
+input[type="text"] + .cbi-button,
+input[type="password"] + .cbi-button,
+select + .cbi-button {
+	border-radius: 0 3px 3px 0;
+	border-color: #ccc;
+	margin: 0 0 1px -2px;
+	padding: 0 6px;
+	vertical-align: top;
+	height: 28px;
+	font-size: 14px;
+	font-weight: bold;
+	line-height: 28px;
+}
+
+select + .cbi-button {
+	border-left-color: transparent;
+}
+
+.cbi-title-ref {
+	color: #37c;
+}
+
+.cbi-title-ref::after {
+	content: "➙";
+}
+
 .cbi-tooltip-container {
 	cursor: help;
 }
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 dc36ab3f95..4d3333739c 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
@@ -429,11 +429,11 @@ p {
 }
 
 .cbi-title-ref {
-	color: inherit;
-	text-decoration: none;
-	padding-right: 18px;
-	background: url('../resources/cbi/link.gif') no-repeat scroll right center;
-	background-color: inherit;
+	color: #37c;
+}
+
+.cbi-title-ref::after {
+	content: "➙";
 }
 
 ul.cbi-apply {
@@ -850,7 +850,9 @@ div.cbi-optionals {
 	margin-left: 50%;
 }
 
-.cbi-page-actions > .cbi-button-apply + .cbi-button-save {
+.cbi-page-actions > .cbi-button-apply + .cbi-button-save,
+.cbi-page-actions > .cbi-button-save + form[method="post"],
+.cbi-page-actions > form[method="post"] + form[method="post"] {
 	margin-left: 3px;
 }
 
@@ -874,7 +876,18 @@ div.cbi-optionals {
 	white-space: nowrap;
 }
 
-.tr.placeholder .td[data-title]::before {
+.td[data-description]::after {
+	content: attr(data-description);
+	font-size: 90%;
+	text-align: left;
+	display: none;
+	background: url(/luci-static/resources/cbi/help.gif) left top no-repeat;
+	padding: .125em 0 .125em 18px;
+	margin: .125em 0;
+}
+
+.tr.placeholder .td[data-title]::before,
+.tr.placeholder .td[data-description]::after {
 	display: none;
 }
 
@@ -1133,6 +1146,19 @@ ul.cbi-tabmenu li.cbi-tab {
 	opacity: .6;
 }
 
+input[type="text"] + .cbi-button,
+input[type="password"] + .cbi-button,
+select + .cbi-button {
+	border-radius: 0 3px 3px 0;
+	border: 1px outset #000;
+	margin: 0 0 1px -2px;
+	padding: 0 6px;
+	vertical-align: top;
+	display: inline-block;
+	height: 14pt;
+	font-size: 10pt;
+	line-height: 12pt;
+}
 
 .cbi-tooltip-container {
 	cursor: help;
@@ -1183,13 +1209,13 @@ ul.cbi-tabmenu li.cbi-tab {
 }
 
 
-.left, .left::before { text-align: left !important; }
-.right, .right::before { text-align: right !important; }
-.center, .center::before { text-align: center !important; }
+.left, .left::before, .left::after { text-align: left !important; }
+.right, .right::before, .right::after { text-align: right !important; }
+.center, .center::before, .center::after { text-align: center !important; }
 
-.top, .top::before { vertical-align: top !important; }
-.middle, .middle::before { vertical-align: middle !important; }
-.bottom, .bottom::before { vertical-align: bottom !important; }
+.top, .top::before, .top::after { vertical-align: top !important; }
+.middle, .middle::before, .middle::after { vertical-align: middle !important; }
+.bottom, .bottom::before, .bottom::after { vertical-align: bottom !important; }
 
 .td.top { align-self: flex-start; vertical-align: top; }
 .td.middle { align-self: center; vertical-align: middle; }
@@ -1602,12 +1628,18 @@ ul.cbi-tabmenu li.cbi-tab {
 		background: #eef;
 	}
 
-	.td[data-title]::before {
+	.td[data-title]::before,
+	.td[data-description]::after {
 		display: block;
 	}
 
 	.td[data-title] ~ .td.cbi-section-actions {
-		align-self: flex-end;
+		align-self: flex-start;
+	}
+
+	.td[data-title] ~ .td.cbi-section-actions::before {
+		display: block;
+		content: "\a0";
 	}
 
 	.hide-sm,