Merge pull request #3055 from dannon/cherrypick_masthead_fix

Cherrypick masthead fix
galaxyproject · Oct 14, 2016 · 28bb83f · 28bb83f
2 parents e5913a4 + 6312d80
commit 28bb83f
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 32 deletions.
diff --git a/client/galaxy/scripts/mvc/tool/tools.js b/client/galaxy/scripts/mvc/tool/tools.js
@@ -633,6 +633,12 @@ var ToolSearchView = Backbone.View.extend({
         if (!this.model.is_visible()) {
             this.$el.hide();
         }
+
+        // Adjust top for issue 2907 depending on whether the messagebox is visible.
+        if ($("#messagebox").is(":visible")) {
+            this.$el.css("top","95px");
+        }
+
         this.$el.find('[title]').tooltip();
         return this;
     },

diff --git a/static/maps/mvc/tool/tools.js.map b/static/maps/mvc/tool/tools.js.map
diff --git a/static/scripts/bundled/analysis.bundled.js b/static/scripts/bundled/analysis.bundled.js
diff --git a/static/scripts/bundled/analysis.bundled.js.map b/static/scripts/bundled/analysis.bundled.js.map
diff --git a/static/scripts/bundled/libs.bundled.js b/static/scripts/bundled/libs.bundled.js
diff --git a/static/scripts/bundled/libs.bundled.js.map b/static/scripts/bundled/libs.bundled.js.map
diff --git a/static/scripts/mvc/tool/tools.js b/static/scripts/mvc/tool/tools.js