aboutsummaryrefslogtreecommitdiff
path: root/css
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-11 11:17:41 -0700
committerArmen Kesablyan2012-06-11 11:17:41 -0700
commit278769df00ced8620fd73371e38fe2e43f07ca3b (patch)
treedeb505c8a66b660eee1f17a2c6c4c575c7939f6f /css
parent555fd6efa605b937800b3979a4c68fa7eb8666ae (diff)
parent0f040acabfb7a4bf3138debec5aff869487ceb11 (diff)
downloadninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz
Merge branch 'refs/heads/master' into binding
Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'css')
-rwxr-xr-xcss/ninja.css20
1 files changed, 5 insertions, 15 deletions
diff --git a/css/ninja.css b/css/ninja.css
index 8139375d..d1cf44c6 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -200,9 +200,11 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
200 200
201.drawingCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 7; } 201.drawingCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 7; }
202 202
203.stageCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 5; } 203.stageCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 6; }
204 204
205.layoutCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 4; } 205.layoutCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 5; }
206
207.gridCanvas { position: absolute; margin: 0px; border: none; padding: 0px; top: 0px; left: 0px; z-index: 4; }
206 208
207.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; } 209.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; }
208 210
@@ -909,7 +911,7 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
909 911
910::-webkit-scrollbar-track:disabled { display: none; } 912::-webkit-scrollbar-track:disabled { display: none; }
911 913
912:-webkit-scrollbar-track:vertical:disabled { display: none; } 914::-webkit-scrollbar-track:vertical:disabled { display: none; }
913 915
914::-webkit-scrollbar-track:horizontal:disabled { display: none; } 916::-webkit-scrollbar-track:horizontal:disabled { display: none; }
915 917
@@ -919,18 +921,6 @@ input[type="radio"]:disabled { opacity: .3; background: #282828; border-width: 1
919 921
920::-webkit-scrollbar-corner:disabled { display: none; } 922::-webkit-scrollbar-corner:disabled { display: none; }
921 923
922#iframeContainer::-webkit-resizer:disabled { display: block; }
923
924#iframeContainer::-webkit-scrollbar-track:vertical:disabled { display: block; }
925
926#iframeContainer::-webkit-scrollbar-track:horizontal:disabled { display: block; }
927
928#iframeContainer::-webkit-scrollbar-track-piece:disabled { display: block; }
929
930#iframeContainer::-webkit-scrollbar-corner:disabled { display: block; }
931
932#iframeContainer::-webkit-resizer:disabled { display: block; }
933
934.tree { -webkit-user-select: none; cursor: default; float: left; padding-left: 0; color: white; } 924.tree { -webkit-user-select: none; cursor: default; float: left; padding-left: 0; color: white; }
935 925
936.tree li { -webkit-margin-before: 0px; -webkit-margin-after: 0px; list-style-type: none; } 926.tree li { -webkit-margin-before: 0px; -webkit-margin-after: 0px; list-style-type: none; }