summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2013-02-12 15:13:35 +0100
committerniv-openerp <nicolas.vanhoren@openerp.com>2013-02-12 15:13:35 +0100
commit7835ec8b4e8fc72f94c609d3ca3f78e93eadd7cb (patch)
tree82d85b522fb3bfe182494bca37bc3caf42312b68
parentd24c58a3f02f6efd56a6f7a3ba2636ebc377c5e4 (diff)
some fixes
bzr revid: nicolas.vanhoren@openerp.com-20130212141335-mj43xfgjk1wdhyhm
-rw-r--r--addons/live_support/loader.js3
-rw-r--r--addons/live_support/static/ext/static/js/jquery.achtung.css5
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/live_support/loader.js b/addons/live_support/loader.js
index 7d1062793d1..606c411a166 100644
--- a/addons/live_support/loader.js
+++ b/addons/live_support/loader.js
@@ -8,6 +8,9 @@ require.config({
return _.noConflict();
},
},
+ "jquery.achtung": {
+ deps: ['jquery'],
+ },
},
})(["livesupport", "jquery"], function(livesupport, jQuery) {
jQuery.noConflict();
diff --git a/addons/live_support/static/ext/static/js/jquery.achtung.css b/addons/live_support/static/ext/static/js/jquery.achtung.css
index ea14ee4a55c..820ae3e9194 100644
--- a/addons/live_support/static/ext/static/js/jquery.achtung.css
+++ b/addons/live_support/static/ext/static/js/jquery.achtung.css
@@ -75,7 +75,7 @@
* to reduce payload size.
*/
.ui-icon { display: block; overflow: hidden; background-repeat: no-repeat; }
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-icon { width: 16px; height: 16px; }
.ui-icon-carat-1-n { background-position: 0 0; }
.ui-icon-carat-1-ne { background-position: -16px 0; }
.ui-icon-carat-1-e { background-position: -32px 0; }
@@ -292,16 +292,13 @@
.achtungSuccess .ui-icon.achtung-close-button,
.achtungFail .ui-icon.achtung-close-button {
- background-image: url(images/ui-icons_444444_256x240.png);
}
.achtungSuccess .ui-icon.achtung-close-button-hover,
.achtungFail .ui-icon.achtung-close-button-hover {
- background-image: url(images/ui-icons_000000_256x240.png);
}
.achtung .wait-icon {
- background-image: url('images/wait.gif');
}
.achtung .achtung-message {