From 71a78f864321dcb83cdb95d7b26e49bc23cb72ba Mon Sep 17 00:00:00 2001 From: Michail Yasonik Date: Thu, 10 Sep 2020 16:42:15 -0400 Subject: [PATCH] css cleanup --- src/core/public/_variables.scss | 3 +++ src/core/public/index.scss | 2 +- src/core/public/rendering/_base.scss | 12 +----------- src/plugins/timelion/public/_app.scss | 5 ----- x-pack/plugins/maps/public/_main.scss | 3 +-- 5 files changed, 6 insertions(+), 19 deletions(-) create mode 100644 src/core/public/_variables.scss diff --git a/src/core/public/_variables.scss b/src/core/public/_variables.scss new file mode 100644 index 0000000000000..46fdf68bc2073 --- /dev/null +++ b/src/core/public/_variables.scss @@ -0,0 +1,3 @@ +@import '@elastic/eui/src/global_styling/variables/header'; + +$headerOffset: $euiHeaderHeightCompensation * 2; diff --git a/src/core/public/index.scss b/src/core/public/index.scss index c2ad2841d5a77..6ba9254e5d381 100644 --- a/src/core/public/index.scss +++ b/src/core/public/index.scss @@ -1,6 +1,6 @@ +@import './variables'; @import './core'; @import './chrome/index'; @import './overlays/index'; @import './rendering/index'; @import './styles/index'; - diff --git a/src/core/public/rendering/_base.scss b/src/core/public/rendering/_base.scss index 89a003b6be313..f5a97b5fac09d 100644 --- a/src/core/public/rendering/_base.scss +++ b/src/core/public/rendering/_base.scss @@ -1,8 +1,4 @@ -@import '@elastic/eui/src/global_styling/variables/header'; -@import '@elastic/eui/src/components/nav_drawer/variables'; -@include euiHeaderAffordForFixed($euiHeaderHeightCompensation * 2); - -$headerOffset: $euiHeaderHeightCompensation * 2; +@include euiHeaderAffordForFixed($headerOffset); /** * stretch the root element of the Kibana application to set the base-size that @@ -21,12 +17,6 @@ $headerOffset: $euiHeaderHeightCompensation * 2; margin: 0 auto; min-height: calc(100vh - #{$headerOffset}); - @include internetExplorerOnly { - // IE specific bug with min-height in flex container, described in the next link - // https://github.com/philipwalton/flexbugs#3-min-height-on-a-flex-container-wont-apply-to-its-flex-items - height: calc(100vh - #{$headerOffset}); - } - &.hidden-chrome { min-height: 100vh; } diff --git a/src/plugins/timelion/public/_app.scss b/src/plugins/timelion/public/_app.scss index f7549970598c4..8b9078caba5a8 100644 --- a/src/plugins/timelion/public/_app.scss +++ b/src/plugins/timelion/public/_app.scss @@ -1,10 +1,5 @@ -@import '@elastic/eui/src/global_styling/variables/header'; - -$headerOffset: $euiHeaderHeightCompensation * 2; - .timApp { position: relative; - min-height: calc(100vh - #{$headerOffset}); background: $euiColorEmptyShade; [ng-click] { diff --git a/x-pack/plugins/maps/public/_main.scss b/x-pack/plugins/maps/public/_main.scss index 8ef92cfe8b87f..8c3b09213dead 100644 --- a/x-pack/plugins/maps/public/_main.scss +++ b/x-pack/plugins/maps/public/_main.scss @@ -1,5 +1,4 @@ -@import '@elastic/eui/src/global_styling/variables/header'; -$headerOffset: $euiHeaderHeightCompensation * 2; +@import '../../../../src/core/public/variables'; // sass-lint:disable no-ids #maps-plugin {