diff options
| author | Valerio Virgillito | 2012-02-09 13:35:15 -0800 |
|---|---|---|
| committer | Valerio Virgillito | 2012-02-09 13:35:15 -0800 |
| commit | cebd27bd649d01c8b8713651df3878da14b5e9a8 (patch) | |
| tree | 3d20d838f2f6892a07cf16c4c959e234f96ee60b /scss/imports | |
| parent | 666ae3e9119410cbf7fa974274d95336aaff091c (diff) | |
| parent | 2092acf520e3f346f15e42c76c2f616e7d094c97 (diff) | |
| download | ninja-cebd27bd649d01c8b8713651df3878da14b5e9a8.tar.gz | |
Merge branch 'Timeline' of https://github.com/imix23ways/ninja-internal into feature-branch
Conflicts:
js/helper-classes/RDGE/Materials/FlatMaterial.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'scss/imports')
| -rw-r--r-- | scss/imports/scss/_MainWindow.scss | 2 | ||||
| -rw-r--r-- | scss/imports/scss/_PanelUI.scss | 2 |
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/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss index ccac99ca..bccea6fc 100644 --- a/scss/imports/scss/_PanelUI.scss +++ b/scss/imports/scss/_PanelUI.scss | |||
| @@ -98,7 +98,7 @@ | |||
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | #timelinePanel { | 100 | #timelinePanel { |
| 101 | height: 116px; | 101 | height: 100%; |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | // Only used by Animation Presets Panel currently | 104 | // Only used by Animation Presets Panel currently |