aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchrisaga <chrisaga@piwigo.org>2006-07-29 10:02:32 +0000
committerchrisaga <chrisaga@piwigo.org>2006-07-29 10:02:32 +0000
commit1df4860c0b45a9f4c32b697bec5329ecc10e2d55 (patch)
tree0b1f7315fca9b441130f43904539e3ab9da18f30
parentb6bfe700213ba6cc49c6d10c7f0d8cb99e118d8e (diff)
merge from trunk r1514:1515 into branch 1.6 (better fix bug 484)
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1516 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--template/yoga/default-colors.css20
-rw-r--r--template/yoga/fix-ie5-ie6.css5
-rw-r--r--template/yoga/picture.css4
-rw-r--r--template/yoga/theme/clear/theme.css7
-rw-r--r--template/yoga/theme/dark/theme.css5
5 files changed, 25 insertions, 16 deletions
diff --git a/template/yoga/default-colors.css b/template/yoga/default-colors.css
index 7e7eecc6d..d2766b061 100644
--- a/template/yoga/default-colors.css
+++ b/template/yoga/default-colors.css
@@ -35,10 +35,24 @@ SELECT, TEXTAREA {
color:black;
background-color: #d3d3d3; /* lightgrey */
}
-/*INPUT.text.focus, INPUT.password.focus, INPUT.button.focus,
-INPUT.submit.focus, INPUT.reset.focus, INPUT.file.focus,*/
+
INPUT:focus, SELECT:focus, TEXTAREA:focus, INPUT.focus, FORM .focus {
- background-color: #f5f5f5; /* whitesmoke */
+ background-color: #f5f5f5; /* whitesmoke */
+}
+
+/* some theme set a border on INPUT which is not pretty for radio/checkbox */
+INPUT[type="radio"], INPUT[type="checkbox"] {
+ border: none; /* <= Opera needs this */
+}
+
+INPUT.radio, INPUT.checkbox {
+ border: none; /* <= IE6 needs this */
+}
+
+/* rate buttons displayed like links */
+INPUT.rateButton, INPUT.rateButtonSelected {
+ color:inherit;
+ background-color:transparent; /* Konqueror doesn't accept transparent here */
}
.errors { /* Errors display */
diff --git a/template/yoga/fix-ie5-ie6.css b/template/yoga/fix-ie5-ie6.css
index 044bd39e5..cfacd2db9 100644
--- a/template/yoga/fix-ie5-ie6.css
+++ b/template/yoga/fix-ie5-ie6.css
@@ -11,11 +11,6 @@ H1, #theHeader {
height: 1em; /* for IE6 it's like min-height */
}
-/* some theme set a border on INPUT which is not pretty for those */
-INPUT.radio, INPUT.checkbox {
- border: none;
-}
-
/* fix category thumbnails on main page */
#content UL.thumbnailCategories {
width: 99%; /* buggy IE box model */
diff --git a/template/yoga/picture.css b/template/yoga/picture.css
index d905adb96..153a98b41 100644
--- a/template/yoga/picture.css
+++ b/template/yoga/picture.css
@@ -95,8 +95,7 @@ TABLE.infoTable TD.value UL {
list-style-type: square;
}
-.rateButton, .rateButtonSelected {
- background-color:transparent;
+.rateButton, .rateButtonSelected {
padding:0;
border:0;
}
@@ -106,7 +105,6 @@ TABLE.infoTable TD.value UL {
}
.rateButtonSelected {
- color:inherit;
font-weight:bold;
font-size:120%;
}
diff --git a/template/yoga/theme/clear/theme.css b/template/yoga/theme/clear/theme.css
index 56da48326..d49ec0322 100644
--- a/template/yoga/theme/clear/theme.css
+++ b/template/yoga/theme/clear/theme.css
@@ -1,7 +1,8 @@
/* $Id$ */
/* text color */
-BODY, H1, H2, H3, DT {
+BODY, H1, H2, H3, DT,
+INPUT.rateButtonSelected /* <= why IE doesn't inherit this ? */ {
color:#696969; /* dimgray */
}
@@ -53,12 +54,12 @@ FIELDSET, INPUT, SELECT, TEXTAREA,
}
/* links */
-A, .rateButton {
+A, INPUT.rateButton {
color: #005e89;
background: transparent;
}
-A:hover {
+A:hover, INPUT.rateButton:hover {
color: #858460;
}
diff --git a/template/yoga/theme/dark/theme.css b/template/yoga/theme/dark/theme.css
index 854cc48dd..7165bf6c3 100644
--- a/template/yoga/theme/dark/theme.css
+++ b/template/yoga/theme/dark/theme.css
@@ -1,7 +1,8 @@
/* $Id$ */
/* text color */
-BODY, H1, H3, DT {
+BODY, H1, H3, DT,
+INPUT.rateButtonSelected /* <= why IE doesn't inherit this ? */ {
color:#e0e0e0;
}
@@ -86,7 +87,7 @@ FIELDSET, INPUT, SELECT, TEXTAREA,
}
/* links */
-A, .rateButton {
+A, INPUT.rateButton {
color: #FFFFFF;
}