From c3df7f2705140e3830438db7a0dc24eaa1b5cf28 Mon Sep 17 00:00:00 2001 From: rvelices Date: Wed, 24 Nov 2010 20:42:56 +0000 Subject: css rules simplification - merged rules - remove overly qualified inefficient selectors etc... git-svn-id: http://piwigo.org/svn/trunk@7869 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/themes/default/content.css | 2 +- admin/themes/default/default-layout.css | 12 ++++++------ admin/themes/default/fix-ie5-ie6.css | 6 +++--- admin/themes/default/thumbnails.css | 24 ++++++++++++------------ 4 files changed, 22 insertions(+), 22 deletions(-) (limited to 'admin/themes/default') diff --git a/admin/themes/default/content.css b/admin/themes/default/content.css index 61ab73b83..149301214 100644 --- a/admin/themes/default/content.css +++ b/admin/themes/default/content.css @@ -23,4 +23,4 @@ ul.categoryActions { margin: 0 2px; width: auto; list-style-position:outside; margin-right: 0.5em; overflow: visible; /*avoid a very strange margin behaviour (all browsers) */ } /* not used but should be */ -body#thePopuphelpPage .content { margin: 1em; } \ No newline at end of file +#thePopuphelpPage .content { margin: 1em; } \ No newline at end of file diff --git a/admin/themes/default/default-layout.css b/admin/themes/default/default-layout.css index 6cbbb8928..0f3f7ddd6 100644 --- a/admin/themes/default/default-layout.css +++ b/admin/themes/default/default-layout.css @@ -771,7 +771,7 @@ html, body {height:100%; margin:0; padding:0;} BODY { min-width: 60em; /* ~ 3* #menubar width */ } -BODY#thePopuphelpPage { +#thePopuphelpPage { min-width: 0; } @@ -779,13 +779,13 @@ BODY#thePopuphelpPage { #thePopuphelpPage #footer {display:none} /* Set some sizes according to your maximum thumbnail width and height */ -.content UL.thumbnails SPAN, -.content UL.thumbnails SPAN.wrap2 A, -.content UL.thumbnails LABEL, +UL.thumbnails SPAN, +UL.thumbnails SPAN.wrap2 A, +UL.thumbnails LABEL, .content DIV.thumbnailCategory DIV.illustration { width: 140px; /* max thumbnail width + 2px */ } -.content UL.thumbnails SPAN.wrap2, +UL.thumbnails SPAN.wrap2, .content DIV.thumbnailCategory DIV.description { height: 140px; /* max thumbnail height + 2px */ } @@ -797,7 +797,7 @@ BODY#thePopuphelpPage { } /* Set defaults for thumbnails legend */ -.content UL.thumbnails SPAN.thumbLegend { +UL.thumbnails SPAN.thumbLegend { display: block; /* display: none; if you don't want legend */ height: 4em; /* legend height (don't set auto to be Gecko friendly)*/ } diff --git a/admin/themes/default/fix-ie5-ie6.css b/admin/themes/default/fix-ie5-ie6.css index 078206d1d..e11b2f78b 100644 --- a/admin/themes/default/fix-ie5-ie6.css +++ b/admin/themes/default/fix-ie5-ie6.css @@ -15,20 +15,20 @@ FORM#quickconnect FIELDSET { } /* fix IE with another layout for thumbnails */ -.content UL.thumbnails SPAN.wrap2 { +UL.thumbnails SPAN.wrap2 { display: block; position: relative; text-align: left; } -.content UL.thumbnails IMG.thumbnail { +UL.thumbnails IMG.thumbnail { position: relative; top: -50%; /* Is this following hacking technic required ? */ /*\*//*/ margin-top: -40%; /**/ } -.content UL.thumbnails INPUT { +UL.thumbnails INPUT { position: absolute; left: 2px; top: 2px; /* same as other browsers but not so pretty */ diff --git a/admin/themes/default/thumbnails.css b/admin/themes/default/thumbnails.css index f3b34b5c6..993c21535 100644 --- a/admin/themes/default/thumbnails.css +++ b/admin/themes/default/thumbnails.css @@ -1,10 +1,10 @@ -.content UL.thumbnails { +UL.thumbnails { margin: 0; padding: 0; list-style: none; text-align: center; /* to center the whole collection in .content */ float: left; } -.content UL.thumbnails LI { display: inline } -.content ul.thumbnails li.rank-of-image { +UL.thumbnails LI { display: inline } +UL.thumbnails li.rank-of-image { float: left; background-color: #111; border: 1px solid #666; @@ -16,7 +16,7 @@ cursor: move; margin: 10px; } -.content ul.thumbnails li.rank-of-image img { +UL.thumbnails li.rank-of-image img { margin: 0 20px; padding: 4px 2px; float: left; @@ -29,34 +29,34 @@ .clip { position:absolute; } -.content ul.thumbnails li.rank-of-image input { +UL.thumbnails li.rank-of-image input { height: 12px; width: 50px; position: relative; top: 4px; } -.content UL.thumbnails SPAN.wrap1 { +UL.thumbnails SPAN.wrap1 { margin: 0 5px 5px 5px; display: table-cell; display: inline-table; display: inline-block; /* Why 3 display option ??? */ vertical-align: top; /* OK with Opera and IE6 not Geko */ text-align: center; /* to center the thumbnail and legend in Geko/Opera */ } -.content UL.thumbnails SPAN.wrap2 { +UL.thumbnails SPAN.wrap2 { margin: 0; /* important reset the margins */ display: table-cell; /* block prevents vertical-align here */ vertical-align: middle; /* Ok with Opera and Geko not IE6 */ } -.content UL.thumbnails LABEL { display: block; border-bottom: none; } -.content UL.thumbnails IMG { +UL.thumbnails LABEL { display: block; border-bottom: none; } +UL.thumbnails IMG { margin-bottom: -4px; /* why ??? something wrong with Geko and Opera ignored by IE6*/ } -.content UL.thumbnails LABEL { position: relative; } -.content UL.thumbnails INPUT { +UL.thumbnails LABEL { position: relative; } +UL.thumbnails INPUT { position: relative; /* <= Opera can handle relative here */ top: -20px; } -:root .content UL.thumbnails INPUT { /* hide from Opera */ +:root UL.thumbnails INPUT { /* hide from Opera */ position: absolute; /* <= Opera hide 1 checkbox over 2 !!! */ left: 2px; top: 2px; } -- cgit v1.2.3