From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 20 Aug 2008 16:11:27 +0000 (+0000)
Subject: * luci/themes:	fix help text styles in openwrt.org theme
X-Git-Tag: 0.8.0~339
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9a7c358cfb684970ae050681067e4f87a079cbc0;p=oweals%2Fluci.git

* luci/themes:	fix help text styles in openwrt.org theme
---

diff --git a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
index 8084cfda9..a01f6bd6c 100644
--- a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
+++ b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
@@ -14,8 +14,13 @@ $Id$
 -%>
 
 		<% if #self.description > 0 then -%>
-			<span class="cbi-value-helpicon"><img src="<%=resource%>/cbi/help.gif" alt="<%:help%>" /></span>
-			<div class="cbi-value-description"><%=self.description%></div>
+			<% if not luci.util.instanceof( self, luci.cbi.Flag ) then -%>
+				<br />
+			<%- end %>
+			<div class="cbi-value-description">
+				<span class="cbi-value-helpicon"><img src="<%=resource%>/cbi/help.gif" alt="<%:help%>" /></span>
+				<%=self.description%>
+			</div>
 		<%- end %>
 	<%- if self.title and #self.title > 0 then -%>
 	</div>
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 add60dfb1..a022bccbf 100644
--- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
@@ -414,8 +414,10 @@ div.cbi-value-field {
 
 div.cbi-value-description {
 	font-size: 90%;
+	display: inline;
 }
 
+/*
 div.cbi-value-field > div.cbi-value-description {
 	display: none;
 }
@@ -423,6 +425,7 @@ div.cbi-value-field > div.cbi-value-description {
 div.cbi-value:hover div.cbi-value-field > div.cbi-value-description {
 	display: block;
 }
+*/
 
 div.cbi-section-create {
 	clear: left;
@@ -442,7 +445,7 @@ div.cbi-section-remove {
 }
 
 .cbi-section-node {
-	clear: both;
+	CLEAR: Both;
 	border: 1px dotted #bbbbbb;
 	padding-bottom: 0;
 }