Skip to content

Commit

Permalink
Merge pull request #117 from floomoon/patch-1
Browse files Browse the repository at this point in the history
Missing closed div in the erb template.
  • Loading branch information
seyhunak committed Feb 25, 2012
2 parents 9cc2f40 + 53ae4b4 commit 9162f90
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 additions & 12 deletions lib/generators/bootstrap/layout/templates/layout.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@

<div class="<%= container_class %>">
<%- if layout_type == "fluid" -%>
<div class="row-fluid">
<div class="row-fluid">
<div class="span3">
<div class="well sidebar-nav">
<ul class="nav nav-list">
<li class="nav-header">Sidebar</li>
<%- (1..3).each do |i| -%>
<li><%%= link_to "Link<%= i %>", "/path<%= i %>" %></li>
<%- end -%>
<li><%%= link_to "Link<%= i %>", "/path<%= i %>" %></li>
<%- end -%>
</ul>
</div><!--/.well -->
</div><!--/span-->
Expand All @@ -68,25 +68,26 @@
</div>
</div><!--/row-->
<%- else -%>
<div class="content">
<div class="row">
<div class="span9">
<div class="content">
<div class="row">
<div class="span9">
<%%= yield %>
</div>
<div class="span1">&nbsp;</div>
</div>
<div class="span1">&nbsp;</div>
<div class="span3">
<div class="well sidebar-nav">
<h3>Sidebar</h3>
<ul class="nav nav-list">
<li class="nav-header">Sidebar</li>
<ul class="nav nav-list">
<li class="nav-header">Sidebar</li>
<%- (1..3).each do |i| -%>
<li><%%= link_to "Link<%= i %>", "/path<%= i %>" %></li>
<%- end -%>
</ul>
</div>
</div>
</div>
</div>
</div>
</div><!--/row-->
</div><!--/content-->
<%- end -%>

<footer>
Expand Down

0 comments on commit 9162f90

Please sign in to comment.