aboutsummaryrefslogtreecommitdiff
path: root/scss
diff options
context:
space:
mode:
authorEric Guzman2012-06-11 13:28:42 -0700
committerEric Guzman2012-06-11 13:28:42 -0700
commit3a4727ffc350216a434a7c6977b6a23653b77780 (patch)
treec5dff306f8803c36a16163ba5df1e7f492e762b5 /scss
parentd6b46ba496c9c8974ae39bb476aea35bcd1ddaf1 (diff)
parent337efc667372326ae2f9984d89a47bb151016774 (diff)
downloadninja-3a4727ffc350216a434a7c6977b6a23653b77780.tar.gz
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'scss')
-rwxr-xr-xscss/imports/scss/_ScrollBars.scss26
-rw-r--r--scss/imports/scss/_Stage.scss12
2 files changed, 12 insertions, 26 deletions
diff --git a/scss/imports/scss/_ScrollBars.scss b/scss/imports/scss/_ScrollBars.scss
index 2e79d9c8..9fa2fcb8 100755
--- a/scss/imports/scss/_ScrollBars.scss
+++ b/scss/imports/scss/_ScrollBars.scss
@@ -131,7 +131,7 @@
131} 131}
132 132
133// These don't seem to be necessary or in some cases, they just seem to be ignored 133// These don't seem to be necessary or in some cases, they just seem to be ignored
134:-webkit-scrollbar-track:vertical:disabled { 134::-webkit-scrollbar-track:vertical:disabled {
135 display: none; 135 display: none;
136} 136}
137 137
@@ -151,29 +151,5 @@
151 display: none; 151 display: none;
152} 152}
153 153
154#iframeContainer::-webkit-resizer:disabled {
155 display: block;
156}
157
158#iframeContainer::-webkit-scrollbar-track:vertical:disabled {
159 display: block;
160}
161
162#iframeContainer::-webkit-scrollbar-track:horizontal:disabled {
163 display: block;
164}
165
166#iframeContainer::-webkit-scrollbar-track-piece:disabled {
167 display: block;
168}
169
170#iframeContainer::-webkit-scrollbar-corner:disabled {
171 display: block;
172}
173
174#iframeContainer::-webkit-resizer:disabled {
175 display: block;
176}
177
178// End: Scroll Bar Skinning 154// End: Scroll Bar Skinning
179 155
diff --git a/scss/imports/scss/_Stage.scss b/scss/imports/scss/_Stage.scss
index d6da708b..39a98d82 100644
--- a/scss/imports/scss/_Stage.scss
+++ b/scss/imports/scss/_Stage.scss
@@ -151,7 +151,7 @@
151 padding: 0px; 151 padding: 0px;
152 top: 0px; 152 top: 0px;
153 left: 0px; 153 left: 0px;
154 z-index: 5; 154 z-index: 6;
155} 155}
156 156
157.layoutCanvas { 157.layoutCanvas {
@@ -161,6 +161,16 @@
161 padding: 0px; 161 padding: 0px;
162 top: 0px; 162 top: 0px;
163 left: 0px; 163 left: 0px;
164 z-index: 5;
165}
166
167.gridCanvas {
168 position: absolute;
169 margin: 0px;
170 border: none;
171 padding: 0px;
172 top: 0px;
173 left: 0px;
164 z-index: 4; 174 z-index: 4;
165} 175}
166 176