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

Conflicts:
	apps/workbench/app/views/layouts/application.html.erb

diff --cc apps/workbench/app/assets/stylesheets/application.css.scss
Simple merge

diff --cc apps/workbench/app/views/layouts/application.html.erb
index 2128515860a5946a9e8b8b273ea5262cc9cc283b,f141536f9c72dfd678df299422d3a8d03228e2fc..db8074b1ad409905658ae5d807021fc64479d1b2
--- 1/apps/workbench/app/views/layouts/application.html.erb
--- 2/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@@ -42,15 -42,27 +42,20 @@@
      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;
-     }
+         .left-nav {
+             position: fixed;
+             top: 0;
+             left: 0;
+             height: 100%;
+             padding-left: 0;
+         }
      }
+ 
      @media (max-width: 767px) {
-     .breadcrumbs {
-     display: none;
-     }
+         .breadcrumbs {
+             display: none;
+         }
      }
    </style>
  </head>