merge from trunk r1505:1506 into branch 1.6 (fix bug 490)

git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1507 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 35 insertions, 1 deletions

diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 5a7e293ed..17f0a23cc 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -52,7 +52,10 @@ HR.separation {
 }
 
 /** General defaults **/
-INPUT {margin: 0;}
+INPUT, SELECT {
+  margin: 0;
+  font-size: 1em;	/* <= some browsers don't set it correctly */
+}
 UL, DL, LI { text-align: left;}
 TABLE {			/* horizontaly centered */
   margin-left: auto;
diff --git a/template/yoga/fix-ie5-ie6.css b/template/yoga/fix-ie5-ie6.css
index c3c51859c..5bf360219 100644
--- a/template/yoga/fix-ie5-ie6.css
+++ b/template/yoga/fix-ie5-ie6.css
@@ -26,3 +26,22 @@ INPUT.radio, INPUT.checkbox {
 {
   display: inline;
 }
+
+/* fix quickconnect layout */
+FORM#quickconnect UL.actions {
+  width: 30px;	/* <= get icons not so badly positionned */
+}
+
+FORM#quickconnect INPUT.text,
+FORM#quickconnect INPUT.password,
+FORM#quickconnect INPUT.submit {
+  position: relative;
+  left: -0.5em;	/* definitively a bug ! */
+}
+
+FORM#quickconnect INPUT.text,
+FORM#quickconnect INPUT.password {
+  width: 10em;
+}
+
+
diff --git a/template/yoga/menubar.css b/template/yoga/menubar.css
index 0d5653779..d7bcced0b 100644
--- a/template/yoga/menubar.css
+++ b/template/yoga/menubar.css
@@ -87,6 +87,8 @@ FORM#quickconnect UL.actions {
   float: right;
   padding: 0;
   text-align: right;	/* Opera 7.5 */
+}
+FORM#quickconnect FIELDSET>UL.actions {
   width: 40%;		/* Opera 7.5 cannot find why width:auto fails :-( */
 }
 
@@ -96,6 +98,16 @@ FORM#quickconnect LABEL {
   margin: 0 0.5em 0 0.5em;
 }
 
+FORM#quickconnect INPUT[type=text],
+FORM#quickconnect INPUT[type=password] {
+  width: 16.5em;
+}
+
+FORM#quickconnect INPUT.text,
+FORM#quickconnect INPUT.password {
+  width: 16.5em;		/* <= same as above for IE with inputfix.htc */
+}
+
 #menubar #menuTagCloud {
   text-align: center;
   margin: 5px 0;