diff --git a/scss/_scaffolding.scss b/scss/_scaffolding.scss index c7c5b95235..2f97e1e9d6 100644 --- a/scss/_scaffolding.scss +++ b/scss/_scaffolding.scss @@ -73,6 +73,33 @@ body, .ionic-body { bottom: 0; overflow: hidden; } + +/** + * Scroll is the scroll view component available for complex and custom + * scroll view functionality. + */ +.scroll { + position: absolute; + z-index: 1; + -webkit-tap-highlight-color: rgba(0,0,0,0); + width: 100%; + height: 100%; + -webkit-transform: translateZ(0); + -moz-transform: translateZ(0); + -ms-transform: translateZ(0); + -o-transform: translateZ(0); + transform: translateZ(0); + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + -webkit-text-size-adjust: none; + -moz-text-size-adjust: none; + -ms-text-size-adjust: none; + -o-text-size-adjust: none; + text-size-adjust: none; +} // Pad top/bottom of content so it doesn't hide behind .bar-title and .bar-tab. // Note: For these to work, content must come after both bars in the markup diff --git a/scss/_scroll.scss b/scss/_scroll.scss deleted file mode 100644 index 416a16504d..0000000000 --- a/scss/_scroll.scss +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Scroll is the scroll view component available for complex and custom - * scroll view functionality. - */ -.scroll { - position: absolute; - z-index: 1; - -webkit-tap-highlight-color: rgba(0,0,0,0); - width: 100%; - -webkit-transform: translateZ(0); - -moz-transform: translateZ(0); - -ms-transform: translateZ(0); - -o-transform: translateZ(0); - transform: translateZ(0); - -webkit-touch-callout: none; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - -webkit-text-size-adjust: none; - -moz-text-size-adjust: none; - -ms-text-size-adjust: none; - -o-text-size-adjust: none; - text-size-adjust: none; -}