Update normalize.css and change how we include it (thoughtbot#882)

* Update normalize.css and change how we include it - Update normalize.css to v7.0.0. - Include normalize.css as raw CSS, instead of through RubyGems because the normalize-rails gem has fallen much behing the release cycle of normalize.css. * Ignore reset directory from scss-lint * Put normalize.css in vendor directory
n-studio · May 19, 2017 · ec6491a · ec6491a
1 parent 03b2ad4
commit ec6491a
Show file tree

Hide file tree

Showing 6 changed files with 450 additions and 5 deletions.
diff --git a/.scss-lint.yml b/.scss-lint.yml
@@ -1,5 +1,7 @@
 scss_files: "app/assets/stylesheets/administrate/**/*.scss"
 
+exclude: "app/assets/stylesheets/administrate/reset/**"
+
 severity: warning
 
 linters:

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -10,7 +10,6 @@ PATH
       jquery-rails (>= 4.0)
       kaminari (>= 1.0)
       momentjs-rails (~> 2.8)
-      normalize-rails (>= 3.0)
       sass-rails (~> 5.0)
       selectize-rails (~> 0.6)
 
@@ -149,7 +148,6 @@ GEM
     multipart-post (2.0.0)
     nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
-    normalize-rails (4.1.1)
     parser (2.4.0.0)
       ast (~> 2.2)
     pg (0.20.0)

diff --git a/administrate.gemspec b/administrate.gemspec
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   s.add_dependency "jquery-rails", ">= 4.0"
   s.add_dependency "kaminari", ">= 1.0"
   s.add_dependency "momentjs-rails", "~> 2.8"
-  s.add_dependency "normalize-rails", ">= 3.0"
   s.add_dependency "sass-rails", "~> 5.0"
   s.add_dependency "selectize-rails", "~> 0.6"
 

diff --git a/app/assets/stylesheets/administrate/application.scss b/app/assets/stylesheets/administrate/application.scss
@@ -1,6 +1,6 @@
 @charset "utf-8";
 
-@import "normalize-rails";
+@import "normalize";
 
 @import "selectize";
 @import "datetime_picker";

diff --git a/lib/administrate/engine.rb b/lib/administrate/engine.rb
@@ -2,7 +2,6 @@
 require "jquery-rails"
 require "kaminari"
 require "momentjs-rails"
-require "normalize-rails"
 require "sass-rails"
 require "selectize-rails"
 require "sprockets/railtie"