diff options
author | mistic100 <mistic@piwigo.org> | 2013-04-23 15:46:47 +0000 |
---|---|---|
committer | mistic100 <mistic@piwigo.org> | 2013-04-23 15:46:47 +0000 |
commit | ee3e287aa0e675b95d823698fa542abbd4d5b4e4 (patch) | |
tree | 4b8ac28dca72d0102cea7cd1ca5d6223157b2055 | |
parent | a6bcd40bd89a585de4931fc0c8d1fdadb214b6c6 (diff) |
move and update jgrowl css
git-svn-id: http://piwigo.org/svn/trunk@22338 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r-- | admin/themes/default/images/jgrowl-alert.png | bin | 2596 -> 0 bytes | |||
-rw-r--r-- | admin/themes/default/images/jgrowl-check.png | bin | 2412 -> 0 bytes | |||
-rw-r--r-- | admin/themes/default/images/jgrowl-error.png | bin | 2446 -> 0 bytes | |||
-rw-r--r-- | admin/themes/default/template/photos_add_direct.tpl | 2 | ||||
-rw-r--r-- | admin/themes/default/template/updates_ext.tpl | 2 | ||||
-rw-r--r-- | themes/default/js/plugins/jgrowl-alert.png | bin | 0 -> 2511 bytes | |||
-rw-r--r-- | themes/default/js/plugins/jgrowl-check.png | bin | 0 -> 2359 bytes | |||
-rw-r--r-- | themes/default/js/plugins/jgrowl-error.png | bin | 0 -> 2276 bytes | |||
-rw-r--r-- | themes/default/js/plugins/jquery.jgrowl.css (renamed from admin/themes/default/uploadify.jGrowl.css) | 114 |
9 files changed, 63 insertions, 55 deletions
diff --git a/admin/themes/default/images/jgrowl-alert.png b/admin/themes/default/images/jgrowl-alert.png Binary files differdeleted file mode 100644 index 388fcbb81..000000000 --- a/admin/themes/default/images/jgrowl-alert.png +++ /dev/null diff --git a/admin/themes/default/images/jgrowl-check.png b/admin/themes/default/images/jgrowl-check.png Binary files differdeleted file mode 100644 index b6a649a1b..000000000 --- a/admin/themes/default/images/jgrowl-check.png +++ /dev/null diff --git a/admin/themes/default/images/jgrowl-error.png b/admin/themes/default/images/jgrowl-error.png Binary files differdeleted file mode 100644 index 48ef138c7..000000000 --- a/admin/themes/default/images/jgrowl-error.png +++ /dev/null diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl index 54186cd64..407618e80 100644 --- a/admin/themes/default/template/photos_add_direct.tpl +++ b/admin/themes/default/template/photos_add_direct.tpl @@ -2,7 +2,7 @@ {combine_script id='jquery.jgrowl' load='footer' require='jquery' path='themes/default/js/plugins/jquery.jgrowl_minimized.js' } {combine_script id='jquery.uploadify' load='footer' require='jquery' path='admin/include/uploadify/jquery.uploadify.v3.0.0.min.js' } {combine_script id='jquery.ui.progressbar' load='footer'} -{combine_css path="admin/themes/default/uploadify.jGrowl.css"} +{combine_css path="themes/default/js/plugins/jquery.jgrowl.css"} {combine_css path="admin/include/uploadify/uploadify.css"} {/if} diff --git a/admin/themes/default/template/updates_ext.tpl b/admin/themes/default/template/updates_ext.tpl index 9946d824f..d58a42397 100644 --- a/admin/themes/default/template/updates_ext.tpl +++ b/admin/themes/default/template/updates_ext.tpl @@ -1,6 +1,6 @@ {combine_script id='jquery.ajaxmanager' load='footer' require='jquery' path='themes/default/js/plugins/jquery.ajaxmanager.js'} {combine_script id='jquery.jgrowl' load='footer' require='jquery' path='themes/default/js/plugins/jquery.jgrowl_minimized.js'} -{combine_css path="admin/themes/default/uploadify.jGrowl.css"} +{combine_css path="themes/default/js/plugins/jquery.jgrowl.css"} {footer_script require='jquery.ui.effect-blind,jquery.ajaxmanager,jquery.jgrowl'} var pwg_token = '{$PWG_TOKEN}'; diff --git a/themes/default/js/plugins/jgrowl-alert.png b/themes/default/js/plugins/jgrowl-alert.png Binary files differnew file mode 100644 index 000000000..350822e8c --- /dev/null +++ b/themes/default/js/plugins/jgrowl-alert.png diff --git a/themes/default/js/plugins/jgrowl-check.png b/themes/default/js/plugins/jgrowl-check.png Binary files differnew file mode 100644 index 000000000..fccf6c78c --- /dev/null +++ b/themes/default/js/plugins/jgrowl-check.png diff --git a/themes/default/js/plugins/jgrowl-error.png b/themes/default/js/plugins/jgrowl-error.png Binary files differnew file mode 100644 index 000000000..542f96311 --- /dev/null +++ b/themes/default/js/plugins/jgrowl-error.png diff --git a/admin/themes/default/uploadify.jGrowl.css b/themes/default/js/plugins/jquery.jgrowl.css index 44216e6b1..376d224c2 100644 --- a/admin/themes/default/uploadify.jGrowl.css +++ b/themes/default/js/plugins/jquery.jgrowl.css @@ -1,87 +1,92 @@ -/* -Default jGrowl style definitions for: - -Uploadify v1.6.2 -Copyright (C) 2009 by Ronnie Garcia -Co-developed by Travis Nickels -*/ +div.jGrowl { + z-index: 9999; + color: #fff; + font-size: 12px; +} -/** Uploadify Styling here Styling **/ -div.jGrowl div.success { - background: url(images/jgrowl-check.png) no-repeat 6px 6px; +div.jGrowl-notification.success>div, +div.jGrowl-notification.error>div, +div.jGrowl-notification.warning>div{ + margin-left:45px; +} +div.jGrowl-notification.success { + background: url(jgrowl-check.png) no-repeat 5px 5px; } -div.jGrowl div.error { - background: url(images/jgrowl-error.png) no-repeat 6px center; +div.jGrowl-notification.error { + background: url(jgrowl-error.png) no-repeat 5px 5px; } -div.jGrowl div.warning { - background: url(images/jgrowl-alert.png) no-repeat 6px 6px; +div.jGrowl-notification.warning { + background: url(jgrowl-alert.png) no-repeat 5px 5px; } -div.jGrowl div.warning:before { +div.jGrowl-notification.warning:before { content:none; } +/** Cross Browser Styling **/ +div.center div.jGrowl-notification, div.center div.jGrowl-closer { + margin-left: auto; + margin-right: auto; +} + div.jGrowl div.jGrowl-notification, div.jGrowl div.jGrowl-closer { background-color: #000; - color: #fff; opacity: .85; - filter: alpha(opacity = 85); + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=85)"; + filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=85); zoom: 1; width: 300px; - padding: 10px; + padding: 5px; margin-top: 5px; margin-bottom: 5px; font-family: Tahoma, Arial, Helvetica, sans-serif; - font-size: 12px; + font-size: 1em; text-align: left; display: none; + border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; } -/* original jGrowl css styling */ +div.jGrowl div.jGrowl-notification { + min-height: 40px; +} -div.center div.jGrowl-notification, div.center div.jGrowl-closer { - margin-left: auto; - margin-right: auto; +div.jGrowl div.jGrowl-notification, +div.jGrowl div.jGrowl-closer { + margin: 8px; } -div.jGrowl div.jGrowl-notification { - min-height: 40px; +div.jGrowl div.jGrowl-notification div.jGrowl-header { + font-weight: bold; + font-size: 1em; +} + +div.jGrowl div.jGrowl-notification div.jGrowl-message { + font-size: 0.9em; } -div.jGrowl div.jGrowl-notification div.close { +div.jGrowl div.jGrowl-notification div.jGrowl-close { + z-index: 99; float: right; font-weight: bold; - font-size: 12px; + font-size: 1em; cursor: pointer; } div.jGrowl div.jGrowl-closer { - height: 15px; padding-top: 4px; padding-bottom: 4px; cursor: pointer; - font-size: 11px; + font-size: .9em; font-weight: bold; text-align: center; } -div.jGrowl div.jGrowl-notification div.header { - font-weight: bold; - font-size: 14px; - margin-left: 47px; -} -div.jGrowl div.jGrowl-notification div.message { - font-size: 12px; - margin-left: 47px; -} -div.jGrowl div.jGrowl-notification p { - font-size: 6px; -} - -div.jGrowl { - padding: 10px; - z-index: 9999; +/** Hide jGrowl when printing **/ +@media print { + div.jGrowl { + display: none; + } } /** Special IE6 Style Positioning **/ @@ -93,7 +98,7 @@ div.ie6.top-right { right: auto; bottom: auto; left: expression( ( 0 - jGrowl.offsetWidth + ( document.documentElement.clientWidth ? document.documentElement.clientWidth : document.body.clientWidth ) + ( ignoreMe2 = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft ) ) + 'px' ); - top: expression( ( 0 + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop ) ) + 'px' ); + top: expression( ( 0 + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop ) ) + 'px' ); } div.ie6.top-left { @@ -118,33 +123,36 @@ div.ie6.center { } /** Normal Style Positions **/ +div.jGrowl { + position: absolute; +} + body > div.jGrowl { position: fixed; } -body > div.jGrowl.top-left { +div.jGrowl.top-left { left: 0px; top: 0px; } -body > div.jGrowl.top-right { +div.jGrowl.top-right { right: 0px; top: 0px; } -body > div.jGrowl.bottom-left { +div.jGrowl.bottom-left { left: 0px; bottom: 0px; } -body > div.jGrowl.bottom-right { +div.jGrowl.bottom-right { right: 0px; bottom: 0px; } -body > div.jGrowl.center { +div.jGrowl.center { top: 0px; width: 50%; left: 25%; -} - +}
\ No newline at end of file |