Adds html5shiv; removes Bitters; IE conditional comments

2016-08-12 16:04:09 -06:00 · 2016-08-12 16:04:09 -06:00 · 114450dd08
commit 114450dd08
parent 2ed89e14e4
6 changed files with 25 additions and 11 deletions
--- a/1
+++ b/1
@ -18,7 +18,6 @@ gem 'uglifier', '>= 1.3.0'
 # assets
 gem 'bourbon'
 gem 'neat'
-gem 'bitters'

 group :development do
  gem 'better_errors'
--- 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)
--- a/app/assets/javascripts/ie9.js
+++ b/app/assets/javascripts/ie9.js
@ -0,0 +1 @@
+//= require html5shiv/dist/html5shiv.min
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@ -7,7 +7,15 @@

    <title><%= yield(:title) %></title>

+    <!--[if ! lte IE 8]><!-->
      <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <!--<![endif]-->
+
+    <!--[if lt IE 9]>
+      <%= javascript_include_tag 'ie9' %>
+    <![endif]-->
+
+
  </head>
  <body>
    <div class="layout">
@ -17,7 +25,7 @@
          <% if content_for?(:category) %>
            <div>Section: <%= yield(:category) %></div>
          <% else %>
-            <div>Perficient Digital Skills Assessment</div>
+            <div>Skills Assessment Test</div>
          <% end %>
        </div>
      </header>
@ -35,6 +43,10 @@

    </div>
    <%= render partial: 'layouts/footer' %>
+
+    <!--[if ! lte IE 8]><!-->
      <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+    <!--<![endif]-->
+
  </body>
 </html>
--- 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"
+  }
 }
--- 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)