From 8c2f1eead7669bbb42569fb66f16ebabf11f86c6 Mon Sep 17 00:00:00 2001 From: Filip Barl Date: Tue, 28 Mar 2017 12:53:08 +0200 Subject: [PATCH] Don't reset zoom on refresh layout. --- client/app/scripts/reducers/root.js | 4 ---- client/app/styles/_base.scss | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/client/app/scripts/reducers/root.js b/client/app/scripts/reducers/root.js index 199645ea44..2c6b794620 100644 --- a/client/app/scripts/reducers/root.js +++ b/client/app/scripts/reducers/root.js @@ -257,10 +257,6 @@ export function rootReducer(state = initialState, action) { } case ActionTypes.CLICK_FORCE_RELAYOUT: { - if (action.forceRelayout) { - // Reset the zoom cache when forcing relayout. - state = state.deleteIn(activeTopologyZoomCacheKeyPathSelector(state)); - } return state.set('forceRelayout', action.forceRelayout); } diff --git a/client/app/styles/_base.scss b/client/app/styles/_base.scss index 8a20987082..cdedc17ff3 100644 --- a/client/app/styles/_base.scss +++ b/client/app/styles/_base.scss @@ -1683,7 +1683,7 @@ // Notes: Firefox gets a bit messy if you try and bubble // heights + overflow up (min-height issue + still doesn't work v.well), // so this is a bit of a hack. - max-height: "calc(100vh - 160px - 160px - 160px)"; + max-height: calc(100vh - 160px - 160px - 160px); } } }