lib/generators/bootstrap/layout/templates/layout.html.haml in twitter-bootstrap-rails-2.1.3 vs lib/generators/bootstrap/layout/templates/layout.html.haml in twitter-bootstrap-rails-2.1.4

- old
+ new

@@ -16,11 +16,11 @@ %link(href="images/apple-touch-icon.png" rel="apple-touch-icon-precomposed") %link(href="images/favicon.ico" rel="shortcut icon") %body - .navbar.navbar-fixed-top + .navbar.navbar-<%= layout_type %>-top .navbar-inner .<%= container_class %> %a.btn.btn-navbar(data-target=".nav-collapse" data-toggle="collapse") %span.icon-bar %span.icon-bar @@ -44,22 +44,21 @@ %li= link_to "Link 2", "/path2" %li= link_to "Link 3", "/path3" .span9 = yield <% else %> - .content - .row - .span9 - = bootstrap_flash - = yield - .span3 - .well.sidebar-nav - %h3 Sidebar - %ul.nav.nav-list - %li.nav-header Sidebar - %li= link_to "Link 1", "/path1" - %li= link_to "Link 2", "/path2" - %li= link_to "Link 3", "/path3" + .row + .span9 + = bootstrap_flash + = yield + .span3 + .well.sidebar-nav + %h3 Sidebar + %ul.nav.nav-list + %li.nav-header Sidebar + %li= link_to "Link 1", "/path1" + %li= link_to "Link 2", "/path2" + %li= link_to "Link 3", "/path3" <% end %> %footer %p &copy; Company 2012 / Javascripts