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

Simplify logo layout in admin header

Browse Source 
Having the logo inside a list of one item wasn't needed and its classes
conflicted with other elements with the `.menu` class.
This commit is contained in:
Javi Martín
2021-08-27 23:06:33 +02:00
parent d6fe49ff4f
commit 877eb44bd4
3 changed files with 28 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/stylesheets/admin.scss
View File

@@ -111,10 +111,6 @@ $table-header: #ecf1f6;
[class^="icon-"] { [class^="icon-"] {
font-size: $base-font-size; font-size: $base-font-size;
} }
}
.menu .menu-text {
padding: 0;
h1 { h1 {
margin-top: $line-height / 2; margin-top: $line-height / 2;
@@ -128,14 +124,15 @@ $table-header: #ecf1f6;
color: inherit; color: inherit;
text-transform: uppercase; text-transform: uppercase;
} }
}
a { a {
display: inline-block; color: inherit;
font-family: "Lato" !important; display: inline-block;
font-size: rem-calc(24); font-family: "Lato" !important;
font-weight: lighter; font-size: rem-calc(24);
padding: 0; font-weight: lighter;
line-height: 1;
}
} }
} }

32
app/views/layouts/_admin_header.html.erb
View File

@@ -17,25 +17,21 @@
<div class="top-bar"> <div class="top-bar">
<div class="top-bar-left"> <div class="top-bar-left">
<ul class="menu"> <% if namespace == "officing" %>
<li class="menu-text"> <h1>
<% if namespace == "officing" %> <%= link_to "#" do %>
<h1> <%= setting["org_name"] %>
<%= link_to "#" do %> <br><small><%= namespaced_header_title %></small>
<%= setting["org_name"] %>
<br><small><%= namespaced_header_title %></small>
<% end %>
</h1>
<% else %>
<h1>
<%= link_to namespaced_root_path do %>
<%= setting["org_name"] %>
<br><small><%= namespaced_header_title %></small>
<% end %>
</h1>
<% end %> <% end %>
</li> </h1>
</ul> <% else %>
<h1>
<%= link_to namespaced_root_path do %>
<%= setting["org_name"] %>
<br><small><%= namespaced_header_title %></small>
<% end %>
</h1>
<% end %>
</div> </div>
<div id="responsive_menu"> <div id="responsive_menu">

16
app/views/layouts/management.html.erb
View File

@@ -16,16 +16,12 @@
<div class="expanded row admin-top-bar"> <div class="expanded row admin-top-bar">
<div class="top-bar"> <div class="top-bar">
<div class="top-bar-left"> <div class="top-bar-left">
<ul class="menu"> <h1>
<li class="menu-text"> <%= link_to management_root_path do %>
<h1> <%= setting["org_name"] %>
<%= link_to management_root_path do %> <br><small><%= t("management.dashboard.index.title") %></small>
<%= setting["org_name"] %> <% end %>
<br><small><%= t("management.dashboard.index.title") %></small> </h1>
<% end %>
</h1>
</li>
</ul>
</div> </div>
<% if show_admin_menu?(manager_logged_in) %> <% if show_admin_menu?(manager_logged_in) %>
<div id="responsive_menu"> <div id="responsive_menu">