Merge branch 'nprogress' into 'master'

Nprogress
gitlabhq · Mar 21, 2014 · c7050b0 · c7050b0
2 parents 5e4101b + 3cd09fa
commit c7050b0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/Gemfile b/Gemfile
@@ -67,6 +67,7 @@ gem 'bootstrap-sass', '~> 3.0'
 gem "font-awesome-rails", '~> 3.2'
 gem 'turbolinks'
 gem 'jquery-turbolinks'
+gem 'nprogress-rails'
 
 
 group :development do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -167,6 +167,7 @@ GEM
     mysql2 (0.3.14)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
+    nprogress-rails (0.1.2.3)
     pg (0.17.0)
     poltergeist (1.4.1)
       capybara (~> 2.1.0)
@@ -339,6 +340,7 @@ DEPENDENCIES
   letter_opener
   minitest (= 4.3.2)
   mysql2
+  nprogress-rails
   pg
   poltergeist
   protected_attributes

diff --git 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
@@ -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
@@ -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;
diff --git a/app/views/layouts/_nav.html.haml b/app/views/layouts/_nav.html.haml
@@ -33,7 +33,3 @@
         - else
           %li
             = link_to 'Login', new_user_sessions_path
-
-    .hidden-sm.hidden-xs
-      .hide.turbolink-spinner
-        %i.icon-refresh.icon-spin