aboutsummaryrefslogtreecommitdiff
path: root/scss/imports
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-16 16:03:55 -0800
committerJose Antonio Marquez2012-02-16 16:03:55 -0800
commitb1d169d2dc941c7d2f51f0c557b7bf6488457742 (patch)
treebad9b38e54ffe10de514d26539fafd7ce005d1fb /scss/imports
parent6bc07657c8ef58e6efddd383748ecf84d1c789ad (diff)
parentbe0318ed92d1fbc853568648f773322401d9c029 (diff)
downloadninja-b1d169d2dc941c7d2f51f0c557b7bf6488457742.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Diffstat (limited to 'scss/imports')
-rwxr-xr-xscss/imports/scss/_MainWindow.scss10
-rw-r--r--scss/imports/scss/_Stage.scss13
2 files changed, 17 insertions, 6 deletions
diff --git a/scss/imports/scss/_MainWindow.scss b/scss/imports/scss/_MainWindow.scss
index 0b0649dc..97344b1e 100755
--- a/scss/imports/scss/_MainWindow.scss
+++ b/scss/imports/scss/_MainWindow.scss
@@ -200,18 +200,16 @@
200} 200}
201 201
202#mainContainer #rulerTop { 202#mainContainer #rulerTop {
203 // TODO: temporary background please replace when component is implemented 203 // TODO: temporary background please replace when component is implemented
204 background: url("../images/temp/ruler-top.png"); 204 background:$color-stage;
205 height:15px; 205 height:15px;
206 margin-bottom: 0px; 206 margin-bottom: 0px;
207 display:none;
208} 207}
209 208
210#rulerLeft { 209#rulerLeft {
211 // TODO: temporary background please replace when component is implemented 210 // TODO: temporary background please replace when component is implemented
212 background: url("../images/temp/ruler-left.png"); 211 background:$color-stage;
213 width:16px; 212 width:16px;
214 display:none;
215} 213}
216 214
217#stateBar { 215#stateBar {
diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss
index 7b7db576..587903d2 100644
--- a/scss/imports/scss/_Stage.scss
+++ b/scss/imports/scss/_Stage.scss
@@ -192,3 +192,16 @@
192 overflow-x: auto; 192 overflow-x: auto;
193 overflow-y: auto; 193 overflow-y: auto;
194} 194}
195
196.montage-editor-frame {
197 position:absolute;
198 z-index:7;
199 top: 0;
200 left:0;
201 display:none;
202 -webkit-user-select: initial;
203}
204.montage-editor {
205 padding:0px;
206 word-wrap: normal;
207} \ No newline at end of file