From 342898f7584a00e91db4befd38782f1352e648e7 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 4 Feb 2014 01:11:22 -0800 Subject: [PATCH] Merge top nav menus into brand dropdown, move breadcrumbs into top nav, and lighten up the top nav. refs #1979 --- .../app/assets/stylesheets/application.css | 11 ++ .../_breadcrumb_page_name.html.erb | 2 +- .../views/application/_breadcrumbs.html.erb | 24 ++-- .../app/views/layouts/application.html.erb | 112 +++++++----------- 4 files changed, 68 insertions(+), 81 deletions(-) diff --git a/apps/workbench/app/assets/stylesheets/application.css b/apps/workbench/app/assets/stylesheets/application.css index d2993bef3c..8c777c8ab7 100644 --- a/apps/workbench/app/assets/stylesheets/application.css +++ b/apps/workbench/app/assets/stylesheets/application.css @@ -78,3 +78,14 @@ form.small-form-margin { .nowrap { white-space: nowrap; } +.navbar .nav li.nav-separator > span { + display: block; + float: none; + color: #bbbbbb; + padding: 10px 0 10px; + text-decoration: none; + text-shadow: 0 1px 0 #ffffff; +} +.navbar .nav .dropdown .dropdown-menu li a { + padding: 2px 20px; +} diff --git a/apps/workbench/app/views/application/_breadcrumb_page_name.html.erb b/apps/workbench/app/views/application/_breadcrumb_page_name.html.erb index 67387fdf30..1fcbe883bc 100644 --- a/apps/workbench/app/views/application/_breadcrumb_page_name.html.erb +++ b/apps/workbench/app/views/application/_breadcrumb_page_name.html.erb @@ -1 +1 @@ -<%= controller.breadcrumb_page_name %> +<%= link_to controller.breadcrumb_page_name, request.fullpath %> diff --git a/apps/workbench/app/views/application/_breadcrumbs.html.erb b/apps/workbench/app/views/application/_breadcrumbs.html.erb index 26709ad9b8..9929462dd6 100644 --- a/apps/workbench/app/views/application/_breadcrumbs.html.erb +++ b/apps/workbench/app/views/application/_breadcrumbs.html.erb @@ -1,19 +1,17 @@ -