12 files changed, 112 insertions, 16 deletions
diff --git a/www/lib/ionic/scss/_bar.scss b/www/lib/ionic/scss/_bar.scss
index cb6696b4..ca9fdceb 100644
--- a/www/lib/ionic/scss/_bar.scss
+++ b/www/lib/ionic/scss/_bar.scss
@@ -13,7 +13,7 @@
   left: 0;
   z-index: $z-index-bar;
 
-  box-sizing: border-box;
+  @include box-sizing(border-box);
   padding: $bar-padding-portrait;
 
   width: 100%;
diff --git a/www/lib/ionic/scss/_button-bar.scss b/www/lib/ionic/scss/_button-bar.scss
index 9858f6f5..0f0dc519 100644
--- a/www/lib/ionic/scss/_button-bar.scss
+++ b/www/lib/ionic/scss/_button-bar.scss
@@ -26,7 +26,7 @@
 .button-bar > .button {
   @include flex(1);
   display: block;
-  
+
   overflow: hidden;
 
   padding: 0 16px;
@@ -52,3 +52,10 @@
     border-radius: 0px $button-border-radius $button-border-radius 0px;
   }
 }
+
+.button-bar > .button-small {
+  &:before,
+  .icon:before {
+    line-height: 28px;
+  }
+}
diff --git a/www/lib/ionic/scss/_form.scss b/www/lib/ionic/scss/_form.scss
index 8d08ae6c..5e22af52 100644
--- a/www/lib/ionic/scss/_form.scss
+++ b/www/lib/ionic/scss/_form.scss
@@ -79,6 +79,10 @@ textarea {
     min-width: 14px;
   }
 }
+// prevent flex-shrink on WP
+.platform-windowsphone .item-input input{
+  flex-shrink: 1;
+}
 
 .item-input-inset {
   @include display-flex();
diff --git a/www/lib/ionic/scss/_items.scss b/www/lib/ionic/scss/_items.scss
index 6b14aec1..6afb061f 100644
--- a/www/lib/ionic/scss/_items.scss
+++ b/www/lib/ionic/scss/_items.scss
@@ -201,7 +201,7 @@ button.item.item-complex {
   z-index: $z-index-item;
   padding: $item-padding (ceil( ($item-padding * 3) + ($item-padding / 3) ) - 5) $item-padding $item-padding;
   border: none;
-  background-color: white;
+  background-color: $item-default-bg;
 }
 
 a.item-content {
diff --git a/www/lib/ionic/scss/_loading.scss b/www/lib/ionic/scss/_loading.scss
index e15ac779..71b819a5 100644
--- a/www/lib/ionic/scss/_loading.scss
+++ b/www/lib/ionic/scss/_loading.scss
@@ -21,7 +21,8 @@
   visibility: hidden;
   opacity: 0;
 
-  &:not(.visible) .icon {
+  &:not(.visible) .icon,
+  &:not(.visible) .spinner{
     display: none;
   }
   &.visible {
diff --git a/www/lib/ionic/scss/_mixins.scss b/www/lib/ionic/scss/_mixins.scss
index 46b3ecce..b025ea90 100644
--- a/www/lib/ionic/scss/_mixins.scss
+++ b/www/lib/ionic/scss/_mixins.scss
@@ -119,6 +119,9 @@
   &::-webkit-slider-thumb:before {
     background: $track-bg-color;
   }
+  &::-ms-fill-lower{
+    background: $track-bg-color;
+  }
 }
 
 
diff --git a/www/lib/ionic/scss/_platform.scss b/www/lib/ionic/scss/_platform.scss
index 75747cd4..163994e8 100644
--- a/www/lib/ionic/scss/_platform.scss
+++ b/www/lib/ionic/scss/_platform.scss
@@ -40,6 +40,24 @@
       top: $bar-height + $bar-subheader-height + $tabs-height + $ios-statusbar-height;
     }
   }
+  .popover{
+    .bar-header:not(.bar-subheader) {
+      height: $bar-height;
+      &.item-input-inset .item-input-wrapper {
+        margin-top: -1px;
+      }
+      > * {
+        margin-top: 0;
+      }
+    }
+    .has-header,
+    .bar-subheader {
+      top: $bar-height;
+    }
+    .has-subheader {
+      top: $bar-height + $bar-subheader-height;
+    }
+  }
   &.status-bar-hide {
     // Cordova doesn't adjust the body height correctly, this makes up for it
     margin-bottom: 20px;
diff --git a/www/lib/ionic/scss/_range.scss b/www/lib/ionic/scss/_range.scss
index e926b513..17c3b3a4 100644
--- a/www/lib/ionic/scss/_range.scss
+++ b/www/lib/ionic/scss/_range.scss
@@ -33,7 +33,7 @@
     border: 0;
   }
 
-  &::-webkit-slider-thumb:before {
+  &::-webkit-slider-thumb:before{
     /* what creates the colorful line on the left side of the slider */
     position: absolute;
     top: ($range-slider-height / 2) - ($range-track-height / 2);
@@ -54,7 +54,32 @@
     //background: red;
     //opacity: .5;
   }
-
+   &::-ms-track{
+     background: transparent;
+     border-color: transparent;
+     border-width: 11px 0 16px;
+     color:transparent;
+     margin-top:20px;
+   }
+   &::-ms-thumb {
+     width: $range-slider-width;
+     height: $range-slider-height;
+     border-radius: $range-slider-border-radius;
+     background-color: $toggle-handle-off-bg-color;
+     border-color:$toggle-handle-off-bg-color;
+     box-shadow: $range-slider-box-shadow;
+     margin-left:1px;
+     margin-right:1px;
+     outline:none;
+   }
+   &::-ms-fill-lower{
+     height: $range-track-height;
+     background:$dark;
+   }
+   &::-ms-fill-upper {
+     height: $range-track-height;
+     background:$range-default-track-bg;
+   }
 }
 
 .range {
@@ -119,3 +144,10 @@
   padding-right: 5px;
   padding-left: 0;
 }
+
+// WP range height must be auto
+.platform-windowsphone{
+  .range input{
+    height:auto;
+  }
+}
diff --git a/www/lib/ionic/scss/_scaffolding.scss b/www/lib/ionic/scss/_scaffolding.scss
index 926960ac..4c768c9f 100644
--- a/www/lib/ionic/scss/_scaffolding.scss
+++ b/www/lib/ionic/scss/_scaffolding.scss
@@ -74,7 +74,6 @@ body.grade-c {
   height: auto;
 }
 
-.scroll-content-false,
 .menu .scroll-content.scroll-content-false{
   z-index: $z-index-scroll-content-false;
 }
@@ -98,6 +97,11 @@ body.grade-c {
   @include text-size-adjust(none);
   @include transform-origin(left, top);
 }
+/**
+ * Set ms-viewport to prevent MS "page squish" and allow fluid scrolling
+ * https://msdn.microsoft.com/en-us/library/ie/hh869615(v=vs.85).aspx
+ */
+@-ms-viewport { width: device-width; }
 
 // Scroll bar styles
 .scroll-bar {
@@ -169,16 +173,10 @@ ion-infinite-scroll {
     font-size: 30px;
     color: $scroll-refresh-icon-color;
   }
-  .icon:before,
-  .spinner{
-    -webkit-transform: translate3d(0,0,0);
-    transform: translate3d(0,0,0);
-  }
   &:not(.active){
     .spinner,
     .icon:before{
-      -webkit-transform: translate3d(-1000px,0,0);
-      transform: translate3d(-1000px,0,0);
+      display:none;
     }
   }
 }
diff --git a/www/lib/ionic/scss/_tabs.scss b/www/lib/ionic/scss/_tabs.scss
index 79c2489a..a99a9d96 100644
--- a/www/lib/ionic/scss/_tabs.scss
+++ b/www/lib/ionic/scss/_tabs.scss
@@ -318,6 +318,30 @@ ion-tabs {
         transition: color .2s ease;
       }
     }
+   &:not(.tabs-icon-left):not(.tabs-icon-top){
+       .tab-item{
+          &.tab-item-active,
+          &.active,
+          &.activated {
+             .tab-title, i{
+            display:block;
+            margin-top: -$tabs-striped-border-width + 1px;
+          }
+        }
+      }
+    }
+    &.tabs-icon-left{
+       .tab-item{
+          margin-top: 1px;
+          &.tab-item-active,
+          &.active,
+          &.activated {
+            .tab-title, i {
+              margin-top: -0.1em;
+          }
+        }
+      }
+    }
   }
 }
 
@@ -398,7 +422,7 @@ ion-tabs {
 .tabs-icon-right > .tabs .tab-item {
   font-size: $tabs-text-font-size-side-icon;
 
-  .icon {
+  .icon, .tab-title {
     display: inline-block;
     vertical-align: top;
     margin-top: -.1em;
@@ -494,3 +518,4 @@ ion-tabs {
   cursor: default;
   pointer-events: none;
 }
+
diff --git a/www/lib/ionic/scss/_util.scss b/www/lib/ionic/scss/_util.scss
index 37106784..14241c53 100644
--- a/www/lib/ionic/scss/_util.scss
+++ b/www/lib/ionic/scss/_util.scss
@@ -287,3 +287,10 @@
     display: inline-block;
   }
 }
+
+// ng-show fix for windows phone
+// https://www.hoessl.eu/2014/12/on-using-the-ionic-framework-for-windows-phone-8-1-apps/
+[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak,
+.x-ng-cloak, .ng-hide:not(.ng-hide-animate) {
+  display: none !important;
+}
diff --git a/www/lib/ionic/scss/ionicons/_ionicons-font.scss b/www/lib/ionic/scss/ionicons/_ionicons-font.scss
index 76ec6ebd..3801597a 100755
--- a/www/lib/ionic/scss/ionicons/_ionicons-font.scss
+++ b/www/lib/ionic/scss/ionicons/_ionicons-font.scss
@@ -7,6 +7,7 @@
  src:url("#{$ionicons-font-path}/ionicons.eot?v=#{$ionicons-version}#iefix") format("embedded-opentype"),
   url("#{$ionicons-font-path}/ionicons.ttf?v=#{$ionicons-version}") format("truetype"),
   url("#{$ionicons-font-path}/ionicons.woff?v=#{$ionicons-version}") format("woff"),
+  url("#{$ionicons-font-path}/ionicons.woff") format("woff"), /* for WP8 */
   url("#{$ionicons-font-path}/ionicons.svg?v=#{$ionicons-version}#Ionicons") format("svg");
  font-weight: normal;
  font-style: normal;
@@ -24,4 +25,4 @@
   line-height: 1;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-}
-\ No newline at end of file
+}