From 2a52be9c3ebedcc8c512f64bb8cccdeebd15dd8a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 19 Jun 2014 09:58:42 +0300 Subject: [PATCH] Move nprogess color to variable Signed-off-by: Dmitriy Zaporozhets --- app/assets/stylesheets/application.scss | 8 ++++++-- app/assets/stylesheets/main/variables.scss | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 7d058ad7719..b596af38311 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -8,8 +8,6 @@ *= require select2 *= require highlightjs.min *= require_self - *= require nprogress - *= require nprogress-bootstrap *= require dropzone/basic */ @@ -20,6 +18,12 @@ */ @import 'gl_bootstrap'; +/** + * NProgress load bar css + */ +@import 'nprogress'; +@import 'nprogress-bootstrap'; + /** * Font icons * diff --git a/app/assets/stylesheets/main/variables.scss b/app/assets/stylesheets/main/variables.scss index 48b233bdd20..c49f7db788e 100644 --- a/app/assets/stylesheets/main/variables.scss +++ b/app/assets/stylesheets/main/variables.scss @@ -39,3 +39,8 @@ $border_warning: #EB9532; */ $added: #63c363; $deleted: #f77; + +/** + * + */ +$nprogress-color: #3498db;