aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorAnanya Sen2012-02-10 16:05:27 -0800
committerAnanya Sen2012-02-10 16:05:27 -0800
commitf3dc624fa464a79fd8e8cec1ddd16ed2109bda23 (patch)
treef716757dab75d7626297893c7f4aca3596d606de /scss
parentc48eeb01bd726895dc577d8b843b2a75883eee07 (diff)
downloadninja-f3dc624fa464a79fd8e8cec1ddd16ed2109bda23.tar.gz
Revert "Merge from /joseeight/ninja-internal/tree/FileIO"
This reverts commit c48eeb01bd726895dc577d8b843b2a75883eee07. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'scss')
-rwxr-xr-xscss/imports/scss/_Base.scss2
-rwxr-xr-xscss/imports/scss/_MainWindow.scss7
-rwxr-xr-xscss/imports/scss/_PanelUI.scss2
-rw-r--r--scss/imports/scss/_Stage.scss14
-rwxr-xr-xscss/ninja.scss1
5 files changed, 8 insertions, 18 deletions
diff --git a/scss/imports/scss/_Base.scss b/scss/imports/scss/_Base.scss
index a800610d..8a743174 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}
137button.nj-skinned:active, button.nj-skinned.active { 137button.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}
140button.nj-skinned:hover { 140button.nj-skinned:hover {
diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index b7c7f4b7..b33426ba 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 height: 150px; 88
89 min-height:80px; 89 min-height:80px;
90 max-height:50%; 90 max-height:50%;
91 overflow:auto; 91 overflow:auto;
@@ -291,6 +291,11 @@
291 overflow-y:hidden; 291 overflow-y:hidden;
292} 292}
293 293
294.contextMenu {
295 position:absolute;
296 z-index:999;
297}
298
294#openDocumentsTabComponent { 299#openDocumentsTabComponent {
295 height: 25px; 300 height: 25px;
296 position: relative; 301 position: relative;
diff --git a/scss/imports/scss/_PanelUI.scss b/scss/imports/scss/_PanelUI.scss
index bccea6fc..ccac99ca 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: 100%; 101 height: 116px;
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 e77be724..7b7db576 100644
--- a/scss/imports/scss/_Stage.scss
+++ b/scss/imports/scss/_Stage.scss
@@ -192,17 +192,3 @@
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 002ab8e8..1061780a 100755
--- a/scss/ninja.scss
+++ b/scss/ninja.scss
@@ -35,7 +35,6 @@
35body { 35body {
36} 36}
37 37
38
39// Codemirror 38// Codemirror
40//@import "imports/codemirror/_codemirror"; 39//@import "imports/codemirror/_codemirror";
41//@import "imports/codemirror/_javascript"; 40//@import "imports/codemirror/_javascript";