diff options
| author | mo khan <mo@mokhan.ca> | 2013-07-18 16:20:26 -0600 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2013-07-18 16:20:31 -0600 |
| commit | 109f37d299f092a85a0ccb3f6c7fa1d4388fa909 (patch) | |
| tree | 9402d15a9e76f712617955bb101939f9fe135afa | |
| parent | daff1935b82b3800320c643ae8ee78eec9fbdb3c (diff) | |
install twitter bootstrap
| -rw-r--r-- | app/assets/javascripts/application.js | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/custom.css.scss | 3 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 29 |
3 files changed, 21 insertions, 12 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d6925fa..e3a9f2d 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,5 +12,6 @@ // //= require jquery //= require jquery_ujs +//= require bootstrap //= require turbolinks //= require_tree . diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss new file mode 100644 index 0000000..fc66ab6 --- /dev/null +++ b/app/assets/stylesheets/custom.css.scss @@ -0,0 +1,3 @@ +@import "bootstrap"; +body { padding-top: 60px; } +@import "bootstrap-responsive"; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 19f106c..d8ed28c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,14 +1,19 @@ <!DOCTYPE html> -<html> -<head> - <title>Parley</title> - <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> - <%= javascript_include_tag "application", "data-turbolinks-track" => true %> - <%= csrf_meta_tags %> -</head> -<body> - -<%= yield %> - -</body> +<html lang="en"> + <head> + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/> + <meta name="viewport" content="width=device-width, initial-scale=1.0"/> + <title>Parley</title> + <%= stylesheet_link_tag :application %> + <%= yield :head %> + <%= csrf_meta_tags %> + </head> + <body> + <%= javascript_include_tag :application %> + <!--[if lt IE 9]> + <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> + <![endif]--> + <%= yield :javascript %> + </body> </html> |