mmoser/skill-assessment-app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adds html5shiv; removes Bitters; IE conditional comments

Browse Source
This commit is contained in:
Jennifer Siegfried 2016-08-12 16:04:09 -06:00
parent 2ed89e14e4
commit 114450dd08
6 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -18,7 +18,6 @@ gem 'uglifier', '>= 1.3.0'
# assets # assets
gem 'bourbon' gem 'bourbon'
gem 'neat' gem 'neat'
gem 'bitters'
group :development do group :development do
gem 'better_errors' gem 'better_errors'

5
Gemfile.lock
View File

@ -49,10 +49,6 @@ GEM
rack (>= 0.9.0) rack (>= 0.9.0)
binding_of_caller (0.7.2) binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1) debug_inspector (>= 0.0.1)
bitters (1.2.0)
bourbon (>= 4.2)
sass (>= 3.4)
thor
bourbon (4.2.7) bourbon (4.2.7)
sass (~> 3.4) sass (~> 3.4)
thor (~> 0.19) thor (~> 0.19)
@ -267,7 +263,6 @@ DEPENDENCIES
bcrypt (~> 3.1.7) bcrypt (~> 3.1.7)
better_errors better_errors
binding_of_caller binding_of_caller
bitters
bourbon bourbon
byebug byebug
figaro (~> 1.1.1) figaro (~> 1.1.1)

1
app/assets/javascripts/ie9.js Normal file
View File

@ -0,0 +1 @@
//= require html5shiv/dist/html5shiv.min

14
app/views/layouts/application.html.erb
View File

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

9
bower.json
View File

@ -1,6 +1,8 @@
{ {
"name": "rails-dev", "name": "rails-dev",
"authors": [""], "authors": [
""
],
"private": true, "private": true,
"dependencies": { "dependencies": {
"jquery": "1.9.1", "jquery": "1.9.1",
@ -14,5 +16,8 @@
"bower_components", "bower_components",
"test", "test",
"tests" "tests"
] ],
"devDependencies": {
"html5shiv": "^3.7.3"
}
} }

2
config/initializers/assets.rb
View File

@ -11,3 +11,5 @@ Rails.application.config.assets.version = '1.0'
# Rails.application.config.assets.precompile += %w( search.js ) # Rails.application.config.assets.precompile += %w( search.js )
Rails.application.config.assets.precompile += ['vendor/assets/**/*'] Rails.application.config.assets.precompile += ['vendor/assets/**/*']
Rails.application.config.assets.precompile += %w(ie9.js)