aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchrisaga <chrisaga@piwigo.org>2006-05-28 01:22:42 +0000
committerchrisaga <chrisaga@piwigo.org>2006-05-28 01:22:42 +0000
commita30cf0e6cd796fe3e1cca1ac7553fafb17545615 (patch)
tree41dea3124dbdedf25cb624208f294e3f2c6f4746
parent5444095d7c48153d1fb3347a006a22a997a7c18f (diff)
merge : from trunk r1324:1326 into branch 1.6
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1327 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--template/yoga/image.css55
-rw-r--r--template/yoga/picture.tpl1
-rw-r--r--template/yoga/theme/dark/theme.css13
3 files changed, 29 insertions, 40 deletions
diff --git a/template/yoga/image.css b/template/yoga/image.css
index 90d5c539b..9ecbaea08 100644
--- a/template/yoga/image.css
+++ b/template/yoga/image.css
@@ -1,47 +1,34 @@
#imageHeaderBar {
- padding: 2px 10px;
- margin: 4px 0;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ margin-top: 4px;
+ overflow: hidden;
+ width: 100%;
}
-#imageHeaderBar .browsePath { float: left; }
-#imageHeaderBar .imageNumber { float: right; }
-#imageHeaderBar H2 {
- /*margin: 1ex 0; override default-layout for less bottom-margin */
- text-align: center;
- padding: 0;
- clear: both;
+#imageHeaderBar .browsePath {
+ float: left;
+ margin-left: 10px;
}
-#imageToolBar {
- text-align: center;
- position: relative;
- clear: both;
- margin: 4px 0; padding: 0;
-}
-
-/* Moi, je preferais les boutons "imgPrec" et "imgSuiv" au milieu, au-dessus
-de l'image...
-
-#imageToolBar IMG, #imageToolBar A {
- display: inline;
- border: none; margin: auto; padding: 0;
+#imageHeaderBar .imageNumber {
+ float: right;
+ margin-right: 10px;
}
-#imageToolBar .randomButtons {
- position: absolute;
- left: 0;
-}
-#imageToolBar .randomButtons IMG {
- padding: 0 4px; /* au pire: 3 * (4+24+4) = 96 < 100 * /
+#imageHeaderBar H2 {
+ text-align: center;
+ padding: 0;
+ clear: both;
}
-#imageToolBar .prevNnext {
- text-align: center;
-}
-#imageToolBar .prevNnext IMG {
- padding: 0 100px;
+#imageToolBar {
+ text-align: center;
+ position: relative;
+ clear: both;
+ margin-bottom: 4px;
+ padding: 0;
}
-*/
#imageToolBar {
height: 28px;
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index 614dfff09..ca4f7ecd3 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -12,7 +12,6 @@
<!-- BEGIN title -->
<h2>{TITLE}</h2>
<!-- END title -->
- <hr class="separation">
</div>
<div id="imageToolBar">
diff --git a/template/yoga/theme/dark/theme.css b/template/yoga/theme/dark/theme.css
index c173a89eb..6a9ee7a40 100644
--- a/template/yoga/theme/dark/theme.css
+++ b/template/yoga/theme/dark/theme.css
@@ -46,11 +46,18 @@ H2, #menubar DT, .throw {
}
/* borders */
-#menubar DL, #content, #imageToolBar,
+#menubar DL, #content,
#comments DIV.comment BLOCKQUOTE {
border: 1px solid #000000;
}
+#imageHeaderBar {
+ border-top: 1px solid #000000;
+}
+H2, #menubar DT, #imageToolBar {
+ border-bottom: 1px solid #000000;
+}
+
#theImage IMG {
border-color: #000000;
}
@@ -78,10 +85,6 @@ FIELDSET, INPUT, SELECT, TEXTAREA,
border-color: yellow; /* thumbnails border color when mouse cursor is over it */
}
-H2, #menubar DT, #imageHeaderBar {
- border-bottom: 1px solid #000000;
-}
-
/* links */
A, .rateButton {
color: #FFFFFF;