diff options
author | hwc487 | 2012-06-12 15:52:35 -0700 |
---|---|---|
committer | hwc487 | 2012-06-12 15:52:35 -0700 |
commit | 9490f816924e9e9c9970ef9384241c07ec0a6e9f (patch) | |
tree | f44449a2e0055e21960a5513fb3a0738a91db528 /scss/imports | |
parent | b7a41cbd5a30d32f524ee60e2dfdf9c65c7ec55b (diff) | |
parent | 6854a72504f57903bd5de003e377f2aefb02d0da (diff) | |
download | ninja-9490f816924e9e9c9970ef9384241c07ec0a6e9f.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
assets/canvas-runtime.js
js/io/system/ninjalibrary.json
js/mediators/element-mediator.js
Diffstat (limited to 'scss/imports')
-rwxr-xr-x | scss/imports/scss/_ScrollBars.scss | 26 |
1 files changed, 1 insertions, 25 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 | ||