From 4e2182138d512dcae383383e2a8f85e806bbf2bc Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Tue, 17 Feb 2015 21:04:24 +1100 Subject: [PATCH] Lower the chance of a conflict with the CSS class "loading" --- modules/system/assets/css/framework.extras.css | 4 ++-- modules/system/assets/js/framework.extras.js | 4 ++-- modules/system/assets/less/framework.extras.less | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/system/assets/css/framework.extras.css b/modules/system/assets/css/framework.extras.css index ac2af5db4..05a005098 100644 --- a/modules/system/assets/css/framework.extras.css +++ b/modules/system/assets/css/framework.extras.css @@ -1,5 +1,5 @@ -body.loading, -body.loading * { +body.oc-loading, +body.oc-loading * { cursor: wait !important; } .stripe-loading-indicator { diff --git a/modules/system/assets/js/framework.extras.js b/modules/system/assets/js/framework.extras.js index 35ec88167..b57f7db15 100644 --- a/modules/system/assets/js/framework.extras.js +++ b/modules/system/assets/js/framework.extras.js @@ -43,7 +43,7 @@ return this.indicator.removeClass('loaded') - $(document.body).addClass('loading') + $(document.body).addClass('oc-loading') } StripeLoadIndicator.prototype.hide = function(force) { @@ -53,7 +53,7 @@ if (this.counter <= 0) { this.indicator.addClass('loaded') - $(document.body).removeClass('loading') + $(document.body).removeClass('oc-loading') } } diff --git a/modules/system/assets/less/framework.extras.less b/modules/system/assets/less/framework.extras.less index be42cfdee..5f1a61301 100644 --- a/modules/system/assets/less/framework.extras.less +++ b/modules/system/assets/less/framework.extras.less @@ -4,7 +4,7 @@ // Stripe loading indicator // -------------------------------------------------- -body.loading, body.loading * { +body.oc-loading, body.oc-loading * { cursor: wait !important; }