lib/generators/bootstrap/layout/templates/layout.html.haml in twitter-bootstrap-rails-2.0.1.0 vs lib/generators/bootstrap/layout/templates/layout.html.haml in twitter-bootstrap-rails-2.0.2
- old
+ new
@@ -6,15 +6,15 @@
= csrf_meta_tags
/ Le HTML5 shim, for IE6-8 support of HTML elements
/[if lt IE 9]
= javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
/ Le styles
+ = stylesheet_link_tag "application"
:css
body {
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
}
- = stylesheet_link_tag "application", :media => "all"
/ Le fav and touch icons
%link{:href => "images/favicon.ico", :rel => "shortcut icon"}/
%link{:href => "images/apple-touch-icon.png", :rel => "apple-touch-icon"}/
%link{:href => "images/apple-touch-icon-72x72.png", :rel => "apple-touch-icon", :sizes => "72x72"}/
%link{:href => "images/apple-touch-icon-114x114.png", :rel => "apple-touch-icon", :sizes => "114x114"}/
@@ -27,12 +27,12 @@
.container-fluid
<%- else -%>
.container
<%- end -%>
%a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"}
- %span.icon-bar
- %span.icon-bar
- %span.icon-bar
+ %span.i-bar
+ %span.i-bar
+ %span.i-bar
%a.brand{:href => "#"}<%= app_name %>
.<%=container_class%>.nav-collapse
%ul.nav
%li= link_to "Link 1", "/path1"
%li= link_to "Link 2", "/path2"