From 9e34235abbb030c3c4a7a0cf25c8e0e3e7bdef08 Mon Sep 17 00:00:00 2001
From: Klaus Karkia <klaus@karkia.me>
Date: Tue, 9 Feb 2016 15:53:07 +0200
Subject: [PATCH 01/19] Corrected documented signature for remove() method

Documentation claimed the remove() method took two parameters: key and value, whereas in reality it only takes one: the key to be removed, as one would expect.
---
 ionic/platform/storage/sql.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ionic/platform/storage/sql.ts b/ionic/platform/storage/sql.ts
index 69b58a90273..c01bda6706b 100644
--- a/ionic/platform/storage/sql.ts
+++ b/ionic/platform/storage/sql.ts
@@ -186,7 +186,6 @@ export class SqlStorage extends StorageEngine {
   /**
   * Remove the value in the database for the given key.
   * @param {string} key the key
-  * @param {string} value The value (as a string)
   * @return {Promise} that resolves or rejects with an object of the form { tx: Transaction, res: Result (or err)}
   */
   remove(key: string): Promise<any> {

From 38a3be438f8254165b2bee51f391feb072c2341e Mon Sep 17 00:00:00 2001
From: "Manu Mtz.-Almeida" <manu.valladolid@gmail.com>
Date: Tue, 9 Feb 2016 01:53:34 +0100
Subject: [PATCH 02/19] fix(button): bar-button uses inner span as flexbox

- Fixed block/full buttons, now there are display: block
- Fixes <ion-segment-button> warnings
---
 ionic/components/button/button.ios.scss       |  6 +--
 ionic/components/button/button.md.scss        | 19 ++++----
 ionic/components/button/button.scss           | 22 +++++----
 ionic/components/nav/test/basic/index.ts      | 15 +++---
 .../components/nav/test/insert-views/index.ts | 10 ++--
 ionic/components/navbar/navbar.ts             |  8 ++--
 .../toolbar/test/scenarios/main.html          | 46 ++++++++++++-------
 ionic/components/toolbar/toolbar-button.scss  |  9 ++--
 ionic/components/toolbar/toolbar.ios.scss     | 10 ++--
 ionic/components/toolbar/toolbar.md.scss      |  3 +-
 ionic/components/toolbar/toolbar.ts           |  8 ++--
 11 files changed, 81 insertions(+), 75 deletions(-)

diff --git a/ionic/components/button/button.ios.scss b/ionic/components/button/button.ios.scss
index 934b244f58c..a1ccaf15152 100644
--- a/ionic/components/button/button.ios.scss
+++ b/ionic/components/button/button.ios.scss
@@ -97,7 +97,6 @@ $button-ios-small-icon-font-size:     1.3em !default;
   margin-right: 0;
 }
 
-
 // iOS Full Button
 // --------------------------------------------------
 
@@ -105,11 +104,10 @@ $button-ios-small-icon-font-size:     1.3em !default;
   margin-right: 0;
   margin-left: 0;
   border-radius: 0;
-  border-left: none;
-  border-right: none;
+  border-right-width: 0;
+  border-left-width: 0;
 }
 
-
 // iOS Outline Button
 // --------------------------------------------------
 
diff --git a/ionic/components/button/button.md.scss b/ionic/components/button/button.md.scss
index d49f12a52c6..6d9ac3fe11d 100644
--- a/ionic/components/button/button.md.scss
+++ b/ionic/components/button/button.md.scss
@@ -110,28 +110,25 @@ $button-md-small-icon-font-size:           1.4em !default;
   font-size: $button-md-small-icon-font-size;
 }
 
-
-// Material Design Full Button
+// Material Design Block Button
 // --------------------------------------------------
 
-.button-full {
-  border-radius: 0;
-  margin-right: 0;
+.button-block {
   margin-left: 0;
-  border-right-width: 0;
-  border-left-width: 0;
+  margin-right: 0;
 }
 
-
-// Material Design Block Button
+// Material Design Full Button
 // --------------------------------------------------
 
-.button-block {
+.button-full {
   margin-right: 0;
   margin-left: 0;
+  border-radius: 0;
+  border-right-width: 0;
+  border-left-width: 0;
 }
 
-
 // Material Design Outline Button
 // --------------------------------------------------
 
diff --git a/ionic/components/button/button.scss b/ionic/components/button/button.scss
index 3b26fc0234c..33f18fd4225 100644
--- a/ionic/components/button/button.scss
+++ b/ionic/components/button/button.scss
@@ -29,17 +29,18 @@ $button-round-border-radius:      64px !default;
   @include appearance(none);
 }
 
-span.button-inner {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    flex-shrink: 0;
-    flex-flow: row nowrap;
-    align-items: center;
-    justify-content: center;
+.button-inner {
+  width: 100%;
+  height: 100%;
+
+  display: flex;
+  flex-shrink: 0;
+  flex-flow: row nowrap;
+  align-items: center;
+  justify-content: center;
 }
 
-a.button {
+a.button, a[button] {
   text-decoration: none;
 }
 
@@ -54,7 +55,7 @@ a.button {
 // --------------------------------------------------
 
 .button-block {
-  display: flex;
+  display: block;
   clear: both;
   width: 100%;
 
@@ -68,6 +69,7 @@ a.button {
 // --------------------------------------------------
 
 .button-full {
+  display: block;
   width: 100%;
 }
 
diff --git a/ionic/components/nav/test/basic/index.ts b/ionic/components/nav/test/basic/index.ts
index c45476d72a8..f75bb8a2bb9 100644
--- a/ionic/components/nav/test/basic/index.ts
+++ b/ionic/components/nav/test/basic/index.ts
@@ -20,7 +20,7 @@ class MyCmpTest{}
         <button><ion-icon name="star"></ion-icon></button>
       </ion-buttons>
       <ion-buttons end>
-        <button>S1</button>
+        <button>S1g</button>
       </ion-buttons>
     </ion-navbar>
     <ion-content>
@@ -74,7 +74,7 @@ class FirstPage {
 
   setPages() {
     let items = [
-      {page: PrimaryHeaderPage}
+      { page: PrimaryHeaderPage }
     ];
 
     this.nav.setPages(items);
@@ -89,7 +89,7 @@ class FirstPage {
   }
 
   pushFullPage() {
-    this.nav.push(FullPage, { id: 8675309, myData: [1,2,3,4] } );
+    this.nav.push(FullPage, { id: 8675309, myData: [1, 2, 3, 4] });
   }
 
   pushAnother() {
@@ -139,8 +139,8 @@ class FullPage {
 
   setPages() {
     let items = [
-      {page: FirstPage},
-      {page: PrimaryHeaderPage}
+      { page: FirstPage },
+      { page: PrimaryHeaderPage }
     ];
 
     this.nav.setPages(items);
@@ -190,6 +190,9 @@ class FullPage {
   template: `
     <ion-navbar *navbar primary>
       <ion-title>Primary Color Page Header</ion-title>
+      <ion-buttons end>
+        <button>S1g</button>
+      </ion-buttons>
     </ion-navbar>
     <ion-content padding>
       <p><button class="e2eFrom3To2" (click)="nav.pop()">Pop</button></p>
@@ -218,7 +221,7 @@ class PrimaryHeaderPage {
   }
 
   pushFullPage() {
-    this.nav.push(FullPage, { id: 8675309, myData: [1,2,3,4] } );
+    this.nav.push(FullPage, { id: 8675309, myData: [1, 2, 3, 4] });
   }
 
   insert() {
diff --git a/ionic/components/nav/test/insert-views/index.ts b/ionic/components/nav/test/insert-views/index.ts
index eabc724299a..f27dc027e9c 100644
--- a/ionic/components/nav/test/insert-views/index.ts
+++ b/ionic/components/nav/test/insert-views/index.ts
@@ -9,14 +9,14 @@ import {App, Page, NavController} from 'ionic/ionic';
     </ion-navbar>
 
     <ion-content padding>
-    <button block (click)="pushPage()">Push Page</block>
+    <button block (click)="pushPage()">Push Page</button>
     </ion-content>`,
 })
 class FirstPage {
   constructor(nav: NavController) {
     this.nav = nav;
   }
-  pushPage(){
+  pushPage() {
     this.nav.push(SecondPage)
   }
 }
@@ -30,7 +30,7 @@ class FirstPage {
 
     <ion-content padding>
       <h1>Second page</h1>
-    <button block (click)="insertPage()">Insert Page</block>
+    <button block (click)="insertPage()">Insert Page</button>
     </ion-content>
   `
 })
@@ -38,7 +38,7 @@ class SecondPage {
   constructor(nav: NavController) {
     this.nav = nav;
   }
-  insertPage(){
+  insertPage() {
     this.nav.insert(1, InsertPage)
   }
 }
@@ -55,7 +55,7 @@ class SecondPage {
   `
 })
 class InsertPage {
-  constructor() {}
+  constructor() { }
 }
 
 
diff --git a/ionic/components/navbar/navbar.ts b/ionic/components/navbar/navbar.ts
index ff5ce24c911..c225df3cfa4 100644
--- a/ionic/components/navbar/navbar.ts
+++ b/ionic/components/navbar/navbar.ts
@@ -94,9 +94,11 @@ class ToolbarBackground {
   template:
     '<div class="toolbar-background"></div>' +
     '<button class="back-button bar-button bar-button-default" [hidden]="hideBackButton">' +
-      '<ion-icon class="back-button-icon" [name]="_bbIcon"></ion-icon>' +
-      '<span class="back-button-text">' +
-        '<span class="back-default">{{_bbText}}</span>' +
+      '<span class="button-inner">' +
+        '<ion-icon class="back-button-icon" [name]="_bbIcon"></ion-icon>' +
+        '<span class="back-button-text">' +
+          '<span class="back-default">{{_bbText}}</span>' +
+        '</span>' +
       '</span>' +
     '</button>' +
     '<ng-content select="[menuToggle],ion-buttons[left]"></ng-content>' +
diff --git a/ionic/components/toolbar/test/scenarios/main.html b/ionic/components/toolbar/test/scenarios/main.html
index 66a5faf63e4..be6f13db2c3 100644
--- a/ionic/components/toolbar/test/scenarios/main.html
+++ b/ionic/components/toolbar/test/scenarios/main.html
@@ -1,4 +1,3 @@
-
 <ion-toolbar>
   <ion-title>This is the title that never ends. It just goes on and on my friend.</ion-title>
 </ion-toolbar>
@@ -62,9 +61,9 @@
 
 <ion-toolbar>
   <ion-buttons start>
-    <button solid class="activated">
+    <a button solid class="activated">
       <ion-icon name="contact"></ion-icon>
-    </button>
+    </a>
     <button solid class="activated">
       <ion-icon name="contact"></ion-icon>
       Solid
@@ -126,14 +125,27 @@
     </button>
   </ion-buttons>
   <ion-buttons end>
-    <button>
-      Edit
+    <a button href="#">Edit
       <ion-icon name="create"></ion-icon>
-    </button>
+    </a>
   </ion-buttons>
   <ion-title>Icon/Color Attr</ion-title>
 </ion-toolbar>
 
+<ion-toolbar>
+  <ion-buttons start>
+    <button>
+      Go Back
+    </button>
+  </ion-buttons>
+  <ion-buttons end>
+    <a button href="#">
+      Edit
+    </a>
+  </ion-buttons>
+  <ion-title>Text Only</ion-title>
+</ion-toolbar>
+
 
 <ion-toolbar>
   <button menuToggle>
@@ -149,11 +161,11 @@
 
 
 <ion-toolbar>
-<ion-buttons end>
-  <button #button1 (click)="buttonClick(button1)">
-    <ion-icon name="star"></ion-icon>
-  </button>
-</ion-buttons>
+  <ion-buttons end>
+    <button #button1 (click)="buttonClick(button1)">
+      <ion-icon name="star"></ion-icon>
+    </button>
+  </ion-buttons>
   <ion-title>Right side menu toggle</ion-title>
   <button menuToggle right>
     <ion-icon name="menu"></ion-icon>
@@ -167,10 +179,10 @@
     </button>
   </ion-buttons>
   <ion-segment secondary>
-    <ion-segment-button>
+    <ion-segment-button value="something">
       Something
     </ion-segment-button>
-    <ion-segment-button>
+    <ion-segment-button value="else">
       Else
     </ion-segment-button>
   </ion-segment>
@@ -178,13 +190,13 @@
 
 <ion-toolbar>
   <ion-segment>
-    <ion-segment-button>
+    <ion-segment-button value="light">
       Light
     </ion-segment-button>
-    <ion-segment-button>
+    <ion-segment-button value="toolbar">
       Toolbar
     </ion-segment-button>
-    <ion-segment-button>
+    <ion-segment-button value="default">
       Default Segment
     </ion-segment-button>
   </ion-segment>
@@ -195,4 +207,4 @@
   .toolbar {
     border-bottom: 1px solid black;
   }
-</style>
+</style>
\ No newline at end of file
diff --git a/ionic/components/toolbar/toolbar-button.scss b/ionic/components/toolbar/toolbar-button.scss
index 9f14aa5fc32..6532b060700 100644
--- a/ionic/components/toolbar/toolbar-button.scss
+++ b/ionic/components/toolbar/toolbar-button.scss
@@ -5,11 +5,7 @@
 
 .bar-button {
   position: relative;
-  display: inline-flex;
-  flex-shrink: 0;
-  flex-flow: row nowrap;
-  align-items: center;
-  justify-content: center;
+  display: inline-block;
 
   margin: 0;
   padding: 0;
@@ -19,6 +15,7 @@
 
   text-align: center;
   text-transform: none;
+  line-height: 1;
 
   vertical-align: top; // the better option for most scenarios
   vertical-align: -webkit-baseline-middle; // the best for those that support it
@@ -54,7 +51,7 @@
 .back-button {
   display: none;
   &.show-back-button {
-    display: flex;
+    display: inline-block;
   }
 }
 
diff --git a/ionic/components/toolbar/toolbar.ios.scss b/ionic/components/toolbar/toolbar.ios.scss
index 50c96fa9ce8..9e32bdde952 100644
--- a/ionic/components/toolbar/toolbar.ios.scss
+++ b/ionic/components/toolbar/toolbar.ios.scss
@@ -62,7 +62,6 @@ ion-navbar-section {
 .toolbar-title {
   font-size: $toolbar-ios-title-font-size;
   font-weight: 600;
-  margin-top: 1px;
   text-align: center;
   pointer-events: auto;
   color: $toolbar-ios-text-color;
@@ -123,10 +122,8 @@ ion-buttons[right] {
 // --------------------------------------------------
 
 .bar-button {
-  margin-top: 0;
-  margin-bottom: 0;
   padding: 0 5px;
-  min-height: 32px;
+  height: 32px;
   border: 0;
   font-size: $toolbar-ios-button-font-size;
   border-radius: $bar-button-ios-border-radius;
@@ -225,7 +222,6 @@ ion-buttons[right] {
 // --------------------------------------------------
 
 .bar-button-icon-left ion-icon {
-  margin-left: -0.1em;
   padding-right: 0.3em;
   font-size: 1.4em;
   line-height: 0.67;
@@ -257,7 +253,6 @@ ion-buttons[right] {
 
 .back-button {
   margin: 0;
-  margin-top: 2px;
   min-height: 3.2rem;
   line-height: 1;
   order: map-get($toolbar-order-ios, back-button);
@@ -268,8 +263,9 @@ ion-buttons[right] {
 .back-button-icon {
   display: inherit;
   margin: 0;
+  margin-top: -1px;
   min-width: 18px;
-  font-size: 3.3rem;
+  font-size: 3.4rem;
 }
 
 .back-button-text {
diff --git a/ionic/components/toolbar/toolbar.md.scss b/ionic/components/toolbar/toolbar.md.scss
index 59b75ce7059..4e3b02bb658 100644
--- a/ionic/components/toolbar/toolbar.md.scss
+++ b/ionic/components/toolbar/toolbar.md.scss
@@ -125,7 +125,7 @@ ion-buttons[right] {
   margin-left: 0.2rem;
   margin-right: 0.2rem;
   padding: 0 5px;
-  min-height: 32px;
+  height: 32px;
   border: 0;
   font-size: $toolbar-md-button-font-size;
   border-radius: $bar-button-md-border-radius;
@@ -226,7 +226,6 @@ ion-buttons[right] {
 // --------------------------------------------------
 
 .bar-button-icon-left ion-icon {
-  margin-left: -0.1em;
   padding-right: 0.3em;
   font-size: 1.4em;
   line-height: 0.67;
diff --git a/ionic/components/toolbar/toolbar.ts b/ionic/components/toolbar/toolbar.ts
index 09a711e29b1..6de072e823c 100644
--- a/ionic/components/toolbar/toolbar.ts
+++ b/ionic/components/toolbar/toolbar.ts
@@ -9,7 +9,7 @@ import {Button} from '../button/button';
 /**
  * @private
  */
-export class ToolbarBase extends Ion  {
+export class ToolbarBase extends Ion {
   itemRefs = [];
   titleRef = null;
   titleCmp: any;
@@ -155,9 +155,9 @@ export class ToolbarTitle extends Ion {
     toolbar && toolbar.setTitleCmp(this);
     navbar && navbar.setTitleCmp(this);
   }
-/**
- * @private
- */
+  /**
+   * @private
+   */
   getTitleText() {
     return this.getNativeElement().textContent;
   }

From ab09b81158aabbd38efd308be364a7723949f1e3 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 10 Feb 2016 09:50:34 -0600
Subject: [PATCH 03/19] chore(release): release alpha57

---
 CHANGELOG.md | 19 +++++++++++++++++++
 package.json |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b83d833bef..fad117f9890 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+<a name="2.0.0-alpha.57"></a>
+# [2.0.0-alpha.57](https://github.com/driftyco/ionic/compare/v2.0.0-alpha.56...v2.0.0-alpha.57) (2016-02-10)
+
+
+### Bug Fixes
+
+* **button:** bar-button uses inner span as flexbox ([38a3be4](https://github.com/driftyco/ionic/commit/38a3be4))
+
+### Features
+
+* Improved transitions and animations
+* hairlines width can be configured with a sass variable ([06b3a5b](https://github.com/driftyco/ionic/commit/06b3a5b))
+* **ion-item-sliding:** style icons on top of text in an option button ([4e57fcf](https://github.com/driftyco/ionic/commit/4e57fcf)), closes [#5352](https://github.com/driftyco/ionic/issues/5352)
+
+### Refactor
+
+* **animations:** no longer using Web Animations polyfill ([da18868](https://github.com/driftyco/ionic/commit/da18868))
+
+
 <a name="2.0.0-alpha.56"></a>
 # [2.0.0-alpha.56](https://github.com/driftyco/ionic/compare/v2.0.0-alpha.55...v2.0.0-alpha.56) (2016-02-05)
 
diff --git a/package.json b/package.json
index d785bcaa9f5..c58938e945e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": "true",
   "name": "ionic2",
-  "version": "2.0.0-alpha.56",
+  "version": "2.0.0-alpha.57",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

From b71acecd9e7376aeab209b9bce837c23586b31b4 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Wed, 10 Feb 2016 10:01:00 -0600
Subject: [PATCH 04/19] test(card): fix icon markup in card tests

---
 ionic/components/card/test/map/main.html    | 24 ++++++++++-----------
 ionic/components/card/test/social/main.html | 12 +++++------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ionic/components/card/test/map/main.html b/ionic/components/card/test/map/main.html
index 96572af045c..51b6fcb4a5a 100644
--- a/ionic/components/card/test/map/main.html
+++ b/ionic/components/card/test/map/main.html
@@ -9,17 +9,17 @@
 
   <img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAAAAAAALAAAAAABAAEAAAICTAEAOw==">
   <button fab fab-right fab-top>
-    <icon pin></icon>
+    <ion-icon name="pin"></ion-icon>
   </button>
 
   <ion-item>
-    <icon item-left large football></icon>
+    <ion-icon item-left large name="football"></ion-icon>
     <h2>Museum of Football</h2>
     <p>11 N. Way St, Madison, WI 53703</p>
   </ion-item>
 
   <ion-item>
-    <icon item-left large wine></icon>
+    <ion-icon item-left large name="wine"></ion-icon>
     <h2>Institute of Fine Cocktails</h2>
     <p>14 S. Hop Avenue, Madison, WI 53703</p>
   </ion-item>
@@ -28,7 +28,7 @@ <h2>Institute of Fine Cocktails</h2>
     <span item-left>18 min</span>
     <span item-left>(2.6 mi)</span>
     <button primary clear item-right>
-      <icon navigate></icon>
+      <ion-icon name="navigate"></ion-icon>
       Start
     </button>
   </ion-item>
@@ -39,17 +39,17 @@ <h2>Institute of Fine Cocktails</h2>
 
   <img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAAAAAAALAAAAAABAAEAAAICTAEAOw==">
   <button danger fab fab-right fab-top>
-    <icon pin></icon>
+    <ion-icon name="pin"></ion-icon>
   </button>
 
   <ion-item>
-    <icon item-left large cloud></icon>
+    <ion-icon item-left large name="cloud"></ion-icon>
     <h2>Yoshi's Island</h2>
     <p>Iggy Koopa</p>
   </ion-item>
 
   <ion-item>
-    <icon item-left large leaf></icon>
+    <ion-icon item-left large name="leaf"></ion-icon>
     <h2>Forest of Illusion</h2>
     <p>Roy Koopa</p>
   </ion-item>
@@ -58,7 +58,7 @@ <h2>Forest of Illusion</h2>
     <span item-left>3 hr</span>
     <span item-left>(4.8 mi)</span>
     <button danger clear item-right>
-      <icon navigate></icon>
+      <ion-icon name="navigate"></ion-icon>
       Start
     </button>
   </ion-item>
@@ -69,17 +69,17 @@ <h2>Forest of Illusion</h2>
 
   <img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAAAAAAALAAAAAABAAEAAAICTAEAOw==">
   <button secondary fab fab-right fab-top>
-    <icon pin></icon>
+    <ion-icon name="pin"></ion-icon>
   </button>
 
   <ion-item>
-    <icon item-left large information-circle></icon>
+    <ion-icon item-left large name="information-circle"></ion-icon>
     <h2>Museum of Information</h2>
     <p>44 Rue de Info, 75010 Paris, France</p>
   </ion-item>
 
   <ion-item>
-    <icon item-left large leaf></icon>
+    <ion-icon item-left large name="leaf"></ion-icon>
     <h2>General Pharmacy</h2>
     <p>1 Avenue Faux, 75010 Paris, France</p>
   </ion-item>
@@ -88,7 +88,7 @@ <h2>General Pharmacy</h2>
     <span item-left secondary>26 min</span>
     <span item-left>(8.1 mi)</span>
     <button secondary clear item-right>
-      <icon navigate></icon>
+      <ion-icon name="navigate"></ion-icon>
       Start
     </button>
   </ion-item>
diff --git a/ionic/components/card/test/social/main.html b/ionic/components/card/test/social/main.html
index 5486f8df900..71754935426 100644
--- a/ionic/components/card/test/social/main.html
+++ b/ionic/components/card/test/social/main.html
@@ -23,11 +23,11 @@ <h2>Marty McFly</h2>
 
   <ion-item>
     <button primary clear item-left>
-      <icon thumbs-up></icon>
+      <ion-icon name="thumbs-up"></ion-icon>
       <div>12 Likes</div>
     </button>
     <button primary clear item-left>
-      <icon text></icon>
+      <ion-icon name="text"></ion-icon>
       <div>4 Comments</div>
     </button>
     <ion-note item-right>
@@ -56,11 +56,11 @@ <h2>Sarah Connor</h2>
 
   <ion-item>
     <button primary clear item-left>
-      <icon thumbs-up></icon>
+      <ion-icon name="thumbs-up"></ion-icon>
       <div>30 Likes</div>
     </button>
     <button primary clear item-left>
-      <icon text></icon>
+      <ion-icon name="text"></ion-icon>
       <div>64 Comments</div>
     </button>
     <ion-note item-right>
@@ -88,11 +88,11 @@ <h2>Dr. Ian Malcolm</h2>
 
   <ion-item>
     <button primary clear item-left>
-      <icon thumbs-up></icon>
+      <ion-icon name="thumbs-up"></ion-icon>
       <div>46 Likes</div>
     </button>
     <button primary clear item-left>
-      <icon text></icon>
+      <ion-icon name="text"></ion-icon>
       <div>66 Comments</div>
     </button>
     <ion-note item-right>

From a8515115c1a253ba3b2ee4cfae015f4f2b8149ef Mon Sep 17 00:00:00 2001
From: perry <perry@ionic.io>
Date: Wed, 10 Feb 2016 10:15:10 -0600
Subject: [PATCH 05/19] chore(dgeni): Updating API landing page title

---
 scripts/docs/templates/api_index.template.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/docs/templates/api_index.template.html b/scripts/docs/templates/api_index.template.html
index 3884ecbbe17..97ab962a48f 100644
--- a/scripts/docs/templates/api_index.template.html
+++ b/scripts/docs/templates/api_index.template.html
@@ -11,7 +11,7 @@
 searchable: false
 ---
 
-# Ionic 2 Components
+# Ionic 2 API Docs
 
 <img class="section-header" src="/img/docs/api-intro-header.png" />
 

From b8c0f770348068d23936610ccae358d72c65804b Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Wed, 10 Feb 2016 10:42:16 -0600
Subject: [PATCH 06/19] test(list): remove infinite list code as this is
 outdated and broken

---
 ionic/components/list/test/infinite/index.ts  | 39 ++-----------------
 ionic/components/list/test/infinite/main.html | 11 ++----
 2 files changed, 7 insertions(+), 43 deletions(-)

diff --git a/ionic/components/list/test/infinite/index.ts b/ionic/components/list/test/infinite/index.ts
index 9164945f914..ffb2f827d0e 100644
--- a/ionic/components/list/test/infinite/index.ts
+++ b/ionic/components/list/test/infinite/index.ts
@@ -1,42 +1,9 @@
-import {ProtoViewRef, ViewContainerRef} from 'angular2/core'
-import {Directive, Host, forwardRef} from 'angular2/core';
-
-import {App, List} from 'ionic/ionic';
-
+import {App} from 'ionic/ionic';
 
 
 @App({
-  templateUrl: 'main.html',
-  directives: [forwardRef(() => ItemCellTemplate)]
+  templateUrl: 'main.html'
 })
 class E2EApp {
-  constructor() {
-
-    this.items = []
-    for(let i = 0; i < 1000; i++) {
-      this.items.push({
-        title: 'Item ' + i
-      })
-    }
-  }
-}
-
-
-/*
-  Used to find and register headers in a view, and this directive's
-  content will be moved up to the common navbar location, and created
-  using the same context as the view's content area.
-*/
-@Directive({
-  selector: 'template[cell]'
-})
-export class ItemCellTemplate {
-  constructor(@Host() list: List, viewContainer: ViewContainerRef, protoViewRef: ProtoViewRef) {
-    console.log('Item cell template', list, viewContainer, protoViewRef);
-
-    this.protoViewRef = protoViewRef;
-    this.viewContainer = viewContainer;
-
-    list.setItemTemplate(this);
-  }
+  // TODO
 }
diff --git a/ionic/components/list/test/infinite/main.html b/ionic/components/list/test/infinite/main.html
index d6f233e1910..0b680180a1c 100644
--- a/ionic/components/list/test/infinite/main.html
+++ b/ionic/components/list/test/infinite/main.html
@@ -1,10 +1,7 @@
-<ion-content padding #content>
+<ion-toolbar><ion-title>Infinite List</ion-title></ion-toolbar>
 
-  <ion-list inset virtual [items]="items" [content]="content">
-    <ion-item *cell #item>
-      {{item.title}}
-    </ion-item>
-  </ion-list>
-  <f style="height: 15000px; width: 100%; background-color: green"></f>
+<ion-content padding>
+
+TODO
 
 </ion-content>

From 17c1846f056e9da62bfda7520ceeab075f11f759 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Wed, 10 Feb 2016 11:01:41 -0600
Subject: [PATCH 07/19] test(menu): fix menu swipe enabling on right side menu

---
 ionic/components/menu/test/disable-swipe/index.ts  | 4 ++--
 ionic/components/menu/test/disable-swipe/main.html | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ionic/components/menu/test/disable-swipe/index.ts b/ionic/components/menu/test/disable-swipe/index.ts
index c2559784935..cd306e05027 100644
--- a/ionic/components/menu/test/disable-swipe/index.ts
+++ b/ionic/components/menu/test/disable-swipe/index.ts
@@ -14,13 +14,13 @@ class Page1 {
   toggleLeftMenuSwipeable() {
     this.leftMenuSwipeEnabled = !this.leftMenuSwipeEnabled;
 
-    this.menu.swipeEnable(this.leftMenuSwipeEnabled, 'leftMenu');
+    this.menu.swipeEnable(this.leftMenuSwipeEnabled, 'left');
   }
 
   toggleRightMenuSwipeable() {
     this.rightMenuSwipeEnabled = !this.rightMenuSwipeEnabled;
 
-    this.menu.swipeEnable(this.leftMenuSwipeEnabled, 'rightMenu');
+    this.menu.swipeEnable(this.rightMenuSwipeEnabled, 'right');
   }
 }
 
diff --git a/ionic/components/menu/test/disable-swipe/main.html b/ionic/components/menu/test/disable-swipe/main.html
index b687ca825e7..71b314b01ca 100644
--- a/ionic/components/menu/test/disable-swipe/main.html
+++ b/ionic/components/menu/test/disable-swipe/main.html
@@ -7,11 +7,9 @@
   <ion-content>
 
     <ion-list>
-
       <button ion-item>
         Left Item 1
       </button>
-
     </ion-list>
   </ion-content>
 
@@ -27,11 +25,9 @@
   <ion-content>
 
     <ion-list>
-
       <button ion-item>
         Right Item 1
       </button>
-
     </ion-list>
   </ion-content>
 

From 8bde8d7522134c04a7d5cacf924db6e207f5a71c Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 10 Feb 2016 11:38:57 -0600
Subject: [PATCH 08/19] fix(modal): set root nav view controller

---
 ionic/components/modal/test/basic/index.ts | 14 +++++++-------
 ionic/components/nav/nav-controller.ts     |  2 ++
 ionic/ionic.ts                             |  1 +
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ionic/components/modal/test/basic/index.ts b/ionic/components/modal/test/basic/index.ts
index c4144aa706d..e975e48ebf3 100644
--- a/ionic/components/modal/test/basic/index.ts
+++ b/ionic/components/modal/test/basic/index.ts
@@ -1,5 +1,5 @@
 import {App, Page, Config, Platform} from 'ionic/ionic';
-import {Modal, ActionSheet, NavController, NavParams, Animation, ViewController} from 'ionic/ionic';
+import {Modal, ActionSheet, NavController, NavParams, Transition, ViewController} from 'ionic/ionic';
 
 
 @Page({
@@ -284,8 +284,8 @@ class E2EApp {
 }
 
 
-class FadeIn extends Animation {
-  constructor(enteringView, leavingView) {
+class FadeIn extends Transition {
+  constructor(enteringView: ViewController, leavingView: ViewController) {
     super(enteringView.pageRef());
     this
       .easing('ease')
@@ -295,10 +295,10 @@ class FadeIn extends Animation {
       .before.addClass('show-page');
   }
 }
-Animation.register('my-fade-in', FadeIn);
+Transition.register('my-fade-in', FadeIn);
 
-class FadeOut extends Animation {
-  constructor(enteringView, leavingView) {
+class FadeOut extends Transition {
+  constructor(enteringView: ViewController, leavingView: ViewController) {
     super(leavingView.pageRef());
     this
       .easing('ease')
@@ -307,4 +307,4 @@ class FadeOut extends Animation {
       .before.addClass('show-page');
   }
 }
-Animation.register('my-fade-out', FadeOut);
+Transition.register('my-fade-out', FadeOut);
diff --git a/ionic/components/nav/nav-controller.ts b/ionic/components/nav/nav-controller.ts
index d2e96c6e9b7..bf39b8c7623 100644
--- a/ionic/components/nav/nav-controller.ts
+++ b/ionic/components/nav/nav-controller.ts
@@ -416,6 +416,8 @@ export class NavController extends Ion {
       return;
     }
 
+    enteringView.setNav(rootNav);
+
     opts.keyboardClose = false;
     opts.direction = 'forward';
 
diff --git a/ionic/ionic.ts b/ionic/ionic.ts
index 821c0aba605..cbb0b9dcfe9 100644
--- a/ionic/ionic.ts
+++ b/ionic/ionic.ts
@@ -16,6 +16,7 @@ export * from './util/events'
 export * from './util/keyboard'
 
 export * from './animations/animation'
+export * from './transitions/transition'
 
 export * from './translation/translate'
 export * from './translation/translate_pipe'

From ef1fc752033caaa0ddd3c12d5841942b770eb9e8 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Wed, 10 Feb 2016 11:39:45 -0600
Subject: [PATCH 09/19] test(slides): fix slides test to remove errors

---
 ionic/components/slides/test/basic/index.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ionic/components/slides/test/basic/index.ts b/ionic/components/slides/test/basic/index.ts
index cb020b52ff9..a2181da18e7 100644
--- a/ionic/components/slides/test/basic/index.ts
+++ b/ionic/components/slides/test/basic/index.ts
@@ -22,14 +22,13 @@ class MyApp {
 
     this.http.get(baseUrl + '?method=flickr.groups.pools.getPhotos&group_id=1463451@N25&safe_search=1&api_key='
                   + FLICKR_API_KEY + '&nojsoncallback=1&format=json&tags=' + tags)
-       .map(res => res.json())
       .subscribe(data => {
-        this.images = data.photos.photo.slice(0, 20);
+        this.images = data.json().photos.photo.slice(0, 20);
         setTimeout(() => {
           this.slider.update();
         });
     }, (err) => {
-      alert('Unable to load images');
+      console.info('Unable to load images');
       console.error(err);
     })
   }

From f14cf9a8dcd0e20b311c8bb510bb603c8d2289da Mon Sep 17 00:00:00 2001
From: Tim Lancina <tlancina@users.noreply.github.com>
Date: Wed, 10 Feb 2016 11:49:12 -0600
Subject: [PATCH 10/19] docs(changelog): add breaking change notice about
 removal of web animations polyfill

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fad117f9890..de016c939bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,11 @@
 
 * **animations:** no longer using Web Animations polyfill ([da18868](https://github.com/driftyco/ionic/commit/da18868))
 
+### Breaking Changes
+
+The Web Animations polyfill is no longer shipped with the framework and may cause build errors.  
+
+Projects will need to be [updated accordingly](https://github.com/driftyco/ionic-conference-app/commit/2ed59e6fd275c4616792c7b2e5aa9da4a20fb188).
 
 <a name="2.0.0-alpha.56"></a>
 # [2.0.0-alpha.56](https://github.com/driftyco/ionic/compare/v2.0.0-alpha.55...v2.0.0-alpha.56) (2016-02-05)

From 79a94db490b42842ebfe0e9a2cac14294de1b8a8 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Wed, 10 Feb 2016 11:52:03 -0600
Subject: [PATCH 11/19] test(tabs): fix toggles in modal for tabs

---
 ionic/components/tabs/test/basic/index.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ionic/components/tabs/test/basic/index.ts b/ionic/components/tabs/test/basic/index.ts
index bd293e6257c..9131f303811 100644
--- a/ionic/components/tabs/test/basic/index.ts
+++ b/ionic/components/tabs/test/basic/index.ts
@@ -23,9 +23,10 @@
     <ion-list>
       <ion-list-header>Tracks</ion-list-header>
 
-      <ion-toggle *ngFor="#i of items" secondary>
-        Toggle {{i}}
-      </ion-toggle>
+      <ion-item *ngFor="#i of items">
+        <ion-label>Toggle {{i}}</ion-label>
+        <ion-toggle secondary></ion-toggle>
+      </ion-item>
     </ion-list>
 
     <ion-list>

From 5de31fb501b4e619d2a868ae5636b2dc03e64236 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 10 Feb 2016 11:54:46 -0600
Subject: [PATCH 12/19] test(modal): fix custom modal transition

---
 ionic/components/modal/test/basic/index.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ionic/components/modal/test/basic/index.ts b/ionic/components/modal/test/basic/index.ts
index e975e48ebf3..6fb0c07fb26 100644
--- a/ionic/components/modal/test/basic/index.ts
+++ b/ionic/components/modal/test/basic/index.ts
@@ -1,5 +1,5 @@
 import {App, Page, Config, Platform} from 'ionic/ionic';
-import {Modal, ActionSheet, NavController, NavParams, Transition, ViewController} from 'ionic/ionic';
+import {Modal, ActionSheet, NavController, NavParams, Transition, TransitionOptions, ViewController} from 'ionic/ionic';
 
 
 @Page({
@@ -285,9 +285,10 @@ class E2EApp {
 
 
 class FadeIn extends Transition {
-  constructor(enteringView: ViewController, leavingView: ViewController) {
-    super(enteringView.pageRef());
+  constructor(enteringView: ViewController, leavingView: ViewController, opts: TransitionOptions) {
+    super(opts);
     this
+      .element(enteringView.pageRef())
       .easing('ease')
       .duration(1000)
       .fromTo('translateY', '0%', '0%')
@@ -298,9 +299,10 @@ class FadeIn extends Transition {
 Transition.register('my-fade-in', FadeIn);
 
 class FadeOut extends Transition {
-  constructor(enteringView: ViewController, leavingView: ViewController) {
-    super(leavingView.pageRef());
+  constructor(enteringView: ViewController, leavingView: ViewController, opts: TransitionOptions) {
+    super(opts);
     this
+      .element(leavingView.pageRef())
       .easing('ease')
       .duration(500)
       .fadeOut()

From 2766f7fda8f537baa18f6b91df5f73f7da7a344e Mon Sep 17 00:00:00 2001
From: "Manu Mtz.-Almeida" <manu.valladolid@gmail.com>
Date: Wed, 10 Feb 2016 18:52:11 +0100
Subject: [PATCH 13/19] fix(toolbar): fixes segment/title aligment when cordova
 iOS style is applied

closes #5208
---
 ionic/components/toolbar/toolbar.ios.scss | 2 +-
 ionic/platform/cordova.ios.scss           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ionic/components/toolbar/toolbar.ios.scss b/ionic/components/toolbar/toolbar.ios.scss
index 9e32bdde952..8c142ed2612 100644
--- a/ionic/components/toolbar/toolbar.ios.scss
+++ b/ionic/components/toolbar/toolbar.ios.scss
@@ -17,7 +17,7 @@ $toolbar-order-ios: (
 );
 
 $toolbar-ios-padding:                       4px !default;
-$toolbar-ios-height:                        4.4rem !default;
+$toolbar-ios-height:                        44px !default;
 $toolbar-ios-button-font-size:              1.7rem !default;
 $toolbar-ios-title-font-size:               1.7rem !default;
 $navbar-ios-height:                         $toolbar-ios-height !default;
diff --git a/ionic/platform/cordova.ios.scss b/ionic/platform/cordova.ios.scss
index 25b7e84b1ab..c07eb2a8a76 100644
--- a/ionic/platform/cordova.ios.scss
+++ b/ionic/platform/cordova.ios.scss
@@ -3,7 +3,7 @@
 // iOS Cordova
 // --------------------------------------------------
 
-$cordova-ios-toolbar-padding:    2rem   !default;
+$cordova-ios-toolbar-padding:    20px   !default;
 
 
 &.platform-cordova.platform-ios {
@@ -15,7 +15,7 @@ $cordova-ios-toolbar-padding:    2rem   !default;
 
   ion-navbar ion-title,
   ion-navbar ion-segment, {
-    padding-top: $cordova-ios-toolbar-padding;
+    padding-top: $cordova-ios-toolbar-padding - $toolbar-ios-padding;
   }
 
   ion-navbar,

From 3170a87b397b66bb982f0bccc9ddae0b0c145945 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Wed, 10 Feb 2016 12:39:10 -0600
Subject: [PATCH 14/19] chore(): beta release :tada:

---
 CHANGELOG.md | 9 +++++++++
 package.json | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de016c939bd..b9ac72d5b5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+<a name="2.0.0-beta.0"></a>
+# 2.0.0-beta.0
+
+Enjoy!
+
+<3 The Ionic Team
+
+
+
 <a name="2.0.0-alpha.57"></a>
 # [2.0.0-alpha.57](https://github.com/driftyco/ionic/compare/v2.0.0-alpha.56...v2.0.0-alpha.57) (2016-02-10)
 
diff --git a/package.json b/package.json
index c58938e945e..323357707c1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": "true",
   "name": "ionic2",
-  "version": "2.0.0-alpha.57",
+  "version": "2.0.0-beta.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -88,4 +88,4 @@
       "path": "node_modules/ionic-cz-conventional-changelog"
     }
   }
-}
\ No newline at end of file
+}

From 497d665e4a3b954206d061578ed9ac1d60602ce9 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Wed, 10 Feb 2016 14:55:44 -0600
Subject: [PATCH 15/19] test(label): remove label test

closes #5391
---
 ionic/components/label/test/basic/index.ts  | 10 ----------
 ionic/components/label/test/basic/main.html | 13 -------------
 2 files changed, 23 deletions(-)
 delete mode 100644 ionic/components/label/test/basic/index.ts
 delete mode 100644 ionic/components/label/test/basic/main.html

diff --git a/ionic/components/label/test/basic/index.ts b/ionic/components/label/test/basic/index.ts
deleted file mode 100644
index ac2d7574601..00000000000
--- a/ionic/components/label/test/basic/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import {App} from 'ionic/ionic';
-
-
-@App({
-  templateUrl: 'main.html'
-})
-class E2EApp {
-  constructor() {
-  }
-}
diff --git a/ionic/components/label/test/basic/main.html b/ionic/components/label/test/basic/main.html
deleted file mode 100644
index b57fb202825..00000000000
--- a/ionic/components/label/test/basic/main.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-<ion-toolbar>
-  <ion-title>Icons</ion-title>
-</ion-toolbar>
-
-<ion-content>
-
-  <ion-item>
-    <ion-label>Username</ion-label>
-    <ion-input></ion-input>
-  </ion-item>
-
-</ion-content>

From db535dd2c4a1e2847d8012c67d10cc0cc3d69fbc Mon Sep 17 00:00:00 2001
From: "Manu Mtz.-Almeida" <manu.valladolid@gmail.com>
Date: Wed, 10 Feb 2016 22:58:50 +0100
Subject: [PATCH 16/19] fix(toolbar): toolbar padding when running in cordova
 iOS

---
 ionic/platform/cordova.ios.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ionic/platform/cordova.ios.scss b/ionic/platform/cordova.ios.scss
index c07eb2a8a76..71587b9a8bf 100644
--- a/ionic/platform/cordova.ios.scss
+++ b/ionic/platform/cordova.ios.scss
@@ -15,7 +15,7 @@ $cordova-ios-toolbar-padding:    20px   !default;
 
   ion-navbar ion-title,
   ion-navbar ion-segment, {
-    padding-top: $cordova-ios-toolbar-padding - $toolbar-ios-padding;
+    padding-top: $cordova-ios-toolbar-padding;
   }
 
   ion-navbar,
@@ -30,7 +30,7 @@ $cordova-ios-toolbar-padding:    20px   !default;
   ion-page.modal > ion-toolbar:first-child ion-segment, {
     min-height: $toolbar-ios-height + $cordova-ios-toolbar-padding;
     height: $toolbar-ios-height + $cordova-ios-toolbar-padding;
-    padding-top: $cordova-ios-toolbar-padding;
+    padding-top: $toolbar-ios-padding + $cordova-ios-toolbar-padding;
   }
 
 }

From 2df115b1e32551b65bd4f135d297ec0cb279d075 Mon Sep 17 00:00:00 2001
From: Juan Ignacio Donoso <jidonoso@gmail.com>
Date: Wed, 10 Feb 2016 17:14:23 -0500
Subject: [PATCH 17/19] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eb30dde795b..3bc3426ac3e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 
-# Ionic 2: Alpha
+# Ionic 2: Beta
 
 Ionic 2 is the next generation of [Ionic](http://ionicframework.com/), the open-source mobile app development SDK that makes it easy to build top quality mobile apps with web technologies.
 

From 0e5d3d7d76240f43d993aa44cd4acbf6cd8c7a77 Mon Sep 17 00:00:00 2001
From: Jose Zamudio <jzamudio@popsugar.com>
Date: Wed, 10 Feb 2016 15:54:51 -0800
Subject: [PATCH 18/19] fix(button): button goes transparent on hover on
 desktop (non-touch devices)

---
 ionic/components/button/button.md.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ionic/components/button/button.md.scss b/ionic/components/button/button.md.scss
index 90c56d28b9e..8dcc53a3caf 100644
--- a/ionic/components/button/button.md.scss
+++ b/ionic/components/button/button.md.scss
@@ -58,7 +58,7 @@ $button-md-small-icon-font-size:           1.4em !default;
               color $button-md-transition-duration $button-md-animation-curve;
 
   &:hover:not(.disable-hover) {
-    background-color: $button-md-clear-hover-background-color;
+    background-color: $button-md-color;
   }
 
   &.activated {
@@ -198,7 +198,7 @@ $button-md-small-icon-font-size:           1.4em !default;
   }
 
   &:hover:not(.disable-hover) {
-    color: $button-md-color;
+    background-color: $button-md-clear-hover-background-color;
   }
 
   ion-button-effect {

From 2df72ccda33e7376d393b9e8a82ec1aaee58f57f Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Thu, 11 Feb 2016 11:36:37 -0600
Subject: [PATCH 19/19] fix(button): fix colorized buttons on hover and outline
 buttons on hover

references #5403
---
 ionic/components/button/button.md.scss | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ionic/components/button/button.md.scss b/ionic/components/button/button.md.scss
index 8dcc53a3caf..18cc26ed72d 100644
--- a/ionic/components/button/button.md.scss
+++ b/ionic/components/button/button.md.scss
@@ -85,6 +85,10 @@ $button-md-small-icon-font-size:           1.4em !default;
     color: $fg-color;
     background-color: $bg-color;
 
+    &:hover:not(.disable-hover) {
+      background-color: $bg-color;
+    }
+
     &.activated {
       opacity: 1;
       background-color: $bg-color-activated;
@@ -147,6 +151,10 @@ $button-md-small-icon-font-size:           1.4em !default;
   color: $button-md-color;
   box-shadow: none;
 
+  &:hover:not(.disable-hover) {
+    background-color: $button-md-clear-hover-background-color;
+  }
+
   &.activated {
     opacity: 1;
     box-shadow: none;
@@ -170,6 +178,10 @@ $button-md-small-icon-font-size:           1.4em !default;
     background-color: transparent;
     color: $fg-color;
 
+    &:hover:not(.disable-hover) {
+      background-color: $button-md-clear-hover-background-color;
+    }
+
     &.activated {
       background-color: transparent;
     }