Merged themes/fledermaus and themes/openwrt-light

2 files changed, 148 insertions, 26 deletions

diff --git a/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
index a6dbcf833..c12a9e406 100644
--- a/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
+++ b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
@@ -223,6 +223,7 @@ div#content ul {
 
 input[type=submit],
 input[type=reset],
+input[type=image],
 label {
 	cursor: pointer;
 }
@@ -232,11 +233,21 @@ input,
 textarea {
 	background: #eeeeee;
 	color: #000000;
-	border: 1px solid #000000;
+	border-width: 1px;
+	border-color: #000000;
+}
+
+input[type=image] {
+	border: none;
 }
 
+
 input:focus,
-textarea:focus {
+input:hover,
+select:focus,
+select:hover,
+textarea:focus,
+textarea:hover {
 	background: #f2f3f9;
 }
 
@@ -252,10 +263,36 @@ td input[type=password] {
 	width: 99%;
 }
 
-button.clean {
-	cursor: pointer;
-	border: none;
-	background-color: inherit;
+input.cbi-button {
+	padding-left: 17px;
+	padding-right: 1px;
+}
+
+input.cbi-button-add {
+	background: transparent url('../resources/cbi/add.gif') no-repeat scroll 1px center;
+}
+
+input.cbi-button-fieldadd {
+	background: transparent url(../resources/cbi/fieldadd.gif) no-repeat scroll 1px center;
+}
+
+input.cbi-button-reset {
+	background: transparent url('../resources/cbi/reset.gif') no-repeat scroll 1px center;
+}
+
+input.cbi-button-save {
+	background: transparent url('../resources/cbi/save.gif') no-repeat scroll 1px center;
+}
+
+input.cbi-button-apply {
+	background: transparent url('../resources/cbi/apply.gif') no-repeat scroll 1px center;
+}
+
+div.cbi-section-remove input {
+	background: transparent url('../resources/cbi/remove.gif') no-repeat scroll 1px center;
+	padding-left: 17px;
+	padding-right: 1px;
+	border-bottom: none;
 }
 
 textarea {
@@ -297,9 +334,18 @@ table.smalltext tr td {
 	border-left: 1px solid #666666;
 }
 
+.cbi-rowstyle-1 {
+	background-color: #eeeeff;
+}
+
+.cbi-rowstyle-2 {
+
+}
+
 div.cbi-value {
 	clear: left;
-	padding: 0.25em;
+	vertical-align: middle;
+	padding-left: 0.25em;
 	border-bottom: 1px dotted #bbbbbb;
 }
 
@@ -314,7 +360,6 @@ div.cbi-value:last-child {
 .cbi-value-title {
 	float: left;
 	width: 40%;
-	margin: 0.25em 0;
 }
 
 div.cbi-value-field {
@@ -351,17 +396,16 @@ div.cbi-section-remove {
 	float: right;
 }
 
-div.cbi-section-remove input {
-	border-color: #bbbbbb;
-	border-bottom: none;
-}
-
 .cbi-section-node {
 	clear: both;
 	border: 1px dotted #bbbbbb;
 	padding-bottom: 0;
 }
 
+.cbi-section-node div.cbi-section-table-row {
+	margin: 0.25em;
+}
+
 table.cbi-section-table {
 	width: 100%;
 	font-size: 95%;
@@ -382,6 +426,16 @@ td.cbi-section-table-optionals {
 	padding-top: 1em;
 }
 
+.cbi-value-helpicon img {
+	vertical-align: bottom;
+}
+
+div.cbi-error {
+	font-size: 95%;
+	font-weight: bold;
+	color: #FF0000;
+}
+
 .right {
 	text-align: right;
 }
@@ -403,6 +457,13 @@ td.cbi-section-table-optionals {
 	display: inline;
 }
 
+.error500 {
+	white-space: normal;
+	border: 1px dotted #FF0000;
+	background-color: #FFFFFF;
+	padding: 0.5em;
+}
+
 #memorybar {
 	width:200px;
 	height:8px;
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 42b9b33a5..25d5e2741 100644
--- a/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
+++ b/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
@@ -208,20 +208,31 @@ div#content ul {
 
 input[type=submit],
 input[type=reset],
+input[type=image],
 label {
 	cursor: pointer;
 }
 
+
 select,
 input,
 textarea {
 	background: #eeeeee;
 	color: #000000;
-	border: 1px solid #000000;
+	border-width: 1px;
+	border-color: #000000;
+}
+
+input[type=image] {
+	border: none;
 }
 
 input:focus,
-textarea:focus {
+input:hover,
+select:focus,
+select:hover,
+textarea:focus,
+textarea:hover {
 	background: #ffffff;
 }
 
@@ -237,10 +248,36 @@ td input[type=password] {
 	width: 99%;
 }
 
-button.clean {
-	cursor: pointer;
-	border: none;
-	background-color: inherit;
+input.cbi-button {
+	padding-left: 17px;
+	padding-right: 1px;
+}
+
+input.cbi-button-add {
+	background: transparent url('../resources/cbi/add.gif') no-repeat scroll 1px center;
+}
+
+input.cbi-button-fieldadd {
+	background: transparent url(../resources/cbi/fieldadd.gif) no-repeat scroll 1px center;
+}
+
+input.cbi-button-reset {
+	background: transparent url('../resources/cbi/reset.gif') no-repeat scroll 1px center;
+}
+
+input.cbi-button-save {
+	background: transparent url('../resources/cbi/save.gif') no-repeat scroll 1px center;
+}
+
+input.cbi-button-apply {
+	background: transparent url('../resources/cbi/apply.gif') no-repeat scroll 1px center;
+}
+
+div.cbi-section-remove input {
+	background: transparent url('../resources/cbi/remove.gif') no-repeat scroll 1px center;
+	padding-left: 17px;
+	padding-right: 1px;
+	border-bottom: none;
 }
 
 textarea {
@@ -282,9 +319,18 @@ table.smalltext tr td {
 	border-left: 1px solid #666666;
 }
 
+.cbi-rowstyle-1 {
+	background-color: #eeeeff;
+}
+
+.cbi-rowstyle-2 {
+
+}
+
 div.cbi-value {
 	clear: left;
-	padding: 0.25em;
+	vertical-align: middle;
+	padding-left: 0.25em;
 	border-bottom: 1px dotted #bbbbbb;
 }
 
@@ -299,7 +345,6 @@ div.cbi-value:last-child {
 .cbi-value-title {
 	float: left;
 	width: 40%;
-	margin: 0.25em 0;
 }
 
 div.cbi-value-field {
@@ -336,17 +381,16 @@ div.cbi-section-remove {
 	float: right;
 }
 
-div.cbi-section-remove input {
-	border-color: #bbbbbb;
-	border-bottom: none;
-}
-
 .cbi-section-node {
 	clear: both;
 	border: 1px dotted #bbbbbb;
 	padding-bottom: 0;
 }
 
+.cbi-section-node div.cbi-section-table-row {
+	margin: 0.25em;
+}
+
 table.cbi-section-table {
 	width: 100%;
 	font-size: 95%;
@@ -367,6 +411,16 @@ td.cbi-section-table-optionals {
 	padding-top: 1em;
 }
 
+.cbi-value-helpicon img {
+	vertical-align: bottom;
+}
+
+div.cbi-error {
+	font-size: 95%;
+	font-weight: bold;
+	color: #FF0000;
+}
+
 .right {
 	text-align: right;
 }
@@ -388,6 +442,13 @@ td.cbi-section-table-optionals {
 	display: inline;
 }
 
+.error500 {
+	white-space: normal;
+	border: 1px dotted #FF0000;
+	background-color: #FFFFFF;
+	padding: 0.5em;
+}
+
 #memorybar {
 	width:200px;
 	height:8px;