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

fix(input): update input css/tests

Browse Source
This commit is contained in:
Adam Bradley
2016-01-25 22:46:18 -06:00
parent b3a7298a52
commit 42f6b1056f
39 changed files with 214 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ionic/components/toggle/test/basic/e2e.ts
View File

@ -1,6 +1,6 @@
it('should check apple via switch element click', function() {
element(by.css('[ngControl=appleCtrl] .toggle-media')).click();
element(by.css('[value="apple"] button')).click();
});

2
ionic/components/toggle/toggle.ios.scss
View File

@ -25,7 +25,7 @@ $toggle-ios-media-padding: 6px ($item-ios-padding-right / 2) 5px ($i
$toggle-ios-transition-duration: 300ms !default;
$toggle-ios-disabled-opacity: 0.5 !default;
$toggle-ios-disabled-opacity: 0.4 !default;
// iOS Toggle

14
ionic/components/toggle/toggle.md.scss
View File

@ -22,7 +22,7 @@ $toggle-md-media-padding: 12px ($item-md-padding-right / 2) 12px
$toggle-md-transition-duration: 300ms !default;
$toggle-md-disabled-opacity: 0.5 !default;
$toggle-md-disabled-opacity: 0.4 !default;
// Material Design Toggle
@ -101,7 +101,7 @@ ion-toggle {
}
// Material Design Toggle within an item
// Material Design Toggle Within An Item
// -----------------------------------------
.item ion-toggle {
@ -110,14 +110,8 @@ ion-toggle {
cursor: pointer;
}
// Material Design Toggle Within An Item
// -----------------------------------------
.item ion-toggle {
margin: $toggle-md-media-margin;
padding: $toggle-md-media-padding;
cursor: pointer;
.item-toggle ion-label {
margin-left: 0;
}

1
ionic/components/toggle/toggle.ts
View File

@ -106,6 +106,7 @@ export class Toggle {
if (_item) {
this.id = 'tgl-' + _item.registerInput('toggle');
this._labelId = 'lbl-' + _item.id;
this._item.setCssClass('item-toggle', true);
}
}