part 1

ionic-team · May 19, 2017 · 2f8cb7a · 2f8cb7a
1 parent 2490c87
commit 2f8cb7a
Show file tree

Hide file tree

Showing 14 changed files with 472 additions and 866 deletions.
diff --git a/src/components/checkbox/checkbox.ts b/src/components/checkbox/checkbox.ts
@@ -90,13 +90,6 @@ export class Checkbox extends BaseInput<boolean> implements IonicTapInput, OnDes
     super(config, elementRef, renderer, 'checkbox', false, form, item, null);
   }
 
-  /**
-   * @hidden
-   */
-  initFocus() {
-    this._elementRef.nativeElement.querySelector('button').focus();
-  }
-
   /**
    * @hidden
    */
@@ -117,8 +110,8 @@ export class Checkbox extends BaseInput<boolean> implements IonicTapInput, OnDes
   /**
    * @hidden
    */
-  _inputCheckHasValue(val: boolean) {
-    this._item && this._item.setElementClass('item-checkbox-checked', val);
+  _inputUpdated() {
+    this._item && this._item.setElementClass('item-checkbox-checked', this._value);
   }
 
 }
diff --git a/src/components/input/input.ios.scss b/src/components/input/input.ios.scss
@@ -52,7 +52,7 @@ $text-input-ios-highlight-color-invalid:   $text-input-highlight-color-invalid !
 // iOS Default Input
 // --------------------------------------------------
 
-.text-input-ios {
+.input-ios .text-input {
   margin: $text-input-ios-margin-top $text-input-ios-margin-right $text-input-ios-margin-bottom $text-input-ios-margin-left;
   padding: 0;
 

diff --git a/src/components/input/input.md.scss b/src/components/input/input.md.scss
@@ -52,7 +52,7 @@ $text-input-md-highlight-color-invalid:     $text-input-highlight-color-invalid
 // Material Design Default Input
 // --------------------------------------------------
 
-.text-input-md {
+.input-md .text-input {
   margin: $text-input-md-margin-top $text-input-md-margin-right $text-input-md-margin-bottom $text-input-md-margin-left;
   padding: 0;