From 4a6f62bb8d456077986f32759a73c87664e49e96 Mon Sep 17 00:00:00 2001 From: rvelices Date: Wed, 19 Jan 2011 20:45:44 +0000 Subject: got rid of the last three very inefficient css rules git-svn-id: http://piwigo.org/svn/trunk@8772 68402e56-0260-453c-a942-63ccdbb3a9ee --- themes/default/fix-ie5-ie6.css | 18 ++++++++++++++++++ themes/default/theme.css | 30 ++++++++++++++++-------------- 2 files changed, 34 insertions(+), 14 deletions(-) (limited to 'themes') diff --git a/themes/default/fix-ie5-ie6.css b/themes/default/fix-ie5-ie6.css index c529b3a8c..b3ed58996 100644 --- a/themes/default/fix-ie5-ie6.css +++ b/themes/default/fix-ie5-ie6.css @@ -49,6 +49,24 @@ H1, #theHeader { width: 99%; /* correct an ugly 1 or 2 px misalignement with IE */ } +.filter LABEL INPUT, +.filter LABEL SELECT, +.filter LABEL SPAN, +.filter LABEL TEXTAREA { + display: block; + margin: 0.5em 0; +} +.filter FIELDSET * LABEL INPUT, +.filter FIELDSET * LABEL SELECT, +.filter FIELDSET * LABEL TEXTAREA, +.filter LABEL SPAN INPUT, +.filter LABEL SPAN SELECT, +.filter LABEL SPAN TEXTAREA { + display: inline; + vertical-align: top; + margin: 0 0.5em 0 0; +} + .pwg-icon { display: block; } diff --git a/themes/default/theme.css b/themes/default/theme.css index 9a74d6a7d..3a19b081a 100644 --- a/themes/default/theme.css +++ b/themes/default/theme.css @@ -530,20 +530,21 @@ FIELDSET { margin-right:0.5em;/*reduce from above*/ } -/* cannot use FIELDSET>LABEL because of IE<=6 */ -.filter LABEL INPUT, -.filter LABEL SELECT, -.filter LABEL SPAN, -.filter LABEL TEXTAREA { - display: block; - margin: 0.5em 0; -} -.filter FIELDSET * LABEL INPUT, -.filter FIELDSET * LABEL SELECT, -.filter FIELDSET * LABEL TEXTAREA, -.filter LABEL SPAN INPUT, -.filter LABEL SPAN SELECT, -.filter LABEL SPAN TEXTAREA { +/*IE6 needs override because of > selector*/ +.filter LABEL>INPUT, +.filter LABEL>SELECT, +.filter LABEL>SPAN, +.filter LABEL>TEXTAREA { + display: block; + margin: 0.5em 0; +} + +.filter FIELDSET * LABEL>INPUT, +.filter FIELDSET * LABEL>SELECT, +.filter FIELDSET * LABEL>TEXTAREA, +.filter SPAN>INPUT, +.filter SPAN>SELECT, +.filter SPAN>TEXTAREA { display: inline; vertical-align: top; margin: 0 0.5em 0 0; @@ -551,6 +552,7 @@ FIELDSET { + .filter INPUT[type="submit"] { margin-top: 1em; } -- cgit v1.2.3