mega changes, including updates and X

11 files changed, 37 insertions, 85 deletions

diff --git a/www/lib/ionic/scss/_bar.scss b/www/lib/ionic/scss/_bar.scss
index c8d11a95..a6147d89 100644
--- a/www/lib/ionic/scss/_bar.scss
+++ b/www/lib/ionic/scss/_bar.scss
@@ -99,7 +99,7 @@
   &.bar-balanced {
     @include bar-style($bar-balanced-bg, $bar-balanced-border, $bar-balanced-text);
     &.bar-footer{
-      background-image: linear-gradient(180deg, $bar-balanced-border, $bar-balanced-border 50%, transparent 50%);
+      background-image: linear-gradient(180deg, $bar-balanced-border, $bar-positive-border 50%, transparent 50%);
     }
   }
   &.bar-energized {
@@ -366,11 +366,6 @@
   &.item-input-inset {
     position: absolute;
   }
-
-  .title {
-    height: $bar-footer-height - 1;
-    line-height: $bar-footer-height;
-  }
 }
 
 // Don't render padding if the bar is just for tabs
@@ -380,23 +375,15 @@
 
 .bar-subheader {
   top: $bar-height;
+  display: block;
 
   height: $bar-subheader-height;
-
-  .title {
-    height: $bar-subheader-height - 1;
-    line-height: $bar-subheader-height;
-  }
 }
 .bar-subfooter {
   bottom: $bar-footer-height;
+  display: block;
 
   height: $bar-subfooter-height;
-
-  .title {
-    height: $bar-subfooter-height - 1;
-    line-height: $bar-subfooter-height;
-  }
 }
 
 .nav-bar-block {
diff --git a/www/lib/ionic/scss/_button-bar.scss b/www/lib/ionic/scss/_button-bar.scss
index da809d15..57bb9c41 100644
--- a/www/lib/ionic/scss/_button-bar.scss
+++ b/www/lib/ionic/scss/_button-bar.scss
@@ -21,34 +21,6 @@
       float: left;
     }
   }
-
-  &.bar-light > .button {
-    border-color: $button-light-border;
-  }
-  &.bar-stable > .button {
-    border-color: $button-stable-border;
-  }
-  &.bar-positive > .button {
-    border-color: $button-positive-border;
-  }
-  &.bar-calm > .button {
-    border-color: $button-calm-border;
-  }
-  &.bar-assertive > .button {
-    border-color: $button-assertive-border;
-  }
-  &.bar-balanced > .button {
-    border-color: $button-balanced-border;
-  }
-  &.bar-energized > .button {
-    border-color: $button-energized-border;
-  }
-  &.bar-royal > .button {
-    border-color: $button-royal-border;
-  }
-  &.bar-dark > .button {
-    border-color: $button-dark-border;
-  }
 }
 
 .button-bar > .button {
diff --git a/www/lib/ionic/scss/_button.scss b/www/lib/ionic/scss/_button.scss
index 93a47c6a..5ec5ffec 100644
--- a/www/lib/ionic/scss/_button.scss
+++ b/www/lib/ionic/scss/_button.scss
@@ -72,55 +72,55 @@
   }
 
   &.button-light {
-    @include button-style($button-light-bg, $button-default-border, $button-light-active-bg, $button-default-active-border, $button-light-text);
+    @include button-style($button-light-bg, $button-light-border, $button-light-active-bg, $button-light-active-border, $button-light-text);
     @include button-clear($button-light-border);
     @include button-outline($button-light-border);
   }
 
   &.button-stable {
-    @include button-style($button-stable-bg, $button-default-border, $button-stable-active-bg, $button-default-active-border, $button-stable-text);
+    @include button-style($button-stable-bg, $button-stable-border, $button-stable-active-bg, $button-stable-active-border, $button-stable-text);
     @include button-clear($button-stable-border);
     @include button-outline($button-stable-border);
   }
 
   &.button-positive {
-    @include button-style($button-positive-bg, $button-default-border, $button-positive-active-bg, $button-default-active-border, $button-positive-text);
+    @include button-style($button-positive-bg, $button-positive-border, $button-positive-active-bg, $button-positive-active-border, $button-positive-text);
     @include button-clear($button-positive-bg);
     @include button-outline($button-positive-bg);
   }
 
   &.button-calm {
-    @include button-style($button-calm-bg, $button-default-border, $button-calm-active-bg, $button-default-active-border, $button-calm-text);
+    @include button-style($button-calm-bg, $button-calm-border, $button-calm-active-bg, $button-calm-active-border, $button-calm-text);
     @include button-clear($button-calm-bg);
     @include button-outline($button-calm-bg);
   }
 
   &.button-assertive {
-    @include button-style($button-assertive-bg, $button-default-border, $button-assertive-active-bg, $button-default-active-border, $button-assertive-text);
+    @include button-style($button-assertive-bg, $button-assertive-border, $button-assertive-active-bg, $button-assertive-active-border, $button-assertive-text);
     @include button-clear($button-assertive-bg);
     @include button-outline($button-assertive-bg);
   }
 
   &.button-balanced {
-    @include button-style($button-balanced-bg, $button-default-border, $button-balanced-active-bg, $button-default-active-border, $button-balanced-text);
+    @include button-style($button-balanced-bg, $button-balanced-border, $button-balanced-active-bg, $button-balanced-active-border, $button-balanced-text);
     @include button-clear($button-balanced-bg);
     @include button-outline($button-balanced-bg);
   }
 
   &.button-energized {
-    @include button-style($button-energized-bg, $button-default-border, $button-energized-active-bg, $button-default-active-border, $button-energized-text);
+    @include button-style($button-energized-bg, $button-energized-border, $button-energized-active-bg, $button-energized-active-border, $button-energized-text);
     @include button-clear($button-energized-bg);
     @include button-outline($button-energized-bg);
   }
 
   &.button-royal {
-    @include button-style($button-royal-bg, $button-default-border, $button-royal-active-bg, $button-default-active-border, $button-royal-text);
+    @include button-style($button-royal-bg, $button-royal-border, $button-royal-active-bg, $button-royal-active-border, $button-royal-text);
     @include button-clear($button-royal-bg);
     @include button-outline($button-royal-bg);
   }
 
   &.button-dark {
-    @include button-style($button-dark-bg, $button-default-border, $button-dark-active-bg, $button-default-active-border, $button-dark-text);
+    @include button-style($button-dark-bg, $button-dark-border, $button-dark-active-bg, $button-dark-active-border, $button-dark-text);
     @include button-clear($button-dark-bg);
     @include button-outline($button-dark-bg);
   }
diff --git a/www/lib/ionic/scss/_items.scss b/www/lib/ionic/scss/_items.scss
index d545e644..6afb061f 100644
--- a/www/lib/ionic/scss/_items.scss
+++ b/www/lib/ionic/scss/_items.scss
@@ -455,16 +455,6 @@ button.item.item-button-right {
   }
 }
 
-.item-button-left.item-button-right{
-   .button{
-     &:first-child {
-      right: auto;
-    }
-     &:last-child {
-      left: auto;
-    }
-   }
-}
 
 // Item Avatar
 // -------------------------------
diff --git a/www/lib/ionic/scss/_mixins.scss b/www/lib/ionic/scss/_mixins.scss
index ac5df7f4..c584a98a 100644
--- a/www/lib/ionic/scss/_mixins.scss
+++ b/www/lib/ionic/scss/_mixins.scss
@@ -3,7 +3,7 @@
 // --------------------------------------------------
 
 @mixin button-style($bg-color, $border-color, $active-bg-color, $active-border-color, $color) {
-  border-color: $border-color;
+  border-color: transparent;//$border-color;
   background-color: $bg-color;
   color: $color;
 
@@ -14,9 +14,7 @@
   }
   &.active,
   &.activated {
-    @if $active-border-color != ""{
-      border-color: $active-border-color;
-    }
+    //border-color: transparent;//$active-border-color;
     background-color: $active-bg-color;
     //box-shadow: inset 0 1px 4px rgba(0,0,0,0.1);
   }
diff --git a/www/lib/ionic/scss/_reset.scss b/www/lib/ionic/scss/_reset.scss
index 49e706aa..49e706aa 100755..100644
--- a/www/lib/ionic/scss/_reset.scss
+++ b/www/lib/ionic/scss/_reset.scss
diff --git a/www/lib/ionic/scss/_scaffolding.scss b/www/lib/ionic/scss/_scaffolding.scss
index 2dbff54f..d1caf7ab 100644
--- a/www/lib/ionic/scss/_scaffolding.scss
+++ b/www/lib/ionic/scss/_scaffolding.scss
@@ -214,6 +214,10 @@ ion-infinite-scroll {
     height: 100%;
     -webkit-transform: translate3d(0, 0, 0);   // fix iOS bug where relative children of scroller disapear while scrolling.  see: http://stackoverflow.com/questions/9807620/ipad-safari-scrolling-causes-html-elements-to-disappear-and-reappear-with-a-dela
   }
+
+  &.keyboard-up:not(.keyboard-up-confirm) {
+    overflow: hidden;
+  }
 }
 
 
diff --git a/www/lib/ionic/scss/_tabs.scss b/www/lib/ionic/scss/_tabs.scss
index aa7ed847..47454105 100644
--- a/www/lib/ionic/scss/_tabs.scss
+++ b/www/lib/ionic/scss/_tabs.scss
@@ -274,21 +274,7 @@
         color: $color;
       }
     }
-
   }
-
-  &.tabs-striped.#{$style} {
-    .tab-item {
-      &.tab-item-active,
-      &.active,
-      &.activated {
-        border-color: $color;
-        color: $color;
-      }
-    }
-
-  }
-
 }
 
 ion-tabs {
diff --git a/www/lib/ionic/scss/_toggle.scss b/www/lib/ionic/scss/_toggle.scss
index 94bcabb4..907cab45 100644
--- a/www/lib/ionic/scss/_toggle.scss
+++ b/www/lib/ionic/scss/_toggle.scss
@@ -80,7 +80,7 @@
 }
 
 /* Fix to avoid background color bleeding */
-/* (occurred on (at least) Android 4.2, Asus MeMO Pad HD7 ME173X) */
+/* (occured on (at least) Android 4.2, Asus MeMO Pad HD7 ME173X) */
 .platform-android4_2 .toggle .track {
   -webkit-background-clip: padding-box;
 }
diff --git a/www/lib/ionic/scss/_variables.scss b/www/lib/ionic/scss/_variables.scss
index f8c678b0..52674293 100644
--- a/www/lib/ionic/scss/_variables.scss
+++ b/www/lib/ionic/scss/_variables.scss
@@ -93,9 +93,6 @@ $button-bar-button-height:        32px !default;
 $button-bar-button-padding:       8px !default;
 $button-bar-button-icon-size:     20px !default;
 
-$button-default-border:           transparent !default;
-$button-default-active-border:    null !default;
-
 $button-light-bg:                 $light !default;
 $button-light-text:               #444 !default;
 $button-light-border:             #ddd !default;
diff --git a/www/lib/ionic/scss/tsconfig.json b/www/lib/ionic/scss/tsconfig.json
new file mode 100644
index 00000000..6b58d2e6
--- /dev/null
+++ b/www/lib/ionic/scss/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "version": "1.5.0-alpha",
+    "compilerOptions": {
+        "target": "es5",
+        "module": "commonjs",
+        "declaration": false,
+        "noImplicitAny": false,
+        "removeComments": true,
+        "noLib": false,
+        "preserveConstEnums": true,
+        "suppressImplicitAnyIndexErrors": true
+    },
+    "filesGlob": [
+        "./**/*.ts",
+        "!./node_modules/**/*.ts"
+    ],
+    "files": []
+}