diff options
author | Pushkar Joshi | 2012-06-11 14:07:13 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-11 14:07:13 -0700 |
commit | 71bc93ad0d53a77d70c688b2b3aacf694dd1de91 (patch) | |
tree | a432a4652bf7c96aea72a22bf27946eeee8fc4a5 /scss | |
parent | 76db3eb0aa4ffe9e75812db570c793e9f852f853 (diff) | |
parent | 756cbfad2b98b300af8db3793aa21718b88dd950 (diff) | |
download | ninja-71bc93ad0d53a77d70c688b2b3aacf694dd1de91.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'scss')
-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 | ||