From b86d5f3950a95d6bb91a421f3d8cf99131068fbb Mon Sep 17 00:00:00 2001 From: echarp Date: Fri, 7 Mar 2014 19:34:07 +0100 Subject: [PATCH] =?UTF-8?q?La=20librairie=20javascript=20modernizr=20a=20?= =?UTF-8?q?=C3=A9t=C3=A9=20ajout=C3=A9e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 1 + Gemfile.lock | 2 ++ app/assets/javascripts/application.js | 1 + app/views/layouts/application.html.haml | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index b36446b8..e8157d1d 100644 --- a/Gemfile +++ b/Gemfile @@ -42,6 +42,7 @@ end gem 'haml-rails' gem 'compass-rails', '1.1.3' +gem 'modernizr-rails' gem 'activeadmin', github: 'gregbell/active_admin' gem 'rails-i18n' gem 'devise-i18n' diff --git a/Gemfile.lock b/Gemfile.lock index 187b6627..cc21fe0d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -160,6 +160,7 @@ GEM method_source (0.8.2) mime-types (1.25.1) minitest (4.7.5) + modernizr-rails (2.7.1) multi_json (1.9.0) mysql2 (0.3.15) nio4r (1.0.0) @@ -258,6 +259,7 @@ DEPENDENCIES jbuilder jquery-rails jquery-turbolinks + modernizr-rails mysql2 quiet_assets rails diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 06881ed0..e834774a 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,4 +14,5 @@ //= require jquery_ujs //= require jquery.turbolinks //= require turbolinks +//= require modernizr //= require_tree . diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index e65433f1..3dc9e16b 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,6 +1,6 @@ !!! 5 /[if IE] -%html(lang="#{I18n.locale}") +%html.no-js(lang="#{I18n.locale}") %head %title=t '.title'