From 6890532ab4babc1ea9b497ceebd9da84bd6c6bab Mon Sep 17 00:00:00 2001
From: Adam Bradley
Date: Tue, 26 Jan 2016 20:12:30 -0600
Subject: [PATCH] feat(checkbox): stand-alone checkbox components
---
ionic/components/checkbox/checkbox.ios.scss | 7 +++++++
ionic/components/checkbox/checkbox.md.scss | 8 ++++++++
ionic/components/checkbox/test/basic/index.ts | 1 +
ionic/components/checkbox/test/basic/main.html | 5 +++++
ionic/components/input/input-base.ts | 1 -
5 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/ionic/components/checkbox/checkbox.ios.scss b/ionic/components/checkbox/checkbox.ios.scss
index cb209e9d1a..040aedd6c3 100644
--- a/ionic/components/checkbox/checkbox.ios.scss
+++ b/ionic/components/checkbox/checkbox.ios.scss
@@ -22,6 +22,12 @@ $checkbox-ios-media-margin: $item-ios-padding-media-top $item-ios-
$checkbox-ios-disabled-opacity: 0.4 !default;
+ion-checkbox {
+ position: relative;
+ display: inline-block;
+}
+
+
// iOS Checkbox Outer Circle: Unchecked
// -----------------------------------------
@@ -78,6 +84,7 @@ $checkbox-ios-disabled-opacity: 0.4 !default;
// -----------------------------------------
.item ion-checkbox {
+ position: static;
display: block;
margin: $checkbox-ios-media-margin;
}
diff --git a/ionic/components/checkbox/checkbox.md.scss b/ionic/components/checkbox/checkbox.md.scss
index 9beb24febf..16046ce220 100644
--- a/ionic/components/checkbox/checkbox.md.scss
+++ b/ionic/components/checkbox/checkbox.md.scss
@@ -26,6 +26,12 @@ $checkbox-md-icon-border-color-off: darken($list-md-border-color, 40%) !def
$checkbox-md-icon-border-color-on: map-get($colors-md, primary) !default;
+ion-checkbox {
+ position: relative;
+ display: inline-block;
+}
+
+
// Material Design Checkbox Outer Square: Unchecked
// -----------------------------------------
@@ -82,6 +88,8 @@ $checkbox-md-icon-border-color-on: map-get($colors-md, primary) !default;
// -----------------------------------------
.item ion-checkbox {
+ position: static;
+ display: block;
margin: $checkbox-md-media-margin;
}
diff --git a/ionic/components/checkbox/test/basic/index.ts b/ionic/components/checkbox/test/basic/index.ts
index 751eba08ea..f25c1e455d 100644
--- a/ionic/components/checkbox/test/basic/index.ts
+++ b/ionic/components/checkbox/test/basic/index.ts
@@ -26,6 +26,7 @@ class E2EApp {
this.grapeDisabled = true;
this.grapeChecked = true;
+ this.standAloneChecked = true;
}
toggleGrapeChecked() {
diff --git a/ionic/components/checkbox/test/basic/main.html b/ionic/components/checkbox/test/basic/main.html
index b7670ad5fa..618fad4b69 100644
--- a/ionic/components/checkbox/test/basic/main.html
+++ b/ionic/components/checkbox/test/basic/main.html
@@ -48,6 +48,11 @@
+
+
+ Stand-alone checkbox: {{standAloneChecked}}
+
+
appleCtrl.dirty: {{fruitsForm.controls.appleCtrl.dirty}}
appleCtrl.value: {{fruitsForm.controls.appleCtrl.value}}
diff --git a/ionic/components/input/input-base.ts b/ionic/components/input/input-base.ts
index e68c674fc6..e21211e07a 100644
--- a/ionic/components/input/input-base.ts
+++ b/ionic/components/input/input-base.ts
@@ -67,7 +67,6 @@ export class InputBase {
self._scrollMove = function(ev: UIEvent) {
// scroll move event listener this instance can reuse
- console.log('scrollmove', ev)
if (!(self._nav && self._nav.isTransitioning())) {
self.deregScrollMove();