Revert "Move left nav all the way to the top left corner."

This reverts commit d7a07294a8d4a546852a33417972924f658e4024.

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 4e2c19c42223e4b623c583756a9eba997a7c70b8..2c361f9a5e466832005a0f7836319709823f06d6 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -91,11 +91,6 @@ form.small-form-margin {
     padding: 2px 20px;
 }*/
 
-.left-nav ul ul li > div {
-    margin-left: 1.5em;
-    text-indent: -1.5em;
-}
-
 ul.arvados-nav {
     list-style: none;
     padding-left: 0em;
@@ -154,12 +149,10 @@ li.notification {
 }
 .arvados-nav-container {
     top: 70px; 
+    height: calc(100% - 70px); 
     overflow: auto; 
     z-index: 2;
 }
-.arvados-nav {
-    padding-top: 70px;
-}
 
 .arvados-nav-active {
     background: rgb(66, 139, 202);
@@ -168,9 +161,6 @@ li.notification {
 .arvados-nav-active a {
     color: white;
 }
-.arvados-nav-active a:hover {
-    color: white;
-}
 
 // See HeaderRowFixer in application.js
 table.table-fixed-header-row {

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index f141536f9c72dfd678df299422d3a8d03228e2fc..0716bcc46006f0f81d5b131e620d47eb717e0d1c 100644 (file)
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -32,7 +32,7 @@
     padding-top: 70px; /* 70px to make the container go all the way to the bottom of the navbar */
     }
 
-    body > div.container-fluid > div.col-sm-10.col-sm-offset-2 {
+    body > div.container-fluid > div.col-sm-9.col-sm-offset-3 {
     overflow: auto;
     }
 
@@ -49,20 +49,16 @@
     width: 400px;
     overflow-y: auto;
     }
+
     @media (min-width: 768px) {
-        .left-nav {
-            position: fixed;
-            top: 0;
-            left: 0;
-            height: 100%;
-            padding-left: 0;
-        }
+    .left-nav {
+    position: fixed;
+    }
     }
-
     @media (max-width: 767px) {
-        .breadcrumbs {
-            display: none;
-        }
+    .breadcrumbs {
+    display: none;
+    }
     }
   </style>
 </head>
@@ -179,12 +175,12 @@
   </div>
 
   <div class="container-fluid">
-      <div class="col-sm-10 col-sm-offset-2">
+      <div class="col-sm-9 col-sm-offset-3">
         <div id="content">
           <%= yield %>
         </div>
       </div>
-      <div class="col-sm-2 left-nav">
+      <div class="col-sm-3 left-nav">
         <div class="arvados-nav-container">
         <% if current_user.andand.is_active %>
         <div class="well">
@@ -193,13 +189,13 @@
             <a href="/">Dashboard</a>
           </li>
 
-          <% [['Data', [['collections', 'Collections (data&nbsp;files)'],
+          <% [['Data', [['collections', 'Collections (data files)'],
                         ['humans'],
                         ['traits'],
                         ['specimens'],
                         ['links']]],
-              ['Activity', [['pipeline_instances',],
-                            ['jobs']]],
+              ['Activity', [['pipeline_instances', 'Recent pipeline instances'],
+                            ['jobs', 'Recent jobs']]],
               ['Compute', [['pipeline_templates'],
                            ['repositories', 'Code repositories'],
                            ['virtual_machines']]],
@@ -212,11 +208,9 @@
               <% j[1].each do |k| %>
                 <% unless k[0] == 'users' and !current_user.andand.is_admin %>
                   <li class="<%= 'arvados-nav-active' if (params[:controller] == k[0] && params[:action] != 'home') %>">
-                    <div>
-                      <a href="/<%= k[0] %>">
-                        <%= if k[1] then raw(k[1]) else k[0].capitalize.gsub('_', ' ') end %>
-                      </a>
-                    </div>
+                    <a href="/<%= k[0] %>">
+                      <%= if k[1] then k[1] else k[0].capitalize.gsub('_', ' ') end %>
+                    </a>
                   </li>
                 <% end %>
               <% end %>