diff options
| author | Jose Antonio Marquez | 2012-02-15 19:07:31 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-15 19:07:31 -0800 |
| commit | cdd36ed6c789886657c967e72ec2dcd49c6c5a76 (patch) | |
| tree | b044208c38770c0c4edce03379071dbf2eb29b83 /scss | |
| parent | c7ef6951baff283266df7567e30c8074dda4ad01 (diff) | |
| parent | d366c0bd1af6471511217ed574083e15059519b5 (diff) | |
| download | ninja-cdd36ed6c789886657c967e72ec2dcd49c6c5a76.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
js/document/html-document.js
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/imports/scss/_Stage.scss | 14 |
1 files changed, 0 insertions, 14 deletions
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 | } | ||