* 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 8084cfda984e74576ff79d454011c96d8c589320..a01f6bd6c876dc1c61da29f07511fbf572a25835 100644 (file)
--- 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 add60dfb1c19f513e7a1256ffe674d2aa30d74c4..a022bccbf8240a6fd0abc1d66e6de21c4568e690 100644 (file)
--- 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;
 }