aboutsummaryrefslogtreecommitdiff
path: root/scss/imports
diff options
context:
space:
mode:
authorEric Guzman2012-02-13 15:48:37 -0800
committerEric Guzman2012-02-13 15:48:37 -0800
commitb2672478decd3ee3bfacf86b525551c997f9604d (patch)
tree79a88684406d3adf00350246a4da884b97fb0eac /scss/imports
parenta738121a921e4c721b280434952b415b9ab3b1a8 (diff)
parent0620e2f788861e824d6e49fa319da4d20b18a556 (diff)
downloadninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts: js/controllers/styles-controller.js
Diffstat (limited to 'scss/imports')
-rw-r--r--scss/imports/scss/_Base.scss2
-rw-r--r--scss/imports/scss/_MainWindow.scss7
-rw-r--r--scss/imports/scss/_PanelUI.scss4
-rw-r--r--scss/imports/scss/_Stage.scss14
4 files changed, 18 insertions, 9 deletions
diff --git a/scss/imports/scss/_Base.scss b/scss/imports/scss/_Base.scss
index 8a743174..a800610d 100644
--- 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 { 137button.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}
140button.nj-skinned:hover { 140button.nj-skinned:hover {
diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index 23ace69b..a2d5eef4 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;
@@ -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 21ada556..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
@@ -563,7 +563,7 @@ span.pp-span-all:focus {
563#pp-container-list span.span-space { 563#pp-container-list span.span-space {
564 background-repeat: no-repeat; 564 background-repeat: no-repeat;
565} 565}
566#pp-container-list li.directory.open > span.pp-span-all > span.pp-col-files > span.span-space { 566#pp-container-list li.directory.open > span.pp-span-all > span.pp-col-files > span.span-space, .branch-label {
567 background-image:url("../images/panels/project-panel/icon-file-folderopen.png"); 567 background-image:url("../images/panels/project-panel/icon-file-folderopen.png");
568 background-position: 100% 0px; 568 background-position: 100% 0px;
569} 569}
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 }