From ca498c6e3cb6a37f7199ce9e37282978cd3dcdb9 Mon Sep 17 00:00:00 2001 From: Keegan Date: Mon, 29 Feb 2016 14:35:39 +1100 Subject: [PATCH 1/6] fix tap-highlight and missing divider --- dev/custom-fn.js | 4 ++-- src/styles/clay/_base.scss | 19 +++++++++++++------ src/styles/clay/components/checkboxgroup.scss | 3 --- src/styles/clay/components/radiogroup.scss | 3 --- src/templates/components/checkboxgroup.tpl | 2 +- src/templates/components/color.tpl | 2 +- src/templates/components/input.tpl | 2 +- src/templates/components/radiogroup.tpl | 2 +- src/templates/components/select.tpl | 2 +- src/templates/components/toggle.tpl | 2 +- 10 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dev/custom-fn.js b/dev/custom-fn.js index 4688283..259bc60 100644 --- a/dev/custom-fn.js +++ b/dev/custom-fn.js @@ -10,9 +10,9 @@ module.exports = function() { */ function toggleBackground() { if (this.get()) { - Clay.getItemByAppKey('background').enable(); + Clay.getItemByAppKey('colorTest').enable(); } else { - Clay.getItemByAppKey('background').disable(); + Clay.getItemByAppKey('colorTest').disable(); } } diff --git a/src/styles/clay/_base.scss b/src/styles/clay/_base.scss index 6a468fa..f39338b 100644 --- a/src/styles/clay/_base.scss +++ b/src/styles/clay/_base.scss @@ -83,9 +83,12 @@ label { } } +.tap-highlight { + @include tap-highlight(); +} + .component { padding-bottom: $item-spacing-v; - @include tap-highlight(); &.disabled { opacity: 0.25; @@ -108,10 +111,10 @@ label { &:last-child, &:first-child { padding-bottom: $item-spacing-v; - - &:after { - display: none; - } + } + + &:last-child:after { + display: none; } &:after { @@ -130,6 +133,10 @@ label { .component-heading:first-child { background: $color-gray-3; border-radius: $border-radius $border-radius 0 0; + + &:after { + display: none; + } } } @@ -160,7 +167,7 @@ a { .input { display: table-cell; } - + .input { text-align: right; } diff --git a/src/styles/clay/components/checkboxgroup.scss b/src/styles/clay/components/checkboxgroup.scss index 88585a7..c8b2720 100644 --- a/src/styles/clay/components/checkboxgroup.scss +++ b/src/styles/clay/components/checkboxgroup.scss @@ -3,10 +3,8 @@ .component-checkbox { - @include tap-highlight(rgba(0,0,0,0)); display: block; - > .label { display: block; padding-bottom: $item-spacing-v / 2; @@ -16,7 +14,6 @@ label { padding: $item-spacing-v / 2 0; - @include tap-highlight(); } .label { diff --git a/src/styles/clay/components/radiogroup.scss b/src/styles/clay/components/radiogroup.scss index 2db5ea3..f83bffd 100644 --- a/src/styles/clay/components/radiogroup.scss +++ b/src/styles/clay/components/radiogroup.scss @@ -3,10 +3,8 @@ .component-radio { - @include tap-highlight(rgba(0,0,0,0)); display: block; - > .label { display: block; padding-bottom: $item-spacing-v / 2; @@ -16,7 +14,6 @@ label { padding: $item-spacing-v / 2 0; - @include tap-highlight(); } .label { diff --git a/src/templates/components/checkboxgroup.tpl b/src/templates/components/checkboxgroup.tpl index 203e2d2..f97d9d0 100755 --- a/src/templates/components/checkboxgroup.tpl +++ b/src/templates/components/checkboxgroup.tpl @@ -2,7 +2,7 @@ {{{label}}}
{{each options}} -