- merge trunc r1183:1184 into branch 1.6 (template fixes)

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

2 files changed, 10 insertions, 14 deletions

diff --git a/template/yoga/default-colors.css b/template/yoga/default-colors.css
index 9d9205864..9613b0eaf 100644
--- a/template/yoga/default-colors.css
+++ b/template/yoga/default-colors.css
@@ -21,10 +21,16 @@
 }
 
 /* Tables & forms */
-input, select, textarea {
+INPUT, SELECT, TEXTAREA {
 	color:black;
+}
+INPUT, SELECT, TEXTAREA, FORM .nofocus {
 	background-color: #d3d3d3;	/* lightgrey */
 }
+FORM .focus {
+  background-color: #f5f5f5;		/* whitesmoke */
+}
+
 
 .errors { /* Errors display */
   color: red;
@@ -39,7 +45,7 @@ input, select, textarea {
   padding: 10px 50px 10px 10px;
 }
 
-.errors ul li
+.errors UL LI
 {
   font-weight: normal;
 }
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 5d6705a4f..545fecf7e 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* * { padding: 0 !important; margin: 0 !important; } */
-
 BODY {
     margin: 5px;
     padding: 0;
@@ -114,12 +112,12 @@ LI.categoryLi {
   margin-bottom: 5px;
 }
 
-form#categoryOrdering ul.categoryActions {
+FORM#categoryOrdering UL.categoryActions {
   float: right;
   margin-top: 5px;
 }
 
-form#cat_modify table { width: auto; }
+FORM#cat_modify TABLE { width: auto; }
 
 /**
  * Filter forms are displayed label by label with the input (or select...)
@@ -177,14 +175,6 @@ FORM.properties SPAN.property {
   padding: 0 0.5em 0 0;
 }
 
-FORM .focus {
-  background-color: whitesmoke;
-}
-
-FORM .nofocus {
-  background-color: lightgrey; /* must be the same as input background-color */
-}
-
 FIELDSET.elementEdit A {
   display: block;
   float: right;