[ARVADOS] updated: 89355aa0e2727373fa60c781ec6c00c31a79a7dc

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/stylesheets/application.css.scss    |   12 ++++++-
 .../app/views/layouts/application.html.erb         |   37 ++++++++++++--------
 2 files changed, 33 insertions(+), 16 deletions(-)

       via  89355aa0e2727373fa60c781ec6c00c31a79a7dc (commit)
       via  d7a07294a8d4a546852a33417972924f658e4024 (commit)
      from  9e778a62184d4604f62e6c30fec8d1be1781de4b (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 89355aa0e2727373fa60c781ec6c00c31a79a7dc
Merge: 9e778a6 d7a0729
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Feb 27 16:18:03 2014 -0500

    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/views/layouts/application.html.erb
index 2128515,f141536..db8074b
--- a/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>

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


hooks/post-receive
--