Merge branch 'master' into 2257-inequality-conditions

[arvados.git] / apps / workbench / app / views / application / _content.html.erb

diff --git a/apps/workbench/app/views/application/_content.html.erb b/apps/workbench/app/views/application/_content.html.erb
index e7023643356d467aaf6fc4e840cf00b839d0c14b..53444a5c9c72defe283deff498996f1c8ffb7782 100644 (file)
--- a/apps/workbench/app/views/application/_content.html.erb
+++ b/apps/workbench/app/views/application/_content.html.erb
@@ -15,7 +15,7 @@
 <div class="tab-content">
 <% panes.each_with_index do |(pane, content), i| %>
   <div id="<%= pane %>" class="tab-pane fade <%= 'in active' if i==0 %>">
-    <div class="smart-scroll">
+    <div class="smart-scroll" style="margin-top:0.5em;">
       <%= content %>
     </div>
   </div>
@@ -24,3 +24,7 @@
 
 <% end %>
 
+<% content_for :js do %>
+    $(window).on('load', smart_scroll_fixup);
+    $(document).on('shown.bs.tab', 'ul.nav-tabs > li > a', smart_scroll_fixup);
+<% end %>