aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2012-08-03 15:02:09 +0000
committermistic100 <mistic@piwigo.org>2012-08-03 15:02:09 +0000
commit2aa150998e2230b6167b9410019dbf9e9ffdd4ba (patch)
treeb6618458069274e58655e423495baf0279b6495a
parent8bca490ac0be9a115828caa2065758976dcb7948 (diff)
Merged revision(s) r17347 from trunk:
bug 2714: missing icons on jgrowl notifications git-svn-id: http://piwigo.org/svn/branches/2.4@17348 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/themes/default/images/jgrowl-alert.pngbin0 -> 2596 bytes
-rw-r--r--admin/themes/default/images/jgrowl-check.pngbin0 -> 2412 bytes
-rw-r--r--admin/themes/default/images/jgrowl-error.pngbin0 -> 2446 bytes
-rw-r--r--admin/themes/default/uploadify.jGrowl.css13
4 files changed, 8 insertions, 5 deletions
diff --git a/admin/themes/default/images/jgrowl-alert.png b/admin/themes/default/images/jgrowl-alert.png
new file mode 100644
index 000000000..388fcbb81
--- /dev/null
+++ b/admin/themes/default/images/jgrowl-alert.png
Binary files differ
diff --git a/admin/themes/default/images/jgrowl-check.png b/admin/themes/default/images/jgrowl-check.png
new file mode 100644
index 000000000..b6a649a1b
--- /dev/null
+++ b/admin/themes/default/images/jgrowl-check.png
Binary files differ
diff --git a/admin/themes/default/images/jgrowl-error.png b/admin/themes/default/images/jgrowl-error.png
new file mode 100644
index 000000000..48ef138c7
--- /dev/null
+++ b/admin/themes/default/images/jgrowl-error.png
Binary files differ
diff --git a/admin/themes/default/uploadify.jGrowl.css b/admin/themes/default/uploadify.jGrowl.css
index 954531387..44216e6b1 100644
--- a/admin/themes/default/uploadify.jGrowl.css
+++ b/admin/themes/default/uploadify.jGrowl.css
@@ -8,13 +8,16 @@ Co-developed by Travis Nickels
/** Uploadify Styling here Styling **/
div.jGrowl div.success {
- background: url(images/Check.png) no-repeat 6px 6px;
+ background: url(images/jgrowl-check.png) no-repeat 6px 6px;
}
div.jGrowl div.error {
- background: url(images/Error.png) no-repeat 6px 6px;
+ background: url(images/jgrowl-error.png) no-repeat 6px center;
}
div.jGrowl div.warning {
- background: url(images/Alert.png) no-repeat 6px 6px;
+ background: url(images/jgrowl-alert.png) no-repeat 6px 6px;
+}
+div.jGrowl div.warning:before {
+ content:none;
}
div.jGrowl div.jGrowl-notification, div.jGrowl div.jGrowl-closer {
@@ -66,11 +69,11 @@ div.jGrowl div.jGrowl-closer {
div.jGrowl div.jGrowl-notification div.header {
font-weight: bold;
font-size: 14px;
- margin-left: 60px;
+ margin-left: 47px;
}
div.jGrowl div.jGrowl-notification div.message {
font-size: 12px;
- margin-left: 60px;
+ margin-left: 47px;
}
div.jGrowl div.jGrowl-notification p {
font-size: 6px;