From 938864e8d0d82a131089119b896a91006947fda6 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Tue, 16 Aug 2016 17:11:02 -0400 Subject: [PATCH] refactor(button): add ion-button attribute and icon attributes to style buttons BREAKING CHANGES: - ` + diff --git a/demos/alert/main.html b/demos/alert/main.html index 4465d7061b8..abda386063d 100644 --- a/demos/alert/main.html +++ b/demos/alert/main.html @@ -9,10 +9,10 @@ - - - - - + + + + + diff --git a/demos/button/main.html b/demos/button/main.html index 8aa1df285ea..6e7852e77d8 100644 --- a/demos/button/main.html +++ b/demos/button/main.html @@ -11,58 +11,58 @@

Colors

- + - + - + - + - +

Shapes

- + - + - + - +

Outlines

- + - + - + - +

Icons

- - -

Sizes

- + - + - + diff --git a/demos/config/index.ts b/demos/config/index.ts index 620e66dd161..b8fb787773c 100644 --- a/demos/config/index.ts +++ b/demos/config/index.ts @@ -89,18 +89,23 @@ export class ApiDemoPage { if (window.localStorage.getItem('configDemo') !== null) { this.config = JSON.parse(window.localStorage.getItem('configDemo')); - } - else if (platform.is('ios')) { + } else if (platform.is('ios')) { this.config = { 'backButtonIcon': 'ios-arrow-back', 'iconMode': 'ios', 'tabsPlacement': 'bottom' }; + } else if(platform.is('windows')) { + this.config = { + 'backButtonIcon': 'ios-arrow-back', + 'iconMode': 'ios', + 'tabsPlacement': 'top' + }; } else { this.config = { 'backButtonIcon': 'md-arrow-back', 'iconMode': 'md', - 'tabsPlacement': 'top' + 'tabsPlacement': 'bottom' }; } diff --git a/demos/config/main.html b/demos/config/main.html index 632b7bcb281..4ade64b254d 100644 --- a/demos/config/main.html +++ b/demos/config/main.html @@ -41,7 +41,7 @@

Note: the config will not be updated until you click the button below.

-
@@ -57,7 +57,7 @@ });
-
diff --git a/demos/config/page.html b/demos/config/page.html index 6916ea1401f..209ecc34238 100644 --- a/demos/config/page.html +++ b/demos/config/page.html @@ -6,6 +6,6 @@
- +
diff --git a/demos/events/login.html b/demos/events/login.html index 95a3b0f2cc0..adaad6e90b7 100644 --- a/demos/events/login.html +++ b/demos/events/login.html @@ -1,7 +1,7 @@ - @@ -30,8 +30,8 @@

Login

- - + +
diff --git a/demos/events/logout.html b/demos/events/logout.html index 924c0582167..78d37e20d62 100644 --- a/demos/events/logout.html +++ b/demos/events/logout.html @@ -1,7 +1,7 @@ - @@ -17,7 +17,7 @@

Logout

Click the logout button to logout. Then, toggle the menu to see the menu items change.

- - + +
diff --git a/demos/item-reorder/main.html b/demos/item-reorder/main.html index 002a8d82a45..259e386fb03 100644 --- a/demos/item-reorder/main.html +++ b/demos/item-reorder/main.html @@ -3,7 +3,7 @@ Item Reorder - + diff --git a/demos/item-sliding/main.html b/demos/item-sliding/main.html index ee00a06a374..2e301c141cc 100644 --- a/demos/item-sliding/main.html +++ b/demos/item-sliding/main.html @@ -27,22 +27,22 @@

{{chat.name}}

- - - - - - - @@ -39,7 +39,7 @@ Other Settings - + + Ionic Creator - + Hubstruck - + Barkpark - + diff --git a/demos/list/main.html b/demos/list/main.html index c6f242d3af4..9244d0b6165 100644 --- a/demos/list/main.html +++ b/demos/list/main.html @@ -67,22 +67,22 @@ Ionic View - + Ionic Creator - + Hubstruck - + Barkpark - + diff --git a/demos/loading/main.html b/demos/loading/main.html index 9ed65607c32..4f940f97dd6 100644 --- a/demos/loading/main.html +++ b/demos/loading/main.html @@ -58,7 +58,7 @@ - diff --git a/demos/local-storage/main.html b/demos/local-storage/main.html index ea79bbd31ef..89c99d7b737 100644 --- a/demos/local-storage/main.html +++ b/demos/local-storage/main.html @@ -33,7 +33,7 @@
- @@ -54,7 +54,7 @@
- diff --git a/demos/menu/main.html b/demos/menu/main.html index 9195d7290b6..98c6d05e120 100644 --- a/demos/menu/main.html +++ b/demos/menu/main.html @@ -1,7 +1,7 @@ - @@ -18,10 +18,10 @@

Active Menu: {{ (activeMenu == 'menu1') ? 'Menu 1' : 'Menu 2' }}<

This page has two menus with different id's, but only one is active at a time.

- + - + - + diff --git a/demos/modal/main.html b/demos/modal/main.html index 909afb4f8c7..8aabd97ef49 100644 --- a/demos/modal/main.html +++ b/demos/modal/main.html @@ -10,7 +10,7 @@
- +
@@ -31,7 +31,7 @@
- +
diff --git a/demos/modal/modal-content.html b/demos/modal/modal-content.html index 5edca41cc98..fc83cddc430 100644 --- a/demos/modal/modal-content.html +++ b/demos/modal/modal-content.html @@ -2,7 +2,7 @@ - + Modals @@ -22,6 +22,6 @@
Parameters passed:

No parameters passed.

- + diff --git a/demos/nav-params/main.html b/demos/nav-params/main.html index 538ffb86e2b..a8988f3cb91 100644 --- a/demos/nav-params/main.html +++ b/demos/nav-params/main.html @@ -25,7 +25,7 @@
- +
diff --git a/demos/navigation/main.html b/demos/navigation/main.html index 6a0b55a7060..cb98e9776a8 100644 --- a/demos/navigation/main.html +++ b/demos/navigation/main.html @@ -9,6 +9,6 @@ - + diff --git a/demos/navigation/page.html b/demos/navigation/page.html index 4f9f1640483..126a0bca444 100644 --- a/demos/navigation/page.html +++ b/demos/navigation/page.html @@ -9,7 +9,7 @@ - - + + diff --git a/demos/popover/index.ts b/demos/popover/index.ts index 4adfb0c6926..32caa02b579 100644 --- a/demos/popover/index.ts +++ b/demos/popover/index.ts @@ -16,16 +16,16 @@ import { ionicBootstrap, NavParams, PopoverController } from 'ionic-angular'; - + - + - + - + diff --git a/demos/popover/main.html b/demos/popover/main.html index 8d07872ac5b..c8136ca781b 100644 --- a/demos/popover/main.html +++ b/demos/popover/main.html @@ -3,7 +3,7 @@ Popover - diff --git a/demos/segment/main.html b/demos/segment/main.html index f7c9d23245a..e2df9edfec9 100644 --- a/demos/segment/main.html +++ b/demos/segment/main.html @@ -25,7 +25,7 @@ {{ appType }} {{ item.name }} - + diff --git a/demos/toast/main.html b/demos/toast/main.html index be1c7e6f9d2..bf5907e1468 100644 --- a/demos/toast/main.html +++ b/demos/toast/main.html @@ -9,12 +9,12 @@ - - - - + + + + - - + + diff --git a/demos/toolbar/main.html b/demos/toolbar/main.html index 0f69ef0824c..2709fbf15a1 100644 --- a/demos/toolbar/main.html +++ b/demos/toolbar/main.html @@ -15,15 +15,15 @@ - - - @@ -32,15 +32,15 @@ - - - @@ -49,13 +49,13 @@ - Solid - @@ -64,12 +64,12 @@ - - @@ -78,7 +78,7 @@ - Left Menu @@ -86,14 +86,14 @@ Right Menu - - diff --git a/src/components/action-sheet/action-sheet-component.ts b/src/components/action-sheet/action-sheet-component.ts index 48808d07ea3..89ba8e2c5cb 100644 --- a/src/components/action-sheet/action-sheet-component.ts +++ b/src/components/action-sheet/action-sheet-component.ts @@ -24,13 +24,13 @@ import { ViewController } from '../nav/view-controller';
{{d.title}}
{{d.subTitle}}
-
- diff --git a/src/components/action-sheet/test/basic/index.ts b/src/components/action-sheet/test/basic/index.ts index 4d596dfb77f..15b170d6a91 100644 --- a/src/components/action-sheet/test/basic/index.ts +++ b/src/components/action-sheet/test/basic/index.ts @@ -158,7 +158,7 @@ class E2EPage { - + Modal diff --git a/src/components/action-sheet/test/basic/main.html b/src/components/action-sheet/test/basic/main.html index 59de1bfa63a..9e601979f20 100644 --- a/src/components/action-sheet/test/basic/main.html +++ b/src/components/action-sheet/test/basic/main.html @@ -9,9 +9,9 @@ - - - + + + 
     Result: {{result}}
diff --git a/src/components/alert/alert-component.ts b/src/components/alert/alert-component.ts
index 0c6efc661c7..8e206aef1c6 100644
--- a/src/components/alert/alert-component.ts
+++ b/src/components/alert/alert-component.ts
@@ -29,7 +29,7 @@ import { ViewController } from '../nav/view-controller';