From 214e2bbd56642587d19a9a88938c3c4cd0805e4a Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Tue, 16 Apr 2019 15:40:19 -0700 Subject: [PATCH] Fixed CSS with IE desktop fullscreen and desktop tools button. --- public/styles/style-old.css | 6 +----- public/styles/style.css | 10 ++++++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/public/styles/style-old.css b/public/styles/style-old.css index d236ca83..2ff27514 100644 --- a/public/styles/style-old.css +++ b/public/styles/style-old.css @@ -92,7 +92,7 @@ } #page_content { - max-height: calc(100vh - 108px); + /*max-height: calc(100vh - 108px);*/ } .fullscreen #page_content { position: absolute; @@ -655,11 +655,7 @@ } .chartViewCanvas { -<<<<<<< HEAD width: 80px; -======= - width: 60px; ->>>>>>> b375b9fdb2584c2cd6311834bd6c540545d075b4 display: inline-block; } diff --git a/public/styles/style.css b/public/styles/style.css index 2ff27514..0713dfbd 100644 --- a/public/styles/style.css +++ b/public/styles/style.css @@ -195,11 +195,14 @@ .fulldesk #column_l { width: 100%; - height: unset; + /*height: unset;*/ + /*max-height: unset;*/ + /*overflow-y: unset;*/ margin-left: unset; - overflow-y: unset; padding: 0; - max-height: unset; + max-height:100vh; + height:100vh; + overflow-y:hidden; } .fulldesk #column_l_bottomgap { display: none; @@ -763,7 +766,6 @@ top: 0; right: 0; border-left: 2px solid lightgray; - display: none; } #DeskToolsRefreshButton { float: right;