aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2010-11-24 20:42:56 +0000
committerrvelices <rv-github@modusoptimus.com>2010-11-24 20:42:56 +0000
commitc3df7f2705140e3830438db7a0dc24eaa1b5cf28 (patch)
treed4bbd180a0811dfca10b4cb37051a868088f5986
parent73b83574b99d37f1718d57bf4290d51333655b27 (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 '')
-rw-r--r--admin/themes/clear/theme.css10
-rw-r--r--admin/themes/default/content.css2
-rw-r--r--admin/themes/default/default-layout.css12
-rw-r--r--admin/themes/default/fix-ie5-ie6.css6
-rw-r--r--admin/themes/default/thumbnails.css24
-rw-r--r--admin/themes/roma/theme.css10
-rw-r--r--themes/Sylvia/theme.css12
-rw-r--r--themes/clear/theme.css10
-rw-r--r--themes/dark/theme.css10
-rw-r--r--themes/default/fix-ie5-ie6.css8
-rw-r--r--themes/default/fix-ie7.css8
-rw-r--r--themes/default/print.css2
-rw-r--r--themes/default/theme.css76
-rw-r--r--tools/local-layout.css2
14 files changed, 96 insertions, 96 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 */
}
diff --git a/themes/Sylvia/theme.css b/themes/Sylvia/theme.css
index 3e2708c1d..532b3357c 100644
--- a/themes/Sylvia/theme.css
+++ b/themes/Sylvia/theme.css
@@ -7,7 +7,7 @@
#comments .thumbnailCategories hr {display:none;}
#comments form.filter input[type="submit"] { margin-top:1.8em; }
/* Sylvia Theme is close to the Roma Admin theme */
-BODY, H1, H3, DT, INPUT.rateButtonSelected, H2, #menubar DT {
+BODY, H1, H3, DT, .rateButtonSelected, H2, #menubar DT {
color:#666;
}
#imageHeaderBar, #imageToolBar A:hover {
@@ -175,10 +175,10 @@ BODY {
min-height:466px;
}
-.content {
+#theCategoryPage .content {
border: 1px solid #000;
border-top: 0;
- margin:21px 7px 0 290px;
+ margin:21px 7px 0 290px !important;
padding-top:7px;
}
.content h2 {
@@ -292,11 +292,11 @@ input[type="radio"], input[type="checkbox"], input[type="button"].rateButtonStar
background-color:#444;
color:#999;
}
-.content UL.thumbnails SPAN.wrap2 {
+UL.thumbnails SPAN.wrap2 {
border: 1px solid #666; /* thumbnails border color and style */
border-radius: 4px 4px; /* round corners with CSS3 compliant browsers */
}
-.content UL.thumbnails SPAN.wrap2:hover {
+UL.thumbnails SPAN.wrap2:hover {
color:#666;
background-color:#111;
border:1px solid #ff3363; /* thumbnails border color when mouse cursor is over it */
@@ -315,7 +315,7 @@ input[type="radio"], input[type="checkbox"], input[type="button"].rateButtonStar
.calItemEmpty, td.calDayCellEmpty, td.calDayCellFull {
border:1px solid #666;
}
-A, INPUT.rateButton {
+A, .rateButton {
color:#f70;
border-width: 0;
}
diff --git a/themes/clear/theme.css b/themes/clear/theme.css
index c59fb9718..0accaf6bd 100644
--- a/themes/clear/theme.css
+++ b/themes/clear/theme.css
@@ -1,7 +1,7 @@
/* text color */
BODY, H1, H2, H3, DT,
-INPUT.rateButtonSelected /* <= why IE doesn't inherit this ? */ {
+.rateButtonSelected /* <= why IE doesn't inherit this ? */ {
color:#696969; /* dimgray */
}
@@ -36,11 +36,11 @@ FIELDSET, INPUT, SELECT, TEXTAREA,
border: 1px solid gray;
}
-.content UL.thumbnails SPAN.wrap2 {
+UL.thumbnails SPAN.wrap2 {
border: 1px solid #aaaaaa; /* thumbnails border color and style */
}
-.content UL.thumbnails SPAN.wrap2:hover,
+UL.thumbnails SPAN.wrap2:hover,
.content UL.thumbnailCategories DIV.thumbnailCategory:hover,
.content UL.thumbnailCategories DIV.thumbnailCategory:hover A {
background-color: #faebd7;
@@ -49,12 +49,12 @@ FIELDSET, INPUT, SELECT, TEXTAREA,
}
/* links */
-A, INPUT.rateButton {
+A, .rateButton {
color: #005e89;
background: transparent;
}
-A:hover, INPUT.rateButton:hover {
+A:hover, .rateButton:hover {
color: #858460;
}
diff --git a/themes/dark/theme.css b/themes/dark/theme.css
index 49ba57ce9..e65b26264 100644
--- a/themes/dark/theme.css
+++ b/themes/dark/theme.css
@@ -1,7 +1,7 @@
/* text color */
BODY, H1, H3,
-INPUT.rateButtonSelected /* <= why IE doesn't inherit this ? */ {
+.rateButtonSelected /* <= why IE doesn't inherit this ? */ {
color:#d0d0d0;
}
@@ -51,11 +51,11 @@ FIELDSET, INPUT, SELECT, TEXTAREA,
border: 1px solid gray;
}
-.content UL.thumbnails SPAN.wrap2 {
+UL.thumbnails SPAN.wrap2 {
border: 1px solid #aaaaaa; /* thumbnails border color and style */
}
-.content UL.thumbnails SPAN.wrap2:hover,
+UL.thumbnails SPAN.wrap2:hover,
.content UL.thumbnailCategories DIV.thumbnailCategory:hover,
.content UL.thumbnailCategories DIV.thumbnailCategory:hover A {
background-color: #faebd7;
@@ -65,9 +65,9 @@ FIELDSET, INPUT, SELECT, TEXTAREA,
/* links */
-A, INPUT.rateButton {
+A, .rateButton {
color: #fff;
- border: none;
+ border: 0;
}
A:hover {
diff --git a/themes/default/fix-ie5-ie6.css b/themes/default/fix-ie5-ie6.css
index 974b1e842..305de404d 100644
--- a/themes/default/fix-ie5-ie6.css
+++ b/themes/default/fix-ie5-ie6.css
@@ -9,20 +9,20 @@
}
/* 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 SPAN.wrap2 A,
-.content UL.thumbnails SPAN.wrap2 SPAN {
+UL.thumbnails SPAN.wrap2 A,
+UL.thumbnails SPAN.wrap2 SPAN {
overflow: visible;
position: absolute;
top: 50%;
text-align: center;
}
-.content UL.thumbnails IMG.thumbnail {
+UL.thumbnails IMG.thumbnail {
position: relative;
top: -50%;
/*\*//*/
diff --git a/themes/default/fix-ie7.css b/themes/default/fix-ie7.css
index 70ddf7e8b..0f93b368c 100644
--- a/themes/default/fix-ie7.css
+++ b/themes/default/fix-ie7.css
@@ -1,19 +1,19 @@
/* 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 SPAN.wrap2 A,
-.content UL.thumbnails SPAN.wrap2 SPAN {
+UL.thumbnails SPAN.wrap2 A,
+UL.thumbnails SPAN.wrap2 SPAN {
overflow: visible;
position: absolute;
top: 50%;
text-align: center;
}
-.content UL.thumbnails IMG.thumbnail {
+UL.thumbnails IMG.thumbnail {
position: relative;
top: -50%;
margin-top: 2%;
diff --git a/themes/default/print.css b/themes/default/print.css
index f966d6cfc..5e6fcabb9 100644
--- a/themes/default/print.css
+++ b/themes/default/print.css
@@ -9,6 +9,6 @@ BODY {
background: #fff;
}
-BODY#theCategoryPage .content {
+#theCategoryPage .content {
margin: 0 !important;
}
diff --git a/themes/default/theme.css b/themes/default/theme.css
index 5e5fe442f..e1b34cb67 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -95,7 +95,7 @@ FORM#quickconnect FIELDSET DIV {
margin: 1em;
}
-BODY#theCategoryPage .content
+#theCategoryPage .content
{
margin-left: 20em; /* = #menubar width + 2em */
}
@@ -135,7 +135,7 @@ UL.categoryActions LI {
display: inline;
}
- UL.categoryActions A IMG, UL.categoryActions A {
+UL.categoryActions A IMG, UL.categoryActions A {
border: 0;
margin-bottom: -5px;
}
@@ -188,14 +188,14 @@ TD.calDayHead {
text-align: center;
}
-DIV.calImg {
+.calImg {
overflow: hidden;
vertical-align: bottom;
z-index: 1;
position: relative; /*<- this required by IE*/
}
-.calImg img {
+.calImg IMG {
position: relative;
border: 0;
}
@@ -275,28 +275,28 @@ DIV#comments DIV.description {
}
/* Thumbnails */
-.content UL.thumbnails SPAN.thumbLegend {
+UL.thumbnails SPAN.thumbLegend {
font-size: 90%;
overflow: hidden;/* oversized legend is clipped */
}
/* Thumbnail "elastic" layout */
-.content UL.thumbnails {
+UL.thumbnails {
margin: 0;
padding: 0;
list-style: none;
text-align: center; /* to center the whole collection in .content */
}
-.content UL.thumbnails LI { display: inline }
+UL.thumbnails LI { display: inline }
-.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 */
@@ -304,12 +304,12 @@ DIV#comments DIV.description {
-moz-border-radius: 4px; /* round corners with Geko */
-webkit-border-radius: 4px; /* Safari webkit project */
}
-.content UL.thumbnails SPAN.wrap2 A,
-.content UL.thumbnails LABEL {
+UL.thumbnails SPAN.wrap2 A,
+UL.thumbnails LABEL {
display: block;
border-bottom: 0;
}
-.content UL.thumbnails IMG {
+UL.thumbnails IMG {
margin-bottom: -4px; /* why ??? something wrong with Geko and Opera ignored by IE6*/
}
@@ -426,6 +426,11 @@ BODY {
padding: 0;
font-size: 0.8em;
font-family: Arial,Helvetica,sans-serif;
+ min-width: 60em; /* ~ 3* #menubar width; width of the page before getting a scrollbar; IE6 doesn't get that*/
+}
+
+#thePopuphelpPage {
+ min-width: 0; /*reset the min width*/
}
@@ -615,9 +620,9 @@ UL.tagSelection {
}
UL.tagSelection LI {
- display:inline-block;
- width:150px!important;
- overflow:hidden;
+ display:inline-block;
+ width:150px!important;
+ overflow:hidden;
white-space: nowrap;
}
@@ -642,22 +647,23 @@ UL.tagSelection LI {
/* Popup help page */
-BODY#thePopuphelpPage #copyright {
+#thePopuphelpPage #copyright {
display: none;
}
-#theNotificationPage p { padding: 0.5em; }
-BODY#thePopuphelpPage .content P {
+#thePopuphelpPage P {
text-align: justify;
padding: 0.5em;
}
-BODY#thePopuphelpPage .content OL LI,
-BODY#thePopuphelpPage .content UL LI
-{
+#thePopuphelpPage LI {
margin-bottom: 0.5em;
}
+#theNotificationPage P {
+ padding: 0.5em;
+}
+
TR.tagLine {
border-bottom: 1px solid #ddd;
}
@@ -690,31 +696,25 @@ TABLE.tagLetterContent {
#theHeader {text-align: center;}
-#theNotificationPage DL,
-#thePopuphelpPage DL { margin: 0 25px 25px; }
+#theNotificationPage DL, #thePopuphelpPage DL {
+ margin: 0 25px 25px;
+}
+
.content #comments UL.thumbnailCategories LI { width:99%; }
+
/* jQuery datepicker */
IMG.ui-datepicker-trigger {
cursor : pointer;
}
-/* Set minimum width of the page before getting a scrollbar */
-/* IE5 and IE6 don't get that */
-BODY {
- min-width: 60em; /* ~ 3* #menubar width */
-}
-BODY#thePopuphelpPage {
- min-width: 0;
-}
-
/* 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 */
}
@@ -726,7 +726,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)*/
}
@@ -772,7 +772,7 @@ INPUT.radio, INPUT.checkbox {
}
/* rate buttons displayed like links */
-INPUT.rateButton, INPUT.rateButtonSelected, INPUT.rateButtonStarFull, INPUT.rateButtonStarEmpty {
+.rateButton, .rateButtonSelected, .rateButtonStarFull, .rateButtonStarEmpty {
color:inherit;
background-color:transparent !important; /* Konqueror doesn't accept transparent here */
}
diff --git a/tools/local-layout.css b/tools/local-layout.css
index 3017c7a06..2478ba0f3 100644
--- a/tools/local-layout.css
+++ b/tools/local-layout.css
@@ -4,7 +4,7 @@ BODY {
background-attachment:fixed;
}
-.content UL.thumbnails SPAN.wrap2 {
+UL.thumbnails SPAN.wrap2 {
height: 200px; /* max thumbnail height + 2px */
}