From dcc037c54920fffcd5c6fa9fbc469bfee56d7fec Mon Sep 17 00:00:00 2001 From: skaman82 Date: Wed, 28 Oct 2015 12:35:44 +0100 Subject: [PATCH] Fix for open log --- main.css | 17 +++++++++++++++++ main.js | 3 +++ 2 files changed, 20 insertions(+) mode change 100755 => 100644 main.css mode change 100755 => 100644 main.js diff --git a/main.css b/main.css old mode 100755 new mode 100644 index 6420776b..3093896d --- a/main.css +++ b/main.css @@ -886,7 +886,24 @@ li.active .ic_mission { overflow-y: auto; border: 0px solid #848484; /* 1px solid #848484; */ -webkit-transform: rotateX(0deg); /* DO NOT REMOVE! this fixes the UI freezing bug on MAC OS X */ + transition: all 1.0s; + } + +#content.active { + margin-top: 0px; /* 31 */ + padding: 20px; /* 10 */ + height:calc(100% - 274px); /* (port picker 105px, log 25px, tab 0px, status bar: 20px + padding) - was: calc(100% - 171px)*/ + background-color: white; + overflow-x: hidden; + overflow-y: auto; + border: 0px solid #848484; /* 1px solid #848484; */ + -webkit-transform: rotateX(0deg); /* DO NOT REMOVE! this fixes the UI freezing bug on MAC OS X */ + transition: all 1.3s; + +} + + #status-bar { position: fixed; bottom: 0px; diff --git a/main.js b/main.js old mode 100755 new mode 100644 index f45775e3..c4862aff --- a/main.js +++ b/main.js @@ -378,12 +378,15 @@ $("#showlog").on('click', function() { if ( state ) { $("#log").animate({height: 27}, 800); $("#log").removeClass('active'); + $("#content").removeClass('active'); + $("#scrollicon").removeClass('active'); state = false; }else{ $("#log").animate({height: 111}, 800); $("#log").addClass('active'); + $("#content").addClass('active'); $("#scrollicon").addClass('active'); state = true;