diff options
author | Ananya Sen | 2012-02-13 16:19:21 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-13 16:19:21 -0800 |
commit | b58dafe332fb57210f3d059a518a3d183c222631 (patch) | |
tree | 09fd958b0f7f3f51dc88e613e7764bdfc642b742 /scss | |
parent | f3dc624fa464a79fd8e8cec1ddd16ed2109bda23 (diff) | |
parent | f70701db069a10dc5195605fc378a022125b434f (diff) | |
download | ninja-b58dafe332fb57210f3d059a518a3d183c222631.tar.gz |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Diffstat (limited to 'scss')
-rwxr-xr-x | scss/imports/scss/_Base.scss | 2 | ||||
-rwxr-xr-x | scss/imports/scss/_MainWindow.scss | 7 | ||||
-rwxr-xr-x | scss/imports/scss/_PanelUI.scss | 2 | ||||
-rw-r--r-- | scss/imports/scss/_Stage.scss | 14 | ||||
-rwxr-xr-x | scss/ninja.scss | 1 |
5 files changed, 18 insertions, 8 deletions
diff --git a/scss/imports/scss/_Base.scss b/scss/imports/scss/_Base.scss index 8a743174..a800610d 100755 --- a/scss/imports/scss/_Base.scss +++ b/scss/imports/scss/_Base.scss | |||
@@ -134,7 +134,7 @@ button.nj-skinned { | |||
134 | cursor: pointer; | 134 | cursor: pointer; |
135 | text-shadow: 1px 1px 1px $color-app-shadow | 135 | text-shadow: 1px 1px 1px $color-app-shadow |
136 | } | 136 | } |
137 | button.nj-skinned:active { | 137 | button.nj-skinned:active, button.nj-skinned.active { |
138 | background-image: -webkit-linear-gradient(top, $color-formgrad-bottom 0%, $color-formgrad-top 100%); | 138 | background-image: -webkit-linear-gradient(top, $color-formgrad-bottom 0%, $color-formgrad-top 100%); |
139 | } | 139 | } |
140 | button.nj-skinned:hover { | 140 | button.nj-skinned:hover { |
diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss index b33426ba..b7c7f4b7 100755 --- 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; |
@@ -291,11 +291,6 @@ | |||
291 | overflow-y:hidden; | 291 | overflow-y:hidden; |
292 | } | 292 | } |
293 | 293 | ||
294 | .contextMenu { | ||
295 | position:absolute; | ||
296 | z-index:999; | ||
297 | } | ||
298 | |||
299 | #openDocumentsTabComponent { | 294 | #openDocumentsTabComponent { |
300 | height: 25px; | 295 | height: 25px; |
301 | position: relative; | 296 | position: relative; |
diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss index ccac99ca..bccea6fc 100755 --- 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 |
diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss index 7b7db576..e77be724 100644 --- a/scss/imports/scss/_Stage.scss +++ b/scss/imports/scss/_Stage.scss | |||
@@ -192,3 +192,17 @@ | |||
192 | overflow-x: auto; | 192 | overflow-x: auto; |
193 | overflow-y: auto; | 193 | overflow-y: auto; |
194 | } | 194 | } |
195 | .montage-editor-frame { | ||
196 | position:absolute; | ||
197 | z-index:7; | ||
198 | top: 0; | ||
199 | left:0; | ||
200 | display:none; | ||
201 | -webkit-user-select: initial; | ||
202 | } | ||
203 | .montage-editor { | ||
204 | padding:0px; | ||
205 | word-wrap: normal; | ||
206 | |||
207 | |||
208 | } | ||
diff --git a/scss/ninja.scss b/scss/ninja.scss index 1061780a..002ab8e8 100755 --- a/scss/ninja.scss +++ b/scss/ninja.scss | |||
@@ -35,6 +35,7 @@ | |||
35 | body { | 35 | body { |
36 | } | 36 | } |
37 | 37 | ||
38 | |||
38 | // Codemirror | 39 | // Codemirror |
39 | //@import "imports/codemirror/_codemirror"; | 40 | //@import "imports/codemirror/_codemirror"; |
40 | //@import "imports/codemirror/_javascript"; | 41 | //@import "imports/codemirror/_javascript"; |