consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates header markup and includes new logo

Browse Source
This commit is contained in:
decabeza
2018-07-20 18:50:49 +02:00
parent 7533ce21ab
commit dcec003d0e
3 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/logo_header.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

14
app/assets/stylesheets/layout.scss
View File

@@ -542,6 +542,20 @@ header {
} }
} }
} }
.top-bar-title {
line-height: $line-height;
a img {
height: rem-calc(48);
margin: 0;
width: auto;
@include breakpoint(medium up) {
height: auto;
}
}
}
} }
.menu-icon { .menu-icon {

67
app/views/layouts/_header.html.erb
View File

@@ -10,60 +10,41 @@
</div> </div>
<div class="row"> <div class="row">
<div class="title-bar" data-responsive-toggle="responsive_menu" data-hide-for="medium">
<button class="menu-icon" type="button" data-toggle="responsive_menu"></button>
<div class="title-bar-title"><%= t("application.menu")%></div>
</div>
<div class="top-bar"> <div class="top-bar">
<ul class="menu show-for-small-only">
<li class="menu-text">
<%= link_to root_path, accesskey: "0" do %>
<%= image_tag(image_path_for("logo_header.png"),
class: "float-left",
size: "48x48",
alt: t("layouts.header.logo")) %>
<%= setting["org_name"] %>
<% end %>
</li>
</ul>
</div>
<div class="top-bar" id="responsive_menu"> <span data-responsive-toggle="responsive-menu" data-hide-for="medium" class="float-right">
<div class="top-bar-left"> <span class="menu-icon dark" data-toggle></span>
<ul class="menu"> <%= t("application.menu")%>
<li class="menu-text"> </span>
<%= link_to root_path, class: "hide-for-small-only", accesskey: "0" do %>
<%= image_tag(image_path_for("logo_header.png"), <div class="top-bar-title">
class: "hide-for-small-only float-left", <%= link_to root_path, accesskey: "0" do %>
size: "80x80", <%= image_tag(image_path_for('logo_header.png'), class: 'float-left', alt: t("layouts.header.logo")) %>
alt: t("layouts.header.logo")) %> <% end %>
<%= setting["org_name"] %>
<% end %>
</li>
</ul>
</div> </div>
<div class="top-bar-right"> <div id="responsive-menu">
<ul class="dropdown menu" data-dropdown-menu> <div class="top-bar-right">
<%= render "shared/admin_login_items" %> <ul class="menu" data-responsive-menu="medium-dropdown">
<%= render "layouts/notification_item" %> <%= render "shared/admin_login_items" %>
<%= render "devise/menu/login_items" %> <%= render "layouts/notification_item" %>
</ul> <%= render "devise/menu/login_items" %>
</div> </ul>
<div class="show-for-small-only"> <div class="show-for-small-only">
<div class="subnavigation row"> <div class="subnavigation row">
<%= render "shared/subnavigation" %> <%= render "shared/subnavigation" %>
<div class="small-12 column"> <div class="small-12 column">
<%= render "shared/top_links" %> <%= render "shared/top_links" %>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="subnavigation expanded"> <div id="navigation_bar" class="subnavigation expanded">
<div class="row"> <div class="row">
<div class="hide-for-small-only"> <div class="hide-for-small-only">
<%= render "shared/subnavigation" %> <%= render "shared/subnavigation" %>