Merge branch 'master' of git@github.com:gallery/gallery3

11 files changed, 12 insertions, 12 deletions

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index d57e95fc..601f6609 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -61,23 +61,23 @@
 .g-denied {
   background-color: #f6cbca;
   color: #f00;
-  background-image: url('lib/images/ico-error.png');
+  background-image: url('images/ico-error.png');
 }
 
 .g-info {
   background-color: #e8e8e8;
-  background-image: url('lib/images/ico-info.png');
+  background-image: url('images/ico-info.png');
 }
 
 .g-success,
 .g-allowed {
   background-color: #d9efc2;
-  background-image: url('lib/images/ico-success.png');
+  background-image: url('images/ico-success.png');
 }
 
 .g-warning {
   background-color: #fcf9ce;
-  background-image: url('lib/images/ico-warning.png');
+  background-image: url('images/ico-warning.png');
 }
 
 form .g-error {
diff --git a/themes/admin_wind/images/ico-error.png b/lib/images/ico-error.png
index c37bd062..c37bd062 100644
--- a/themes/admin_wind/images/ico-error.png
+++ b/lib/images/ico-error.png
diff --git a/themes/admin_wind/images/ico-info.png b/lib/images/ico-info.png
index 12cd1aef..12cd1aef 100644
--- a/themes/admin_wind/images/ico-info.png
+++ b/lib/images/ico-info.png
diff --git a/themes/admin_wind/images/ico-success.png b/lib/images/ico-success.png
index a9925a06..a9925a06 100644
--- a/themes/admin_wind/images/ico-success.png
+++ b/lib/images/ico-success.png
diff --git a/themes/admin_wind/images/ico-warning.png b/lib/images/ico-warning.png
index 628cf2da..628cf2da 100644
--- a/themes/admin_wind/images/ico-warning.png
+++ b/lib/images/ico-warning.png
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index c733b482..2679386b 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -336,19 +336,19 @@ li.gError select {
 }
 
 .gError, tr.gError td.gError {
-  background: #f6cbca url('../images/ico-error.png') no-repeat .4em 50%;
+  background: #f6cbca url('../../../lib/images/ico-error.png') no-repeat .4em 50%;
 }
 
 .gInfo {
-  background: #e8e8e8 url('../images/ico-info.png') no-repeat .4em 50%;
+  background: #e8e8e8 url('../../../lib/images/ico-info.png') no-repeat .4em 50%;
 }
 
 .gSuccess {
-  background: #d9efc2  url('../images/ico-success.png') no-repeat .4em 50%;
+  background: #d9efc2  url('../../../lib/images/ico-success.png') no-repeat .4em 50%;
 }
 
 .gWarning, tr.gWarning td.gWarning {
-  background: #fcf9ce url('../images/ico-warning.png') no-repeat .4em 50%;
+  background: #fcf9ce url('../../../lib/images/ico-warning.png') no-repeat .4em 50%;
 }
 
 .gPager .gInfo,
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 6d955481..8f17e310 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -294,22 +294,22 @@ li.gError select {
 
 .gError {
   background-color: #f6cbca;
-  background-image: url('../images/ico-error.png');
+  background-image: url('../../../lib/images/ico-error.png');
 }
 
 .gInfo {
   background-color: #e8e8e8;
-  background-image: url('../images/ico-info.png');
+  background-image: url('../../../lib/images/ico-info.png');
 }
 
 .gSuccess {
   background-color: #d9efc2;
-  background-image: url('../images/ico-success.png');
+  background-image: url('../../../lib/images/ico-success.png');
 }
 
 .gWarning {
   background-color: #fcf9ce;
-  background-image: url('../images/ico-warning.png');
+  background-image: url('../../../lib/images/ico-warning.png');
 }
 
 form .gError,
diff --git a/themes/wind/images/ico-error.png b/themes/wind/images/ico-error.png
deleted file mode 100644
index c37bd062..00000000
--- a/themes/wind/images/ico-error.png
+++ /dev/null
diff --git a/themes/wind/images/ico-info.png b/themes/wind/images/ico-info.png
deleted file mode 100644
index 12cd1aef..00000000
--- a/themes/wind/images/ico-info.png
+++ /dev/null
diff --git a/themes/wind/images/ico-success.png b/themes/wind/images/ico-success.png
deleted file mode 100644
index a9925a06..00000000
--- a/themes/wind/images/ico-success.png
+++ /dev/null
diff --git a/themes/wind/images/ico-warning.png b/themes/wind/images/ico-warning.png
deleted file mode 100644
index 628cf2da..00000000
--- a/themes/wind/images/ico-warning.png
+++ /dev/null