bug 1495: use the wiki icons in errors/infos blocks + merge CSS rules.

git-svn-id: http://piwigo.org/svn/trunk@5383 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Mar 26, 2010 · 502689a · 502689a
1 parent b8a9773
commit 502689a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 26 deletions.
diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css
@@ -9,14 +9,6 @@ INPUT[type="submit"], INPUT[type="reset"]  { color:#666; border: 1px solid #777;
 input.rateButton, legend, h3 { color: #777; }
 h2 { color: #777; }
 
-.content .infos { color: #0a0; border:0; background: transparent url(icon/infos.png) no-repeat 5px 5px;
-padding:5px 70px 0pt 30px; min-height: 54px; background-color:#c2f5c2;}
-
-.content .infos .submit {margin-left:30px;}
-.content .infos li, .content .errors li { list-style-type:square; }
-
-.content .errors { color: #f22; border:0; background: transparent url(icon/errors.png) no-repeat left top;
-padding:5px 60px 0pt 30px; min-height: 54px; text-align:left; font-weight:bold; background-position:5px 5px; background-color: #ffd5dc;}
 
 #copyright { color:#777; margin:5px auto 0px 240px; text-align:center; 
 padding-bottom: 15px; }

diff --git a/admin/themes/default/default-layout.css b/admin/themes/default/default-layout.css
@@ -774,20 +774,31 @@ h2:lang(en) { text-transform:capitalize; }
 /**
  * Informations box in administration
  */
-.infos {
+.infos, .errors {
   text-align: left;
   margin: 5px;
   padding: 10px 50px 10px 10px;
   font-weight:bold;
+  background-repeat: no-repeat;
+  background-position: 5px 5px;
+  padding:5px 70px 0pt 30px;
+  min-height: 54px;
 }
 
-.errors { /* Errors display */
-  text-align: left;
-  margin: 5px;
-  font-weight:bold;
+.infos {
+  color: #0a0;
+  background-color:#c2f5c2;
+  background-image: url(icon/infos.png);
+}
+
+.errors {
+  color: #f22;
+  background-color: #ffd5dc;
+  background-image: url(icon/errors.png);
 }
 
-.content .infos li, .content .errors li { list-style-type:square; }
+.infos li, .errors li { list-style-type:square; }
+.infos .submit {margin-left:30px;}
 
 .checkActions {text-align:left;padding:0;margin:0;}
 .comment A:hover {border:none;}
diff --git a/admin/themes/default/icon/errors.png b/admin/themes/default/icon/errors.png
diff --git a/admin/themes/default/icon/infos.png b/admin/themes/default/icon/infos.png
diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css
@@ -10,18 +10,6 @@ INPUT[type="submit"], INPUT[type="reset"]  { color:#999; border: 1px solid #666;
 input.rateButton, legend, h3 { color: #666; }
 h2 { color: #ccc; }
 
-/* .content .infos { color: #f70; border:0; background-color: transparent; */
-/* padding:5px 60px 0pt 10pt; min-height: 48px; text-align:left; background-position:left top;} */
-
-.content .infos { color: #008200; border:0; background: transparent url(../clear/icon/infos.png) no-repeat 5px 5px;
-padding:5px 70px 0pt 30px; min-height: 54px; background-color:#c2f5c2;}
-
-
-.content .infos .submit {margin-left:30px;}
-
-.content .errors { color: #f33; border:0; background: #ffd5dc url(../clear/icon/errors.png) no-repeat 5px 5px;
-padding:5px 60px 0pt 30px; min-height: 54px; text-align:left; }
-
 .header_notes { background: transparent url(../../icon/note.png) no-repeat right top;
 border:0; font-weight:bold; min-height: 48px;
 padding:15px 60px 0 0; position:absolute; right:0;