From 1d5d0d6517db9f806a509f7583ac0a894d40d590 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Wed, 30 Dec 2015 21:20:50 -0600 Subject: [PATCH] chore(alert): remove alert label feature --- ionic/components/alert/alert.ios.scss | 2 +- ionic/components/alert/alert.ts | 2 -- ionic/components/alert/test/basic/index.ts | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ionic/components/alert/alert.ios.scss b/ionic/components/alert/alert.ios.scss index 8e57302d25..8d626347db 100644 --- a/ionic/components/alert/alert.ios.scss +++ b/ionic/components/alert/alert.ios.scss @@ -24,7 +24,7 @@ $alert-ios-body-text-align: center !default; $alert-ios-body-font-size: 13px !default; $alert-ios-input-padding: 6px !default; -$alert-ios-input-margin-top: 24px !default; +$alert-ios-input-margin-top: 10px !default; $alert-ios-input-background-color: #fff !default; $alert-ios-input-border: 1px solid #ccc !default; $alert-ios-input-border-radius: 4px !default; diff --git a/ionic/components/alert/alert.ts b/ionic/components/alert/alert.ts index 5a66237311..c87a3f69fa 100644 --- a/ionic/components/alert/alert.ts +++ b/ionic/components/alert/alert.ts @@ -62,7 +62,6 @@ export class Alert extends ViewController { '
{{d.body}}
' + '
' + '
' + - '
{{i.label}}
' + '' + '
' + '
' + @@ -132,7 +131,6 @@ class AlertCmp { this.d.inputs = this.d.inputs.map((input, index) => { return { name: isDefined(input.name) ? input.name : index, - label: input.label, placeholder: isDefined(input.placeholder) ? input.placeholder : '', type: input.type || 'text', value: isDefined(input.value) ? input.value : '' diff --git a/ionic/components/alert/test/basic/index.ts b/ionic/components/alert/test/basic/index.ts index 1a6a3aecf8..752c0349de 100644 --- a/ionic/components/alert/test/basic/index.ts +++ b/ionic/components/alert/test/basic/index.ts @@ -59,7 +59,6 @@ class E2EPage { alert.addInput({ name: 'name2', value: 'hello', - label: 'Input Label 2', placeholder: 'Placeholder 2' }); alert.addButton({