From 1a2b9cf59d93b3f08894abf1b8c69f39231e10d0 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Thu, 7 Nov 2013 13:14:52 -0600
Subject: [PATCH] Removed scroll SCSS, moved to scaffold

---
 scss/_scaffolding.scss | 27 +++++++++++++++++++++++++++
 scss/_scroll.scss      | 25 -------------------------
 2 files changed, 27 insertions(+), 25 deletions(-)
 delete mode 100644 scss/_scroll.scss

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;
-}