- merge trunk r1254:1255 into branch 1.6 (isearch.tpl anf FORM.filter)

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

1 files changed, 26 insertions, 4 deletions

diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 413f28181..5825e9eda 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -125,11 +125,12 @@ FORM#cat_modify TABLE { width: auto; }
 
 /**
  * Filter forms are displayed label by label with the input (or select...)
- * below the label
+ * below the label. Use a SPAN to group objects in a single line.
  */
 FIELDSET {
   padding: 1em;
   margin: 1em;
+  overflow: hidden; /* <- makes Opera happy */
 }
 
 FORM.filter FIELDSET LABEL {
@@ -139,17 +140,37 @@ FORM.filter FIELDSET LABEL {
   margin-right: 10px;
   padding: 0;
 }
+FORM.filter FIELDSET UL LABEL {
+  display: inline;
+  float: none;
+}
 
+/* cannot use FIELDSET>LABEL because of IE<=6 */
 FORM.filter FIELDSET LABEL INPUT,
 FORM.filter FIELDSET LABEL SELECT,
+FORM.filter FIELDSET LABEL SPAN,
 FORM.filter FIELDSET LABEL TEXTAREA {
   display: block;
   margin: 0.5em 0;
 }
+FORM.filter FIELDSET * LABEL INPUT,
+FORM.filter FIELDSET LABEL * INPUT,
+FORM.filter FIELDSET * LABEL SELECT,
+FORM.filter FIELDSET LABEL * SELECT,
+FORM.filter FIELDSET * LABEL TEXTAREA,
+FORM.filter FIELDSET LABEL * TEXTAREA {
+  display: inline;
+  vertical-align: baseline;
+  margin: 0 0.5em 0 0;
+}
+
+/* following declaration is important to avoid strange FF behaviour */
+FORM.filter FIELDSET LABEL SPAN SELECT {
+  margin: 0;
+}
 
 FORM.filter FIELDSET P,
-FORM.filter FIELDSET INPUT,
-FORM.filter FIELDSET TEXTAREA {
+{
   clear: left;
   display: block;
 }
@@ -239,7 +260,8 @@ UL.actions  A {
 }
 
 UL.tagSelection {
-  width: 500px;
+  width: 40em;
+  margin: 1em 0 1em 0;
   padding: 0;
 }