aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Duran2012-02-06 21:01:39 -0800
committerJonathan Duran2012-02-06 21:01:39 -0800
commit151b895d743b7e662fdb13c83051a3127fc952de (patch)
treeb51e52998d4dae6c795a033f94f67a6307ef0aa6
parentd34f745c3b3d88679512ca7d9e4112f109cb31d0 (diff)
downloadninja-151b895d743b7e662fdb13c83051a3127fc952de.tar.gz
Fix Timeline height so it appears correctly on load
Signed-off-by: Jonathan Duran <jduran@motorola.com>
-rw-r--r--_scss/imports/scss/_MainWindow.scss2
-rw-r--r--css/ninja.css2
2 files changed, 2 insertions, 2 deletions
diff --git a/_scss/imports/scss/_MainWindow.scss b/_scss/imports/scss/_MainWindow.scss
index 23ace69b..99028b2a 100644
--- a/_scss/imports/scss/_MainWindow.scss
+++ b/_scss/imports/scss/_MainWindow.scss
@@ -85,7 +85,7 @@
85#bottomPanelContainer { 85#bottomPanelContainer {
86 //border: 1px solid #333; 86 //border: 1px solid #333;
87 background: transparent; 87 background: transparent;
88 88 height: 150px;
89 min-height:80px; 89 min-height:80px;
90 max-height:50%; 90 max-height:50%;
91 overflow:auto; 91 overflow:auto;
diff --git a/css/ninja.css b/css/ninja.css
index d013d9b5..6a503373 100644
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -80,7 +80,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
80 80
81#topPanelContainer { overflow: hidden; margin-bottom: 2px; height: 32px; } 81#topPanelContainer { overflow: hidden; margin-bottom: 2px; height: 32px; }
82 82
83#bottomPanelContainer { background: transparent; min-height: 80px; max-height: 50%; overflow: auto; } 83#bottomPanelContainer { background: transparent; height: 150px; min-height: 80px; max-height: 50%; overflow: auto; }
84 84
85.panelContainer { display: block; -webkit-box-orient: vertical; position: relative; } 85.panelContainer { display: block; -webkit-box-orient: vertical; position: relative; }
86 86