javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 21:48:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(merge): fix merge conflicts

Browse Source
This commit is contained in:
Brandy Carney
2016-09-28 22:28:05 +01:00
parent adaa34fc7e 26281a7a26
commit 3af6355fd5
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -347,7 +347,7 @@ Note: For details on NgModules you can read the Angular docs on them [here](http
10. Change any uses of the `private` TypeScript keyword to `public`. 10. Change any uses of the `private` TypeScript keyword to `public`.
11. Change `<button />` to `<button ion-button />` according to [these instructions](#new-behavior-of-button). 11. Change `<button>` to `<button ion-button>` according to [these instructions](#new-behavior-of-button).
12. Pass colors to the `color` attribute : `<button primary>` changes to `<button color=”primary”>`. See [component colors](#component-colors) above. 12. Pass colors to the `color` attribute : `<button primary>` changes to `<button color=”primary”>`. See [component colors](#component-colors) above.
@ -434,13 +434,12 @@ Note: For details on NgModules you can read the Angular docs on them [here](http
31. Change any uses of the `private` TypeScript keyword to `public`. 31. Change any uses of the `private` TypeScript keyword to `public`.
32. Change any Ionic buttons from `<button />` to `<button ion-button />`. [See New Behavior of Button](#new-behavior-of-button). 32. Change any Ionic buttons from `<button>` to `<button ion-button>`. [See New Behavior of Button](#new-behavior-of-button).
33. Pass colors to the `color` attribute: `<button primary>` changes to `<button color=”primary”>`. 33. Pass colors to the `color` attribute: `<button primary>` changes to `<button color=”primary”>`.
34. Add appropriate icon attributes, if the icon is on the left of the text in a button it should get `icon-left`, if the icon is on the right add `icon-right`, and if the button only has an icon in it, add the `icon-only` attribute to the button. [See New Behavior of Icons in Buttons](#new-behavior-of-icons-in-buttons). 34. Add appropriate icon attributes, if the icon is on the left of the text in a button it should get `icon-left`, if the icon is on the right add `icon-right`, and if the button only has an icon in it, add the `icon-only` attribute to the button. [See New Behavior of Icons in Buttons](#new-behavior-of-icons-in-buttons).
### Bug Fixes ### Bug Fixes
* **action-sheet:** add icon-left to the button if an icon exists ([a731528](https://github.com/driftyco/ionic/commit/a731528)) * **action-sheet:** add icon-left to the button if an icon exists ([a731528](https://github.com/driftyco/ionic/commit/a731528))