From 479bd983ff14a9f1597b17182bc98dea6a7ee116 Mon Sep 17 00:00:00 2001 From: Marcos Moura Date: Mon, 8 Aug 2016 23:52:58 -0300 Subject: [PATCH] Finish checkbox --- src/components/mdCheckbox/mdCheckbox.scss | 2 +- src/components/mdCheckbox/mdCheckbox.theme | 17 ++++++++++++--- src/components/mdCheckbox/mdCheckbox.vue | 9 +++++--- src/docs/config.js | 12 +++++++---- src/docs/pages/Checkbox.vue | 24 +++++++++++++++------- 5 files changed, 46 insertions(+), 18 deletions(-) diff --git a/src/components/mdCheckbox/mdCheckbox.scss b/src/components/mdCheckbox/mdCheckbox.scss index 9315f3f..64a53d8 100644 --- a/src/components/mdCheckbox/mdCheckbox.scss +++ b/src/components/mdCheckbox/mdCheckbox.scss @@ -28,7 +28,7 @@ $checkbox-ripple-size: 48px; border-top: 0; border-left: 0; opacity: 0; - transform: rotate(45deg) scale3D(.2, .2, 1); + transform: rotate(45deg) scale3D(.15, .15, 1); transition: $swift-ease-in; content: " "; } diff --git a/src/components/mdCheckbox/mdCheckbox.theme b/src/components/mdCheckbox/mdCheckbox.theme index 83a5d77..76e8797 100644 --- a/src/components/mdCheckbox/mdCheckbox.theme +++ b/src/components/mdCheckbox/mdCheckbox.theme @@ -3,12 +3,23 @@ &.md-checkbox { &.md-checked { .md-checkbox-container { - background-color: PRIMARY-COLOR; - border-color: PRIMARY-COLOR; + background-color: ACCENT-COLOR; + border-color: ACCENT-COLOR; } .md-ink-ripple { - color: PRIMARY-COLOR; + color: ACCENT-COLOR; + } + + .md-ripple { + opacity: .38; + } + } + + &.md-disabled { + .md-checkbox-container { + border-color: transparent; + background-color: rgba(#000, .26); } } } diff --git a/src/components/mdCheckbox/mdCheckbox.vue b/src/components/mdCheckbox/mdCheckbox.vue index 6605e95..5e9ccca 100644 --- a/src/components/mdCheckbox/mdCheckbox.vue +++ b/src/components/mdCheckbox/mdCheckbox.vue @@ -1,6 +1,6 @@ @@ -33,7 +41,9 @@ checked0: true, checked1: true, checked2: true, - checked3: true + checked3: true, + checked4: true, + checked5: true }; } };