diff options
| author | Kruti Shah | 2012-02-08 09:45:29 -0800 |
|---|---|---|
| committer | Kruti Shah | 2012-02-08 09:45:29 -0800 |
| commit | 6787bda807ad3974b29cab77628cc5c3c1b06a9d (patch) | |
| tree | 61d2439e2edb0dd9c84b5f32fe35e57707b87637 /_scss/imports/scss | |
| parent | 2cfa420f48735e2718cd0824d4e945c72158d0fa (diff) | |
| parent | 91df2e8030db394060667202a97138db3f871fa5 (diff) | |
| download | ninja-6787bda807ad3974b29cab77628cc5c3c1b06a9d.tar.gz | |
Merge branch 'refs/heads/Timeline' into Timeline_updated
Diffstat (limited to '_scss/imports/scss')
| -rw-r--r-- | _scss/imports/scss/_MainWindow.scss | 2 |
1 files changed, 1 insertions, 1 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; |