User interface improvements part #3

3 files changed, 123 insertions, 27 deletions

diff --git a/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
index c12a9e406..537b2ea8e 100644
--- a/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
+++ b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
@@ -248,7 +248,7 @@ select:focus,
 select:hover,
 textarea:focus,
 textarea:hover {
-	background: #f2f3f9;
+	background-color: #f2f3f9;
 }
 
 select,
@@ -263,35 +263,67 @@ td input[type=password] {
 	width: 99%;
 }
 
-input.cbi-button {
+input.cbi-input-user {
+	background: url('../resources/cbi/user.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+}
+
+input.cbi-input-key {
+	background: url('../resources/cbi/key.gif') no-repeat scroll 1px center;
+	background-color: inherit;
 	padding-left: 17px;
-	padding-right: 1px;
 }
 
+input.cbi-input-add,
 input.cbi-button-add {
-	background: transparent url('../resources/cbi/add.gif') no-repeat scroll 1px center;
+	background: url('../resources/cbi/add.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
 }
 
+input.cbi-input-fieldadd,
 input.cbi-button-fieldadd {
-	background: transparent url(../resources/cbi/fieldadd.gif) no-repeat scroll 1px center;
+	background: url(../resources/cbi/fieldadd.gif) no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
 }
 
+input.cbi-input-reset,
 input.cbi-button-reset {
-	background: transparent url('../resources/cbi/reset.gif') no-repeat scroll 1px center;
+	background: url('../resources/cbi/reset.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
 }
 
+input.cbi-input-save,
 input.cbi-button-save {
-	background: transparent url('../resources/cbi/save.gif') no-repeat scroll 1px center;
+	background: url('../resources/cbi/save.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
 }
 
+input.cbi-input-apply,
 input.cbi-button-apply {
-	background: transparent url('../resources/cbi/apply.gif') no-repeat scroll 1px center;
+	background: url('../resources/cbi/apply.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
 }
 
+input.cbi-input-remove,
 div.cbi-section-remove input {
-	background: transparent url('../resources/cbi/remove.gif') no-repeat scroll 1px center;
+	background: url('../resources/cbi/remove.gif') no-repeat scroll 1px center;
+	background-color: inherit;
 	padding-left: 17px;
 	padding-right: 1px;
+}
+
+div.cbi-section-remove input {
 	border-bottom: none;
 }
 
diff --git a/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css b/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
index 25d5e2741..ddc3bdc06 100644
--- a/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
+++ b/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
@@ -233,7 +233,7 @@ select:focus,
 select:hover,
 textarea:focus,
 textarea:hover {
-	background: #ffffff;
+	background-color: #ffffff;
 }
 
 select,
@@ -248,35 +248,67 @@ td input[type=password] {
 	width: 99%;
 }
 
-input.cbi-button {
+input.cbi-input-user {
+	background: url('../resources/cbi/user.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+}
+
+input.cbi-input-key {
+	background: url('../resources/cbi/key.gif') no-repeat scroll 1px center;
+	background-color: inherit;
 	padding-left: 17px;
-	padding-right: 1px;
 }
 
+input.cbi-input-add,
 input.cbi-button-add {
-	background: transparent url('../resources/cbi/add.gif') no-repeat scroll 1px center;
+	background: url('../resources/cbi/add.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
 }
 
+input.cbi-input-fieldadd,
 input.cbi-button-fieldadd {
-	background: transparent url(../resources/cbi/fieldadd.gif) no-repeat scroll 1px center;
+	background: url(../resources/cbi/fieldadd.gif) no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
 }
 
+input.cbi-input-reset,
 input.cbi-button-reset {
-	background: transparent url('../resources/cbi/reset.gif') no-repeat scroll 1px center;
+	background: url('../resources/cbi/reset.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
 }
 
+input.cbi-input-save,
 input.cbi-button-save {
-	background: transparent url('../resources/cbi/save.gif') no-repeat scroll 1px center;
+	background: url('../resources/cbi/save.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
 }
 
+input.cbi-input-apply,
 input.cbi-button-apply {
-	background: transparent url('../resources/cbi/apply.gif') no-repeat scroll 1px center;
+	background: url('../resources/cbi/apply.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
 }
 
+input.cbi-input-remove,
 div.cbi-section-remove input {
-	background: transparent url('../resources/cbi/remove.gif') no-repeat scroll 1px center;
+	background: url('../resources/cbi/remove.gif') no-repeat scroll 1px center;
+	background-color: inherit;
 	padding-left: 17px;
 	padding-right: 1px;
+}
+
+div.cbi-section-remove input {
 	border-bottom: none;
 }
 
diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
index 2b1946c0f..f86a837ee 100644
--- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
@@ -241,7 +241,7 @@ select:focus,
 select:hover,
 textarea:focus,
 textarea:hover {
-	background: #ffffff;
+	background-color: #ffffff;
 }
 
 select,
@@ -256,35 +256,67 @@ td input[type=password] {
 	width: 99%;
 }
 
-input.cbi-button {
+input.cbi-input-user {
+	background: url('../resources/cbi/user.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+}
+
+input.cbi-input-key {
+	background: url('../resources/cbi/key.gif') no-repeat scroll 1px center;
+	background-color: inherit;
 	padding-left: 17px;
-	padding-right: 1px;
 }
 
+input.cbi-input-add,
 input.cbi-button-add {
-	background: transparent url('../resources/cbi/add.gif') no-repeat scroll 1px center;
+	background: url('../resources/cbi/add.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
 }
 
+input.cbi-input-fieldadd,
 input.cbi-button-fieldadd {
-	background: transparent url(../resources/cbi/fieldadd.gif) no-repeat scroll 1px center;
+	background: url(../resources/cbi/fieldadd.gif) no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
 }
 
+input.cbi-input-reset,
 input.cbi-button-reset {
-	background: transparent url('../resources/cbi/reset.gif') no-repeat scroll 1px center;
+	background: url('../resources/cbi/reset.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
 }
 
+input.cbi-input-save,
 input.cbi-button-save {
-	background: transparent url('../resources/cbi/save.gif') no-repeat scroll 1px center;
+	background: url('../resources/cbi/save.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
 }
 
+input.cbi-input-apply,
 input.cbi-button-apply {
-	background: transparent url('../resources/cbi/apply.gif') no-repeat scroll 1px center;
+	background: url('../resources/cbi/apply.gif') no-repeat scroll 1px center;
+	background-color: inherit;
+	padding-left: 17px;
+	padding-right: 1px;
 }
 
+input.cbi-input-remove,
 div.cbi-section-remove input {
-	background: transparent url('../resources/cbi/remove.gif') no-repeat scroll 1px center;
+	background: url('../resources/cbi/remove.gif') no-repeat scroll 1px center;
+	background-color: inherit;
 	padding-left: 17px;
 	padding-right: 1px;
+}
+
+div.cbi-section-remove input {
 	border-bottom: none;
 }