aboutsummaryrefslogtreecommitdiff
path: root/scss/imports
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-09 17:22:01 -0800
committerValerio Virgillito2012-02-09 17:22:01 -0800
commit48977780443d97b9e97b047066639c9056788041 (patch)
tree06b27b22e09f91b320dc63cecf7b5dbef674a2fc /scss/imports
parentb2155233351966ff579db41a7b85be554c643a97 (diff)
parentce963d45cdf2703d2d4eedfa94394b178f86e0f1 (diff)
downloadninja-48977780443d97b9e97b047066639c9056788041.tar.gz
Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into feature-branch
Diffstat (limited to 'scss/imports')
-rw-r--r--scss/imports/scss/_Base.scss2
-rw-r--r--scss/imports/scss/_Stage.scss14
2 files changed, 15 insertions, 1 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/_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 }