Merge branch 'Gal2375' into dev

Conflicts: static/scripts/bundled/analysis.bundled.js static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js.map static/style/blue/base.css
galaxyproject · Aug 4, 2016 · bf54f08 · bf54f08
2 parents c28f7e6 + e13095d
commit bf54f08
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/client/galaxy/style/less/base.less b/client/galaxy/style/less/base.less
@@ -1475,7 +1475,7 @@ div.permissionContainer {
     color: @base-text-color;
     background: @side-panel-bg;
     min-height: 100%;
-    padding: 5px 10px;
+    padding: 35px 10px;
 }
 
 div.toolSectionPad
@@ -1543,7 +1543,9 @@ div.toolTitleNoSection
 #tool-search {
     padding-top: 5px;
     padding-bottom: 10px;
-    position: relative;
+    position: fixed;
+    top: 65px;
+    width: 210px;
 }
 
 // Dataset Display Styles

diff --git a/static/style/blue/base.css b/static/style/blue/base.css