From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Fri, 28 Feb 2014 13:36:49 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into 2049-run-job-from-workbench
X-Git-Tag: 1.1.0~2715^2~2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/f26cbf1c4d949d3e7c7b26ab27c5f4d48d8059ed

Merge remote-tracking branch 'origin/master' into 2049-run-job-from-workbench
---

f26cbf1c4d949d3e7c7b26ab27c5f4d48d8059ed
diff --cc apps/workbench/app/views/layouts/application.html.erb
index db8074b1ad,1dc6284c83..68f0e109bd
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@@ -42,20 -42,23 +42,15 @@@
      padding-top: 1.25em;
      }
  
 -    /* Setting the height needs to be fixed with javascript. */
 -    .dropdown-menu {
 -    padding-right: 20px;
 -    max-height: 440px;
 -    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>