Skip to content

Commit

Permalink
Fix header
Browse files Browse the repository at this point in the history
  • Loading branch information
kobya4 committed Aug 8, 2017
1 parent 23945bc commit ece61df
Showing 1 changed file with 17 additions and 15 deletions.
32 changes: 17 additions & 15 deletions app/views/layouts/_header.html.erb
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<header class="navbar navbar-fixed-top">
<div id="header_container" class="container">
<%= link_to image_tag('/assets/logo-m.png', {:id => "logo", :border => '0', :alt => '家計学園'}), root_path %>
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navi">
<span class="sr-only">メニュー</span>
<span class="icon-bar glyphicon glyphicon-menu-hamburger"></span>
</button>
</div>
<div id="navi" class="collapse navbar-collapse">
<ul class="nav navbar-nav navbar-right">
<% if logged_in? %>
<% if logged_in? %>
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navi">
<span class="sr-only">メニュー</span>
<span class="icon-bar glyphicon glyphicon-menu-hamburger"></span>
</button>
</div>
<div id="navi" class="collapse navbar-collapse">
<ul class="nav navbar-nav navbar-right">
<li>
<%= link_to user_path(current_user.id), { :class => "btn button_settings" } do %>
<i class="glyphicon glyphicon-home"></i> ホーム
Expand All @@ -20,13 +20,15 @@
<i class="glyphicon glyphicon-cog"></i> 設定
<% end %>
</li>
<% else %>
<li>
<%= link_to 'ログイン', login_path, { :class => "btn button_settings" } %>
</li>
<% end %>
</ul>
</div>
<% else %>
<ul class="nav navbar-nav navbar-right">
<li>
<%= link_to 'ログイン', login_path, { :class => "btn button_settings" } %>
</li>
</ul>
</div>
<% end %>
</div>
<div class="border_test">
</div>
Expand Down

0 comments on commit ece61df

Please sign in to comment.