diff options
author | rvelices <rv-github@modusoptimus.com> | 2010-11-24 20:42:56 +0000 |
---|---|---|
committer | rvelices <rv-github@modusoptimus.com> | 2010-11-24 20:42:56 +0000 |
commit | c3df7f2705140e3830438db7a0dc24eaa1b5cf28 (patch) | |
tree | d4bbd180a0811dfca10b4cb37051a868088f5986 /admin | |
parent | 73b83574b99d37f1718d57bf4290d51333655b27 (diff) |
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
Diffstat (limited to 'admin')
-rw-r--r-- | admin/themes/clear/theme.css | 10 | ||||
-rw-r--r-- | admin/themes/default/content.css | 2 | ||||
-rw-r--r-- | admin/themes/default/default-layout.css | 12 | ||||
-rw-r--r-- | admin/themes/default/fix-ie5-ie6.css | 6 | ||||
-rw-r--r-- | admin/themes/default/thumbnails.css | 24 | ||||
-rw-r--r-- | admin/themes/roma/theme.css | 10 |
6 files changed, 32 insertions, 32 deletions
diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css index a7832e4d6..baa9315dd 100644 --- a/admin/themes/clear/theme.css +++ b/admin/themes/clear/theme.css @@ -100,15 +100,15 @@ background-repeat:no-repeat; color:#999; cursor:pointer; font-size:110%; overflo .instructionBlockContent { padding:0 15px 15px;} SPAN.pwgScreen { font-style:italic; border-bottom:1px dotted #666} -.content ul.thumbnails span.wrap2:hover { background-color:#eee; border:1px solid #0cc9c; color:#999; } -.content ul.thumbnails span.wrap2 { border:1px solid #999; padding: 4px; } -.content ul.thumbnails span.wrap2 { -moz-border-radius-bottomleft:4px; -moz-border-radius-bottomright:4px; -moz-border-radius-topleft:4px; -moz-border-radius-topright:4px; } -.content ul.thumbnails span.wrap1 { margin:0 12px 5px; } +UL.thumbnails span.wrap2:hover { background-color:#eee; border:1px solid #0cc9c; color:#999; } +UL.thumbnails span.wrap2 { border:1px solid #999; padding: 4px; } +UL.thumbnails span.wrap2 { -moz-border-radius:4px; } +UL.thumbnails span.wrap1 { margin:0 12px 5px; } /* borders */ fieldset { border: 2px solid #ddd; } TEXTAREA { cursor:text; font-size: 13px; } -.content UL.thumbnails SPAN.wrap2 { +UL.thumbnails SPAN.wrap2 { border: 1px solid #555555; /* thumbnails border color and style */ border-radius: 4px 4px; /* round corners with CSS3 compliant browsers */ } 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; } diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css index 59f5d4016..30a1a3c35 100644 --- a/admin/themes/roma/theme.css +++ b/admin/themes/roma/theme.css @@ -76,10 +76,10 @@ background-repeat:no-repeat; color:#444; cursor:pointer; font-size:110%; overflo .instructionBlockContent { padding:0 15px 15px;} SPAN.pwgScreen { font-style:italic; border-bottom:1px dotted #666} -.content ul.thumbnails span.wrap2:hover { background-color:#111; border:1px solid #FF3363; color:#666; } -.content ul.thumbnails span.wrap2 { border:1px solid #666; padding: 4px; } -.content ul.thumbnails span.wrap2 { -moz-border-radius-bottomleft:4px; -moz-border-radius-bottomright:4px; -moz-border-radius-topleft:4px; -moz-border-radius-topright:4px; } -.content ul.thumbnails span.wrap1 { margin:0 12px 5px; } +UL.thumbnails span.wrap2:hover { background-color:#111; border:1px solid #FF3363; color:#666; } +UL.thumbnails span.wrap2 { border:1px solid #666; padding: 4px; } +UL.thumbnails span.wrap2 { -moz-border-radius:4px; } +UL.thumbnails span.wrap1 { margin:0 12px 5px; } /* .throw, */ td h3 { background-image: url(images/fillet.png); background-repeat: repeat-x; } /* borders */ @@ -87,7 +87,7 @@ fieldset { border: 2px solid #333; } INPUT, SELECT, TEXTAREA { border: 1px solid #666; } input:focus, select:focus, textarea:focus, input.focus, form .focus { background-color:#444;color: #999; } TEXTAREA { cursor:text; font-size: 13px; } -.content UL.thumbnails SPAN.wrap2 { +UL.thumbnails SPAN.wrap2 { border: 1px solid #aaaaaa; /* thumbnails border color and style */ border-radius: 4px 4px; /* round corners with CSS3 compliant browsers */ } |