* luci/themes: more fixes for openwrt.org theme

2 files changed, 14 insertions, 12 deletions

diff --git a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
index c609b6bc2..2db6bbdb1 100644
--- a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
+++ b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
@@ -12,11 +12,11 @@ You may obtain a copy of the License at
 $Id$
 
 -%>
-								<div class="cbi-value-description"><%=self.description%>&nbsp;</div>
+								<% if #self.description > 0 then %><div class="cbi-value-description"><%=self.description%></div><% end %>
 							</div>
 							<% if self.tag_invalid[section] then %><div class="cbi-error"><%:cbi_invalid%></div><% end %>
 						</div>
 						<% if #self.deps > 0 then %><script type="text/javascript">
 							<% for j, d in ipairs(self.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option%>", "cbid.<%=self.config.."."..section.."."..d.field%>", "<%=d.value%>");
 							<% end %>
-						</script><% end %>
\ No newline at end of file
+						</script><% end %>
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 ef1b57a1b..a7ea61561 100644
--- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
@@ -75,10 +75,6 @@ div#content ul {
 	color: #ffffff;
 }
 
-* html .mainmenu {
-	height: 1.8em;
-}
-
 .mainmenu div {
 	float: left;
 }
@@ -155,7 +151,7 @@ div#content ul {
 
 #content {
 	clear: both;
-	width: 60%;
+	width: 80%;
 	margin: 0 auto;
 	padding: 0.5em;
 	background: #f5f5f5;
@@ -280,16 +276,18 @@ div.cbi-value:last-child {
 
 .cbi-value-title {
 	float: left;
-	width: 30%;
+	width: 40%;
 	margin: 0.25em 0;
 }
 
 div.cbi-value-field {
-	width: 68%;
-	margin: 0.25em 0 0.25em 30%;
+	width: 58%;
+	margin: 0.25em 0 0.25em 40%;
 }
 
 div.cbi-value-description {
+	width: 58%;
+	margin-left: 40%;
 	font-size: 90%;
 }
 
@@ -375,8 +373,8 @@ td.cbi-section-table-optionals {
 }
 
 * html div#content {
-	margin-left: -60% !important;
-	width: 120% !important;
+	margin-left: -80% !important;
+	width: 160% !important;
 }
 
 * html div.mainmenu div.hover ul,
@@ -403,3 +401,7 @@ td.cbi-section-table-optionals {
 	height: 1em !important;
 	width: 10em !important;
 }
+
+* html .mainmenu {
+	height: 1.8em;
+}