* luci/themes/openwrt.org: fourth round of layout fixes, affects IE6 and IE7

4 files changed, 92 insertions, 77 deletions

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 4f2491b5d..7457977c0 100644
--- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
@@ -136,32 +136,15 @@ ul.dropdowns li ul {
 	min-width: 10em;
 }
 
-* html ul.dropdowns li ul {
-	width: 10em;
-}
-
 ul.dropdowns li li {
 	float: none;
 	position: relative;
 }
 
-* html ul.dropdowns li li {
-	clear: both;
-	float: left;
-}
-
-* html ul.dropdowns li li {
-	width: 100%;
-}
-
 ul.dropdowns li a {
 	display: block;
 }
 
-* html ul.dropdowns li li a {
-	height: 1%;
-}
-
 ul.dropdowns ul li ul {
 	top: 0;
 }
@@ -397,25 +380,16 @@ html #menubar a:visited.warning {
 	color: #555555;
 }
 
-*+html .cbi-section legend {
-	background-color: #ffffff;
-	color: #555555;
-}
-
-* html .cbi-section legend {
-	background-color: #ffffff;
-	color: #555555;
-}
-
 .cbi-section h2 {
 	margin: 0em 0 0.5em -0.5em !important;
 }
 
 .cbi-section h3 {
-	height:	1.5em;
-	font-size: 90%;
-	background-color: #ffffff;
-	color: #555555;
+	text-decoration: none !important;
+	font-weight: bold !important;
+	color: #555555 !important;
+	margin: 0.25em !important;
+	font-size: 100% !important;
 }
 
 .cbi-section-descr {
@@ -639,6 +613,7 @@ div.cbi-value:hover {
 .cbi-value-title {
 	float: left;
 	width: 40%;
+	line-height: 1.8em;
 }
 
 div.cbi-value-field {
@@ -811,50 +786,4 @@ td.cbi-value-error {
 	color: black;
 }
 
-
-/* obligatory IE6 Voodoo Code */
-
-* html body {
-	padding-left: 50% !important;
-}
-
-* html div#header {
-	margin-left: -100% !important;
-}
-
-* html div#menubar {
-	margin-left: -100% !important;
-	width: 200% !important;
-}
-
-* html div#maincontent {
-	margin-left: -80% !important;
-	width: 160% !important;
-}
-
-* html div.cbi-value-description {
-	width: auto !important;
-}
-
-* html div.cbi-value-field {
-	margin-left: 0 !important;
-	width: 100% !important;
-}
-
-* html .cbi-input-text,
-* html .cbi-input-user,
-* html .cbi-input-select,
-* html .cbi-input-password {
-	width: 50% !important;
-}
-
-* html table.cbi-section-table td .cbi-input-text,
-* html table.cbi-section-table td .cbi-input-select {
-	width: 100% !important;
-}
-
-* html div.cbi-page-actions {
-	text-align: right !important;
-}
-
 }
diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie6.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie6.css
new file mode 100644
index 000000000..d65da4a19
--- /dev/null
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie6.css
@@ -0,0 +1,71 @@
+/* obligatory IE6 Voodoo Code */
+
+* html body {
+	padding-left: 50% !important;
+}
+
+* html div#header {
+	margin-left: -100% !important;
+}
+
+* html div#menubar {
+	margin-left: -100% !important;
+	width: 200% !important;
+}
+
+* html ul.dropdowns li ul {
+	width: 10em;
+}
+
+* html ul.dropdowns li li {
+	clear: both;
+	float: left;
+}
+
+* html ul.dropdowns li li {
+	width: 100%;
+}
+
+* html ul.dropdowns li li a {
+	height: 1%;
+}
+
+* html div#maincontent {
+	margin-left: -80% !important;
+	width: 160% !important;
+}
+
+* html div.cbi-value-description {
+	width: auto !important;
+}
+
+* html div.cbi-value-field {
+	margin-left: 0 !important;
+	width: 100% !important;
+}
+
+* html .cbi-input-text,
+* html .cbi-input-user,
+* html .cbi-input-select,
+* html .cbi-input-password {
+	width: 50% !important;
+}
+
+* html .cbi-section legend {
+	background-color: #ffffff;
+	color: #555555;
+}
+
+* html table.cbi-section-table td .cbi-input-text,
+* html table.cbi-section-table td .cbi-input-select {
+	width: 100% !important;
+}
+
+* html div.cbi-page-actions {
+	text-align: right !important;
+}
+
+* html div.cbi-value-field input,
+* html div.cbi-value-field select {
+	font-size: 90% !important;
+}
diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie7.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie7.css
new file mode 100644
index 000000000..c410f11ff
--- /dev/null
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie7.css
@@ -0,0 +1,13 @@
+div.cbi-value-field {
+	margin-left: 0 !important;
+}
+
+.cbi-section legend {
+	background-color: #ffffff;
+	color: #555555;
+}
+
+table.cbi-section-table td .cbi-input-text,
+table.cbi-section-table td .cbi-input-select {
+	width: 95% !important;
+}
diff --git a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
index 3bb47f178..b2912b3a5 100644
--- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
@@ -42,6 +42,8 @@ require("luci.http").prepare_content("application/xhtml+xml")
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv="Content-Script-Type" content="text/javascript" />
 <link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
+<!--[if lt IE 7]><link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/ie6.css" /><![endif]-->
+<!--[if IE 7]><link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/ie7.css" /><![endif]-->
 <% if node and node.css then %><link rel="stylesheet" type="text/css" media="screen" href="<%=resource%>/<%=node.css%>" />
 <% end -%>
 <script type="text/javascript" src="<%=media%>/VarType.js"></script>