From 7353a616ec9247a8e35e039032e0770f7a910d72 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Wed, 6 May 2015 16:07:59 -0500 Subject: [PATCH] Full item --- ionic/components.js | 2 +- ionic/components/form/test/basic/main.html | 5 ++++- ionic/components/form/test/basic/main.js | 2 +- ionic/components/item/extensions/ios.scss | 3 ++- ionic/components/item/item.js | 2 +- ionic/components/item/item.scss | 4 ++-- ionic/components/switch/switch.js | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ionic/components.js b/ionic/components.js index 214d8af960..0069a849d7 100644 --- a/ionic/components.js +++ b/ionic/components.js @@ -19,7 +19,7 @@ export * from 'ionic/components/nav/nav-item' // export * from 'ionic/components/radio/radio-group' // export * from 'ionic/components/search-bar/search-bar' // export * from 'ionic/components/split-view/split-view' -// export * from 'ionic/components/switch/switch' +export * from 'ionic/components/switch/switch' export * from 'ionic/components/tabs/tabs' export * from 'ionic/components/tabs/tab' export * from 'ionic/components/toolbar/toolbar' diff --git a/ionic/components/form/test/basic/main.html b/ionic/components/form/test/basic/main.html index 906e3ed547..9ba335e214 100644 --- a/ionic/components/form/test/basic/main.html +++ b/ionic/components/form/test/basic/main.html @@ -18,9 +18,12 @@ Note + + Ice cream? + - + diff --git a/ionic/components/form/test/basic/main.js b/ionic/components/form/test/basic/main.js index f50819c1b3..0e40ef3a1b 100644 --- a/ionic/components/form/test/basic/main.js +++ b/ionic/components/form/test/basic/main.js @@ -1,6 +1,6 @@ import {Component, View, bootstrap} from 'angular2/angular2' import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms'; -import {Button, Form, List, Label, Item, Input, Content} from 'ionic/ionic'; +import {Button, Switch, Form, List, Label, Item, Input, Content} from 'ionic/ionic'; @Component({ selector: '[ion-app]' }) @View({ diff --git a/ionic/components/item/extensions/ios.scss b/ionic/components/item/extensions/ios.scss index 81949c9318..dfe9c538bb 100644 --- a/ionic/components/item/extensions/ios.scss +++ b/ionic/components/item/extensions/ios.scss @@ -39,9 +39,10 @@ $item-ios-border-color: $list-ios-border-color !default; color: $item-ios-accessory-color; } - .item-button { + .item-full { // No left ios-style padding padding-left: 0; + button { width: 100%; font-size: 1.3em; diff --git a/ionic/components/item/item.js b/ionic/components/item/item.js index c62265d6a1..69fc9ad444 100644 --- a/ionic/components/item/item.js +++ b/ionic/components/item/item.js @@ -55,7 +55,7 @@ export class Item { } new IonicComponent(Item, { - propClasses: ['button'] + propClasses: ['full'] }) diff --git a/ionic/components/item/item.scss b/ionic/components/item/item.scss index 2227a0cd92..7efcd3bff9 100644 --- a/ionic/components/item/item.scss +++ b/ionic/components/item/item.scss @@ -129,6 +129,6 @@ ion-primary-swipe-buttons { } } -.item-button { - +.item-full { + } diff --git a/ionic/components/switch/switch.js b/ionic/components/switch/switch.js index 18b13c504f..049c618cb7 100644 --- a/ionic/components/switch/switch.js +++ b/ionic/components/switch/switch.js @@ -27,7 +27,7 @@ import {IonicComponent} from 'ionic/config/component' }) export class Switch { constructor( - element: NgElement + @NgElement() element:NgElement // @PropertySetter('attr.role') setAriaRole: Function, // @PropertySetter('attr.aria-checked') setChecked: Function, // @PropertySetter('attr.aria-invalid') setInvalid: Function,