Merge branch '2.0' of https://github.com/driftyco/ionic into ins_n_outs

ionic-team · Feb 11, 2016 · 224382a · 224382a
2 parents 13de13a + 2df72cc
commit 224382a
Show file tree

Hide file tree

Showing 30 changed files with 180 additions and 189 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,36 @@
+<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)
+
+
+### 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))
+
+### 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)
 

diff --git 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.
 

diff --git a/ionic/components/button/button.ios.scss b/ionic/components/button/button.ios.scss
@@ -97,19 +97,17 @@ $button-ios-small-icon-font-size:     1.3em !default;
   margin-right: 0;
 }
 
-
 // iOS Full Button
 // --------------------------------------------------
 
 .button-full {
   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
@@ -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 {
@@ -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;
@@ -117,28 +121,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
 // --------------------------------------------------
 
@@ -150,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;
@@ -173,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;
     }
@@ -201,7 +210,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 {

diff --git a/ionic/components/button/button.scss b/ionic/components/button/button.scss
@@ -30,16 +30,16 @@ $button-round-border-radius:      64px !default;
 }
 
 .button-inner {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    flex-shrink: 0;
-    flex-flow: row nowrap;
-    align-items: center;
-    justify-content: center;
+  display: flex;
+  flex-shrink: 0;
+  flex-flow: row nowrap;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
 }
 
-a.button {
+a.button, a[button] {
   text-decoration: none;
 }
 
@@ -54,7 +54,7 @@ a.button {
 // --------------------------------------------------
 
 .button-block {
-  display: flex;
+  display: block;
   clear: both;
   width: 100%;
 
@@ -68,6 +68,7 @@ a.button {
 // --------------------------------------------------
 
 .button-full {
+  display: block;
   width: 100%;
 }
 

diff --git 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
@@ -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>

diff --git a/ionic/components/label/test/basic/index.ts b/ionic/components/label/test/basic/index.ts
diff --git a/ionic/components/label/test/basic/main.html b/ionic/components/label/test/basic/main.html
diff --git 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
 }