diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-20 20:11:44 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-20 20:11:44 +0200 |
| commit | 3cd09fa5f9f17d1a86828b7efe25ad3228c49f35 (patch) | |
| tree | a6761d455dbb8c6ee93543abaa5c77bd3adb0ec5 /app/assets | |
| parent | 13d3c9ac38b7146b2b0d4852950a854c897aa72c (diff) | |
| download | gitlab-ci-3cd09fa5f9f17d1a86828b7efe25ad3228c49f35.tar.gz | |
Add nprogress as loading indicator
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.scss | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/main/variables.scss | 4 |
3 files changed, 11 insertions, 10 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 297f000..81989a8 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -15,6 +15,8 @@ #= require jquery_ujs #= require turbolinks #= require jquery.turbolinks +#= require nprogress +#= require nprogress-turbolinks #= require_tree . # # @@ -27,16 +29,8 @@ $(document).on 'click', '.edit-runner-link', -> $(document).on 'click', '.assign-all-runner', -> $(this).replaceWith('<i class="icon-refresh icon-spin"></i> Assign in progress..') -window.startSpinner = -> - $('.turbolink-spinner').fadeIn() - -window.stopSpinner = -> - $('.turbolink-spinner').fadeOut() - window.unbindEvents = -> $(document).unbind('scroll') $(document).off('scroll') -document.addEventListener("page:fetch", startSpinner) document.addEventListener("page:fetch", unbindEvents) -document.addEventListener("page:change", stopSpinner) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index f25f18b..b0cf649 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -43,3 +43,10 @@ @import "sections/projects.scss"; @import "sections/builds.scss"; @import "sections/login.scss"; + +/* + * NProgress + */ +$nprogress-color: #9BC; +@import 'nprogress'; +@import 'nprogress-bootstrap'; diff --git a/app/assets/stylesheets/main/variables.scss b/app/assets/stylesheets/main/variables.scss index 2c4ee95..7b249e7 100644 --- a/app/assets/stylesheets/main/variables.scss +++ b/app/assets/stylesheets/main/variables.scss @@ -3,6 +3,6 @@ */ $primary_color: #2FA0BB; $link_color: #3A89A3; -$style_color: #289; -$bg_style_color: #228899; +$style_color: #167; +$bg_style_color: #167; $hover: #D9EDF7; |