Changeset 1327

Timestamp:

May 28, 2006, 3:22:42 AM (18 years ago)

Author:

chrisaga

Message:

merge : from trunk r1324:1326 into branch 1.6

Location:

branches/branch-1_6/template/yoga

Files:

• image.css (modified) (1 diff)
• picture.tpl (modified) (1 diff)
• theme/dark/theme.css (modified) (2 diffs, 1 prop)

branches/branch-1_6/template/yoga/image.css

@@ -1 +1 @@
 #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 .browsePath {
+  float: left;
+  margin-left: 10px;
+}
+
+#imageHeaderBar .imageNumber {
+  float: right;
+  margin-right: 10px;
+}
 
 #imageHeaderBar H2 {
-    /*margin: 1ex 0;  override default-layout for less bottom-margin */
-    text-align: center;
-    padding: 0;
-    clear: both;
+  text-align: center;
+  padding: 0;
+  clear: both;
 }
 
 #imageToolBar {
-    text-align: center;
-    position: relative;
-    clear: both;
-    margin: 4px 0; padding: 0;
+  text-align: center;
+  position: relative;
+  clear: both;
+  margin-bottom: 4px;
+  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;
-}
-
-#imageToolBar .randomButtons {
-    position: absolute;
-    left: 0;
-}
-#imageToolBar .randomButtons IMG {
-    padding: 0 4px; /* au pire: 3 * (4+24+4) = 96 < 100 * /
-}
-
-#imageToolBar .prevNnext {
-    text-align: center;
-}
-#imageToolBar .prevNnext IMG {
-    padding: 0 100px;
-}
-*/
 
 #imageToolBar {

branches/branch-1_6/template/yoga/picture.tpl

@@ -13 +13 @@
   <h2>{TITLE}</h2>
   <!-- END title -->
-  <hr class="separation">
 </div>
 

branches/branch-1_6/template/yoga/theme/dark/theme.css

@@ -47 +47 @@
 
 /* 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;
 }
 
@@ -77 +84 @@
 #content UL.thumbnails SPAN.wrap2:hover {
   border-color: yellow;         /* thumbnails border color when mouse cursor is over it */
-}
-
-H2, #menubar DT, #imageHeaderBar {
-  border-bottom: 1px solid #000000;
 }