From 114450dd085693bbabb3c21a6c26073f953d2261 Mon Sep 17 00:00:00 2001 From: Jennifer Siegfried Date: Fri, 12 Aug 2016 16:04:09 -0600 Subject: [PATCH] Adds html5shiv; removes Bitters; IE conditional comments --- Gemfile | 1 - Gemfile.lock | 5 ----- app/assets/javascripts/ie9.js | 1 + app/views/layouts/application.html.erb | 18 +++++++++++++++--- bower.json | 9 +++++++-- config/initializers/assets.rb | 2 ++ 6 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 app/assets/javascripts/ie9.js diff --git a/Gemfile b/Gemfile index 4529cd4..1480e53 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,6 @@ gem 'uglifier', '>= 1.3.0' # assets gem 'bourbon' gem 'neat' -gem 'bitters' group :development do gem 'better_errors' diff --git a/Gemfile.lock b/Gemfile.lock index 22880a9..0cb5323 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,10 +49,6 @@ GEM rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bitters (1.2.0) - bourbon (>= 4.2) - sass (>= 3.4) - thor bourbon (4.2.7) sass (~> 3.4) thor (~> 0.19) @@ -267,7 +263,6 @@ DEPENDENCIES bcrypt (~> 3.1.7) better_errors binding_of_caller - bitters bourbon byebug figaro (~> 1.1.1) diff --git a/app/assets/javascripts/ie9.js b/app/assets/javascripts/ie9.js new file mode 100644 index 0000000..a351371 --- /dev/null +++ b/app/assets/javascripts/ie9.js @@ -0,0 +1 @@ +//= require html5shiv/dist/html5shiv.min diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 80a05f8..a66a0f9 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,7 +7,15 @@ <%= yield(:title) %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + + + + +
@@ -17,7 +25,7 @@ <% if content_for?(:category) %>
Section: <%= yield(:category) %>
<% else %> -
Perficient Digital Skills Assessment
+
Skills Assessment Test
<% end %>
@@ -35,6 +43,10 @@ <%= render partial: 'layouts/footer' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + + <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> + + diff --git a/bower.json b/bower.json index 11bb5f4..4022d5f 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,8 @@ { "name": "rails-dev", - "authors": [""], + "authors": [ + "" + ], "private": true, "dependencies": { "jquery": "1.9.1", @@ -14,5 +16,8 @@ "bower_components", "test", "tests" - ] + ], + "devDependencies": { + "html5shiv": "^3.7.3" + } } diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index e012c15..3ef4dab 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -11,3 +11,5 @@ Rails.application.config.assets.version = '1.0' # Rails.application.config.assets.precompile += %w( search.js ) Rails.application.config.assets.precompile += ['vendor/assets/**/*'] + +Rails.application.config.assets.precompile += %w(ie9.js)