SASS updated

digineo · Dec 23, 2014 · d73b1f6 · d73b1f6
1 parent 61240c0
commit d73b1f6
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 14 deletions.
diff --git a/Gemfile b/Gemfile
@@ -11,7 +11,7 @@ gem 'jquery-rails'
 gem 'turbolinks'
 gem 'rails-timeago', '~> 2.0'
 gem 'haml-rails'
-gem 'sass-rails', '~> 4.0'
+gem 'sass-rails', '~> 5.0'
 gem 'bootstrap-sass', '~> 3.2'
 
 gem 'elasticsearch', '~> 1.0.6'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -208,11 +208,12 @@ GEM
  ruby_parser (3.1.3)
  sexp_processor (~> 4.1)
  sass (3.2.19)
- sass-rails (4.0.5)
+ sass-rails (5.0.0)
  railties (>= 4.0.0, < 5.0)
- sass (~> 3.2.2)
- sprockets (~> 2.8, < 3.0)
- sprockets-rails (~> 2.0)
+ sass (~> 3.1)
+ sprockets (>= 2.8, < 4.0)
+ sprockets-rails (>= 2.0, < 4.0)
+ tilt (~> 1.1)
  sexp_processor (4.4.4)
  shoulda-matchers (2.7.0)
  activesupport (>= 3.0.0)
@@ -273,7 +274,7 @@ DEPENDENCIES
  rails-timeago (~> 2.0)
  rspec-its (~> 1.0.1)
  rspec-rails (~> 3.1.0)
- sass-rails (~> 4.0)
+ sass-rails (~> 5.0)
  shoulda-matchers
  sidekiq (~> 3.3.0)
  sinatra

diff --git a/app/assets/stylesheets/apaxy.sass.erb → app/assets/stylesheets/_apaxy.sass.erb b/app/assets/stylesheets/apaxy.sass.erb → app/assets/stylesheets/_apaxy.sass.erb
diff --git a/app/assets/stylesheets/facets.sass → app/assets/stylesheets/_facets.sass b/app/assets/stylesheets/facets.sass → app/assets/stylesheets/_facets.sass
diff --git a/app/assets/stylesheets/files.css.sass → app/assets/stylesheets/_files.sass b/app/assets/stylesheets/files.css.sass → app/assets/stylesheets/_files.sass
diff --git a/app/assets/stylesheets/results.sass → app/assets/stylesheets/_results.sass b/app/assets/stylesheets/results.sass → app/assets/stylesheets/_results.sass
diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
diff --git a/app/assets/stylesheets/screen.sass → app/assets/stylesheets/application.sass b/app/assets/stylesheets/screen.sass → app/assets/stylesheets/application.sass
@@ -1,8 +1,8 @@
-
+@import bootstrap
+@import apaxy
 @import facets
 @import results
-@import table
-@import usage
+@import files
 
 #fork_me
  position: absolute