[ARVADOS] updated: adf106e2d0db9e2cb8078759c5fcb8b12408e623

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/stylesheets/application.css.scss | 2 +-
 apps/workbench/app/views/layouts/application.html.erb      | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

       via  adf106e2d0db9e2cb8078759c5fcb8b12408e623 (commit)
       via  84fd14a1ee4b5534a6275b1c214bc6f39ece6f95 (commit)
      from  95cb55add68af9a0742ca8054c0c328658e5e651 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit adf106e2d0db9e2cb8078759c5fcb8b12408e623
Author: Tom Clegg <tom at curoverse.com>
Date:   Sat Jun 7 13:45:11 2014 -0400

    2872: Hide projects nav bar when not logged in or inactive.

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 4287115..f39f35c 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -156,7 +156,9 @@
         </ul>
       </div><!-- /.navbar-collapse -->
     </nav>
-    <nav class="navbar navbar-default breadcrumbs" role="navigation">
+
+    <% if current_user.andand.is_active %>
+      <nav class="navbar navbar-default breadcrumbs" role="navigation">
         <ul class="nav navbar-nav navbar-left">
           <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" id="projects-menu">
@@ -203,7 +205,8 @@
             </li>
           <% end %>
         </ul>
-    </nav>
+      </nav>
+    <% end %>
 
     <div id="page-wrapper">
       <%= yield %>

commit 84fd14a1ee4b5534a6275b1c214bc6f39ece6f95
Author: Tom Clegg <tom at curoverse.com>
Date:   Sat Jun 7 13:43:31 2014 -0400

    2872: Fix notifications menu colors.

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index d261de8..39b037c 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -117,8 +117,8 @@ nav.navbar-fixed-top .navbar-nav.navbar-right > li.open > a:focus,
 nav.navbar-fixed-top .navbar-nav.navbar-right > li.open > a:hover {
     background: lighten($top-nav-bg, 5%);
 }
-nav.navbar-fixed-top .navbar-nav.navbar-right > li,
 nav.navbar-fixed-top .navbar-nav.navbar-right > li > a,
+nav.navbar-fixed-top .navbar-nav.navbar-right > li > a:focus,
 nav.navbar-fixed-top .navbar-nav.navbar-right > li > a:hover {
     color: #fff;
 }

-----------------------------------------------------------------------


hooks/post-receive
--