From 3be71cd5c2c7336fc8abd8daa912cc577eb09074 Mon Sep 17 00:00:00 2001
From: vdigital <vdigital@piwigo.org>
Date: Tue, 14 Oct 2008 18:44:55 +0000
Subject: resolved merge

git-svn-id: http://piwigo.org/svn/trunk@2738 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 template/yoga/theme/Sylvia/theme.css | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'template')

diff --git a/template/yoga/theme/Sylvia/theme.css b/template/yoga/theme/Sylvia/theme.css
index 6653be540..1e156a41a 100644
--- a/template/yoga/theme/Sylvia/theme.css
+++ b/template/yoga/theme/Sylvia/theme.css
@@ -58,8 +58,6 @@ padding: 0 0 0 10px; margin: 0; }
 .content .thumbnailCategory div.illustration a { display: block; margin: 0; padding:20px 0 0 8px; }
 #content .thumbnailCategory div.description { background:transparent url(images/cat_top-right.gif) no-repeat scroll right top;
 margin: 0; padding:15px 10px 3px 0; overflow: hidden; }
-
-height:7px; margin:0; overflow:hidden; padding:0; width:100%; }
 #content .thumbnailCategory div.description .text { display:block; margin:10px 2px 0 0;
 overflow: auto; overflow-x:hidden; padding:0 0 5px;  /* Only IE family supports colored scrollbar */
  scrollbar-face-color: #222; scrollbar-shadow-color: #444; scrollbar-highlight-color: #000;
@@ -101,7 +99,10 @@ A:hover, A:active { color: #f33; border-bottom: 1px solid #f33; cursor: pointer;
 #debug { margin: 15px 15px 5px 248px; font-size:12px; clear: both; word-wrap:break-word;}
 .rateButtonStarFull { 	background-image: url('icon/rating-stars.gif'); }
 .rateButtonStarEmpty { background-image: url('icon/rating-stars.gif'); }
+#menubar #mbIdentification fieldset div input[type="text"] { margin: 0 0 3px; width: 174px; display: inline; }
 input[type="button"], input[type="submit"], input[type="reset"] {
 background-color:#ff3363; color:#222; border-color: #ff3363; }
 input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover {
-background-color:#999; border-color: #666; }
\ No newline at end of file
+background-color:#999; border-color: #666; }
+/* IE6... Hacks: */
+/*\*/ * html #menubar #mbIdentification .button { margin-right:25px; } /* */ 
\ No newline at end of file
-- 
cgit v1.2.3