aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2010-11-22 19:56:01 +0000
committerrvelices <rv-github@modusoptimus.com>2010-11-22 19:56:01 +0000
commit28e1d31b8d1f04781244f2dd736a8e736bb81eeb (patch)
tree42e0fd0bf1c9972e180d98ca5317ef578b16d541
parent184e8a6707fc0a9ebb92db3bf33f1133bd67364b (diff)
feature 2038: merge r7841 from trunk to branch 2.1
simplification of CSS rules - use shorthand notation - remove some overly qualified selectors (no impact) git-svn-id: http://piwigo.org/svn/branches/2.1@7842 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--themes/default/print.css10
-rw-r--r--themes/default/theme.css29
2 files changed, 19 insertions, 20 deletions
diff --git a/themes/default/print.css b/themes/default/print.css
index 8252f7e44..09bd713c7 100644
--- a/themes/default/print.css
+++ b/themes/default/print.css
@@ -1,14 +1,14 @@
#menubar, .content .navigationBar, UL.categoryActions, .content DIV.calendarViews, .calendarBar,
#imageToolBar, .navThumb, #addComment {
- display: none;
+ display: none;
}
BODY {
- margin: 0;
- color: #000000;
- background: #ffffff;
+ margin: 0;
+ color: #000;
+ background: #fff;
}
.content {
- margin: 0;
+ margin: 0;
}
diff --git a/themes/default/theme.css b/themes/default/theme.css
index b8a00e5bd..53a3cddb6 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -130,6 +130,9 @@ BODY#theNBMPage .content
font-size: 110%;
}
+.content DIV.titrePage {
+ padding: 0 0 3px;
+}
/* actions */
UL.categoryActions {
@@ -142,15 +145,11 @@ UL.categoryActions {
float: right;
}
-.content DIV.titrePage {
- padding: 0 0 3px;
-}
-
-.content UL.categoryActions LI {
+UL.categoryActions LI {
display: inline;
}
-.content UL.categoryActions A IMG, UL.categoryActions A {
+ UL.categoryActions A IMG, UL.categoryActions A {
border: 0;
margin-bottom: -5px;
}
@@ -171,7 +170,7 @@ SPAN.calItem, SPAN.calItemEmpty {
SPAN.calItem A { border:0 }
.content DIV.calendarCalBar {
- margin: 10px 10px;
+ margin: 10px;
text-align: left;
}
@@ -185,7 +184,7 @@ SPAN.calCal { margin: 0 2px; }
/* nice looking month calendar*/
TABLE.calMonth {
- border: none;
+ border: 0;
border-collapse: collapse;
margin-bottom: 10px; /*<-IE ignores this */
}
@@ -322,7 +321,7 @@ DIV#comments DIV.description {
.content UL.thumbnails SPAN.wrap2 A,
.content UL.thumbnails LABEL {
display: block;
- border-bottom: none;
+ border-bottom: 0;
}
.content UL.thumbnails IMG {
margin-bottom: -4px; /* why ??? something wrong with Geko and Opera ignored by IE6*/
@@ -366,7 +365,7 @@ DIV#comments DIV.description {
#imageToolBar A, #imageToolBar IMG {
display: block;
- border: none;
+ border: 0;
margin: 0; padding: 0;
}
#imageToolBar A { width: 48px; }
@@ -382,7 +381,7 @@ DIV#comments DIV.description {
#theImage>IMG {
display: block;
margin: 0 auto;
- border: none;
+ border: 0;
}
#linkPrev {
@@ -454,7 +453,7 @@ H1 {
H2 {
margin: 0;
- padding: 5px 0.5em 5px 0.5em;
+ padding: 5px 0.5em;
text-align: left;
font-size: 120%;
}
@@ -468,7 +467,7 @@ A:hover {
}
IMG {
- border: none;
+ border: 0;
}
HR.separation {
@@ -769,14 +768,14 @@ BODY#thePopuphelpPage {
/* IE <= 6 is so bad with this that you can't merge with the following rule */
INPUT[type="text"], INPUT[type="password"], INPUT[type="button"],
INPUT[type="submit"], INPUT[type="reset"], INPUT[type="file"] {
- color:black;
+ color: #000;
background-color: #d3d3d3; /* lightgrey */
}
INPUT.text, INPUT.password, INPUT.button,
INPUT.submit, INPUT.reset, INPUT.file,
SELECT, TEXTAREA {
- color:black;
+ color: #000;
background-color: #d3d3d3; /* lightgrey */
}