diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index c6e72a248..b1449f476 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -111,10 +111,6 @@ $table-header: #ecf1f6; [class^="icon-"] { font-size: $base-font-size; } - } - - .menu .menu-text { - padding: 0; h1 { margin-top: $line-height / 2; @@ -128,14 +124,15 @@ $table-header: #ecf1f6; color: inherit; text-transform: uppercase; } - } - a { - display: inline-block; - font-family: "Lato" !important; - font-size: rem-calc(24); - font-weight: lighter; - padding: 0; + a { + color: inherit; + display: inline-block; + font-family: "Lato" !important; + font-size: rem-calc(24); + font-weight: lighter; + line-height: 1; + } } } diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb index e301c0d4a..72ac224de 100644 --- a/app/views/layouts/_admin_header.html.erb +++ b/app/views/layouts/_admin_header.html.erb @@ -17,25 +17,21 @@
- + + <% else %> +

+ <%= link_to namespaced_root_path do %> + <%= setting["org_name"] %> +
<%= namespaced_header_title %> + <% end %> +

+ <% end %>
diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb index efd92bbdb..5f8f77d32 100644 --- a/app/views/layouts/management.html.erb +++ b/app/views/layouts/management.html.erb @@ -16,16 +16,12 @@
- +

+ <%= link_to management_root_path do %> + <%= setting["org_name"] %> +
<%= t("management.dashboard.index.title") %> + <% end %> +

<% if show_admin_menu?(manager_logged_in) %>