From 673c1fbaa8f6688702986f7311c52b604f479dc1 Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Thu, 1 Jun 2023 12:14:27 +0200 Subject: [PATCH] Fix layout overflow when navigator is open [SCI-8589] --- app/assets/stylesheets/navigation/general.scss | 4 ++++ app/javascript/packs/vue/navigation/navigator.js | 4 ++++ app/views/layouts/application.html.erb | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/navigation/general.scss b/app/assets/stylesheets/navigation/general.scss index d3035f2ff..9151a7446 100644 --- a/app/assets/stylesheets/navigation/general.scss +++ b/app/assets/stylesheets/navigation/general.scss @@ -1,4 +1,8 @@ body { + min-width: 1140px; +} + +body.navigator-collapsed { min-width: 900px; } diff --git a/app/javascript/packs/vue/navigation/navigator.js b/app/javascript/packs/vue/navigation/navigator.js index f8478d368..204ee3c93 100644 --- a/app/javascript/packs/vue/navigation/navigator.js +++ b/app/javascript/packs/vue/navigation/navigator.js @@ -46,7 +46,11 @@ window.addEventListener('DOMContentLoaded', () => { navigatorCollapsed: function () { let stateUrl = $('#sciNavigationNavigatorContainer').attr('data-navigator-state-url'); $('.sci--layout').attr('data-navigator-collapsed', this.navigatorCollapsed); + $('body').toggleClass('navigator-collapsed', this.navigatorCollapsed); $.post(stateUrl, {state: this.navigatorCollapsed ? 'collapsed' : 'open'}); + + // refresh action toolbar width on navigator toggle, take into account transition time of .4s + if (window.actionToolbarComponent) setTimeout(window.actionToolbarComponent.setWidth, 401); } } }); diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 33872bbca..ccada7d98 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -49,7 +49,7 @@ <%= javascript_include_tag 'vue_navigation_top_menu', nonce: true %> data-current-team-id="<%= current_team.id %>" data-atwho-users-url="<%= atwho_users_team_path(current_team) %>"