Browse Source

rm nprogress and animate

pull/1/head
Nicolae Claudius 11 years ago
parent
commit
d067f72262
  1. 2
      Gemfile
  2. 5
      Gemfile.lock
  3. 1
      app/assets/javascripts/application.js.coffee
  4. 2
      app/assets/stylesheets/application.css.scss
  5. 7
      app/assets/stylesheets/theme/animate.css.scss
  6. 3
      app/assets/stylesheets/theme/nprogress.css.scss
  7. 2
      app/views/layouts/admin.html.erb
  8. 2
      app/views/layouts/errors.html.erb
  9. 2
      app/views/layouts/home.html.erb
  10. 2
      app/views/layouts/public.html.erb
  11. 2
      app/views/layouts/users.html.erb

2
Gemfile

@ -54,8 +54,6 @@ gem 'bootstrap-sass', '~> 3.1.0.1'
gem 'font-awesome-rails', '~> 4.0.3.1'
gem 'webshims-rails', '~> 1.12.2'
gem 'detect_timezone_rails', '~> 0.0.3'
gem 'nprogress-rails', '~> 0.1.2.2'
gem 'animate-rails', '~> 1.0.0'
gem 'coffee-rails', '~> 4.0.0'
gem 'jquery-rails', '~> 3.1.0'
gem 'jquery-ui-rails', '~> 4.1.0'

5
Gemfile.lock

@ -59,8 +59,6 @@ GEM
acts_as_nested_interval (0.1.0)
rails (>= 3.2.1, < 5)
addressable (2.3.5)
animate-rails (1.0.4)
rails
arel (4.0.1)
atomic (1.1.14)
bcrypt-ruby (3.1.2)
@ -168,7 +166,6 @@ GEM
activesupport (>= 3.0.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
nprogress-rails (0.1.2.3)
oauth2 (0.9.3)
faraday (>= 0.8, < 0.10)
jwt (~> 0.1.8)
@ -311,7 +308,6 @@ DEPENDENCIES
active-model-email-validator (~> 1.0.2)
active_scaffold (~> 3.4.0.rc)!
acts_as_nested_interval (~> 0.1.0)
animate-rails (~> 1.0.0)
better_errors (= 1.1.0)
binding_of_caller (= 0.7.2)
bootstrap-sass (~> 3.1.0.1)
@ -337,7 +333,6 @@ DEPENDENCIES
mysql2 (~> 0.3.13)
navigasmic (~> 0.5.6)!
nilify_blanks (~> 1.0.2)
nprogress-rails (~> 0.1.2.2)
oily_png (~> 1.1.0)
omniauth (~> 1.2.1)
omniauth-google-oauth2 (~> 0.2.2)

1
app/assets/javascripts/application.js.coffee

@ -12,6 +12,5 @@
#= require jquery.cookie
#= require detect_timezone
#= require jquery.detect_timezone
#= require nprogress
#= require_tree ./components
#= require_self

2
app/assets/stylesheets/application.css.scss

@ -3,8 +3,6 @@
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
* the top of the compiled file, but it's generally better to create a new file per style scope.
*= require nprogress
*= require animate
*= require bootstrap-social
*= require font-awesome
*= require_self

7
app/assets/stylesheets/theme/animate.css.scss

@ -1,7 +0,0 @@
.animated.fast {
-webkit-animation-duration:0.5s;
-moz-animation-duration:0.5s;
-ms-animation-duration:0.5s;
-o-animation-duration:0.5s;
animation-duration:0.5s;
}

3
app/assets/stylesheets/theme/nprogress.css.scss

@ -1,3 +0,0 @@
#nprogress .bar, #nprogress .spinner {
z-index: 2000;
}

2
app/views/layouts/admin.html.erb

@ -14,7 +14,7 @@
</head>
<body class="users">
<div class="container animated fast fadeInDown" id="main">
<div class="container" id="main">
<%= flash_display 'flash' %>
<%= yield %>
</div>

2
app/views/layouts/errors.html.erb

@ -14,7 +14,7 @@
<body class="errors">
<%= render 'shared/public_top' %>
<div class="container animated fast fadeInDown" id="main">
<div class="container" id="main">
<%= flash_display 'flash' %>
<%= yield %>
</div>

2
app/views/layouts/home.html.erb

@ -3,7 +3,7 @@
<body class="public with-home-section">
<%= render 'shared/navigation' %>
<div class="animated fast fadeInDown" id="main">
<div id="main">
<%= flash_display 'flash' %>
<%= yield %>
</div>

2
app/views/layouts/public.html.erb

@ -5,7 +5,7 @@
<div id="wrap">
<%= render 'shared/navigation' %>
<div class="container animated fast fadeInDown" id="main">
<div class="container" id="main">
<%= flash_display 'flash' %>
<%= yield %>
</div>

2
app/views/layouts/users.html.erb

@ -16,7 +16,7 @@
<div id="wrap">
<%= render 'shared/navigation' %>
<div class="container animated fast fadeInDown" id="main">
<div class="container" id="main">
<%= flash_display 'flash' %>
<%= yield %>
</div>

Loading…
Cancel
Save