diff --git a/dist/css/ionic.css b/dist/css/ionic.css index 1e96e1973f..910ce44aef 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -2217,6 +2217,32 @@ body, .ionic-body { left: 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; } + .overflow-scroll { overflow: auto; -webkit-overflow-scrolling: touch; } @@ -4434,31 +4460,6 @@ a.button { border-right-width: 1px; border-radius: 0px 2px 2px 0px; } -/** - * 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; } - /** * Animations * -------------------------------------------------- diff --git a/examples/starters/map/index.html b/examples/starters/map/index.html index 8261146da0..e02eb2842a 100644 --- a/examples/starters/map/index.html +++ b/examples/starters/map/index.html @@ -13,11 +13,13 @@ } - - - + + + + + diff --git a/scss/_scaffolding.scss b/scss/_scaffolding.scss index 6408a697f5..ef932439ed 100644 --- a/scss/_scaffolding.scss +++ b/scss/_scaffolding.scss @@ -79,6 +79,33 @@ body, .ionic-body { left: 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; -} diff --git a/scss/ionic.scss b/scss/ionic.scss index 3ba513078a..9ccb7aeecb 100644 --- a/scss/ionic.scss +++ b/scss/ionic.scss @@ -42,7 +42,6 @@ "button-bar", // Util - "scroll", "animations", "icons", "util",