From ffdaff4bce4b76cb80e22e83212cabf57d555eb3 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adamdbradley@gmail.com>
Date: Wed, 18 Sep 2013 14:03:02 -0500
Subject: [PATCH] move reset stuff into reset

---
 scss/ionic/_reset.scss       | 62 +++++++++++++++++++-----------------
 scss/ionic/_scaffolding.scss | 11 ++-----
 scss/ionic/_type.scss        |  5 ---
 3 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/scss/ionic/_reset.scss b/scss/ionic/_reset.scss
index 521ae1c48c..b22a2cffd8 100755
--- a/scss/ionic/_reset.scss
+++ b/scss/ionic/_reset.scss
@@ -24,31 +24,24 @@ article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup, 
 menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	font-size: 100%;
-	font: inherit;
-	vertical-align: baseline;
+    margin: 0;
+    padding: 0;
+    border: 0;
+    vertical-align: baseline;
+    font: inherit;
+    font-size: 100%;
 }
 
-body {
-	line-height: 1;
-}
 ol, ul {
-	list-style: none;
+    list-style: none;
 }
 blockquote, q {
-	quotes: none;
+    quotes: none;
 }
 blockquote:before, blockquote:after,
 q:before, q:after {
-	content: '';
-	content: none;
-}
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
+    content: '';
+    content: none;
 }
 
 /**
@@ -85,7 +78,9 @@ script {
  */
 
 html {
+    @include user-select(none);
     font-family: sans-serif; /* 1 */
+    -webkit-text-size-adjust: 100%;
     -ms-text-size-adjust: 100%; /* 2 */
     -webkit-text-size-adjust: 100%; /* 2 */
 }
@@ -96,9 +91,18 @@ html {
 
 body {
     margin: 0;
+    line-height: 1;
 }
 
 
+/* *
+ * Remove tap highlight color on Safari
+ */
+
+a {
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
 /**
  * Address `outline` inconsistency between Chrome and other browsers.
  */
@@ -157,8 +161,8 @@ code,
 kbd,
 pre,
 samp {
-    font-family: monospace, serif;
     font-size: 1em;
+    font-family: monospace, serif;
 }
 
 /**
@@ -191,10 +195,10 @@ small {
 
 sub,
 sup {
-    font-size: 75%;
-    line-height: 0;
     position: relative;
     vertical-align: baseline;
+    font-size: 75%;
+    line-height: 0;
 }
 
 sup {
@@ -210,9 +214,9 @@ sub {
  */
 
 fieldset {
-    border: 1px solid #c0c0c0;
     margin: 0 2px;
     padding: 0.35em 0.625em 0.75em;
+    border: 1px solid #c0c0c0;
 }
 
 /**
@@ -221,8 +225,8 @@ fieldset {
  */
 
 legend {
-    border: 0; /* 1 */
     padding: 0; /* 2 */
+    border: 0; /* 1 */
 }
 
 /**
@@ -235,9 +239,9 @@ button,
 input,
 select,
 textarea {
-    font-family: inherit; /* 1 */
-    font-size: 100%; /* 2 */
     margin: 0; /* 3 */
+    font-size: 100%; /* 2 */
+    font-family: inherit; /* 1 */
 }
 
 /**
@@ -274,8 +278,8 @@ button,
 html input[type="button"], /* 1 */
 input[type="reset"],
 input[type="submit"] {
-    -webkit-appearance: button; /* 2 */
     cursor: pointer; /* 3 */
+    -webkit-appearance: button; /* 2 */
 }
 
 /**
@@ -294,10 +298,10 @@ html input[disabled] {
  */
 
 input[type="search"] {
-    -webkit-appearance: textfield; /* 1 */
-    -moz-box-sizing: content-box;
     -webkit-box-sizing: content-box; /* 2 */
+    -moz-box-sizing: content-box;
     box-sizing: content-box;
+    -webkit-appearance: textfield; /* 1 */
 }
 
 /**
@@ -316,8 +320,8 @@ input[type="search"]::-webkit-search-decoration {
 
 button::-moz-focus-inner,
 input::-moz-focus-inner {
-    border: 0;
     padding: 0;
+    border: 0;
 }
 
 /**
@@ -339,6 +343,6 @@ textarea {
  */
 
 table {
-    border-collapse: collapse;
     border-spacing: 0;
+    border-collapse: collapse;
 }
diff --git a/scss/ionic/_scaffolding.scss b/scss/ionic/_scaffolding.scss
index 5f93717915..6d0b640849 100644
--- a/scss/ionic/_scaffolding.scss
+++ b/scss/ionic/_scaffolding.scss
@@ -1,10 +1,3 @@
-// TODO: This might be inefficient?
-
-// Make sure iOS Safari doesn't scale fonts on orientation changes
-html {
-  @include user-select(none);
-  -webkit-text-size-adjust: 100%;
-}
 
 body {
   position: fixed;
@@ -16,9 +9,9 @@ body {
   margin: 0;
   padding: 0;
   word-wrap: break-word;
-  font-size: 14px;
+  font-size: $font-size-base;
   font-family: $base-font-family;
-  line-height: 1.25;
+  line-height: $line-height-computed;
   text-rendering: optimizeLegibility;
 
   -webkit-font-smoothing: antialiased;
diff --git a/scss/ionic/_type.scss b/scss/ionic/_type.scss
index 5020916806..2345826633 100644
--- a/scss/ionic/_type.scss
+++ b/scss/ionic/_type.scss
@@ -16,11 +16,6 @@ p {
   line-height: 1.4;
 }
 
-// Remove tap highlight color on Safari
-a {
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-
 
 // Emphasis & misc
 // -------------------------