make the tap-highlight not highlight the description

This commit is contained in:
Keegan
2016-03-03 00:49:55 +11:00
parent 226dd682e0
commit 797fa1d9ab
11 changed files with 64 additions and 34 deletions
-9
View File
@@ -97,15 +97,6 @@ module.exports = [
"description": "Some arbitrary text explaining how this all works. " + "description": "Some arbitrary text explaining how this all works. " +
"It's cool if this wraps across multiple lines" "It's cool if this wraps across multiple lines"
}, },
{
"type": "input",
"appKey": "date",
"defaultValue": "",
"label": "Range",
"attributes": {
type: "range"
}
},
{ {
"type": "select", "type": "select",
"appKey": "flavor", "appKey": "flavor",
+7 -8
View File
@@ -54,6 +54,7 @@ label {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding: $item-spacing-v $item-spacing-h;
.input { .input {
white-space: nowrap; white-space: nowrap;
@@ -103,15 +104,13 @@ label {
box-shadow: $color-gray-1 0 0.15rem 0.25rem; box-shadow: $color-gray-1 0 0.15rem 0.25rem;
.component { .component {
padding-top: $item-spacing-v;
padding-right: $item-spacing-h;
padding-left: $item-spacing-h;
position: relative; position: relative;
padding: $item-spacing-v $item-spacing-h;
&:last-child, //&:last-child,
&:first-child { //&:first-child {
padding-bottom: $item-spacing-v; // padding-bottom: $item-spacing-v;
} //}
&:last-child:after { &:last-child:after {
display: none; display: none;
@@ -155,7 +154,7 @@ a {
} }
.description { .description {
padding-top: $item-spacing-v; padding: 0 $item-spacing-h $item-spacing-v ;
@include font-size(0.9); @include font-size(0.9);
color: $color-gray-9; color: $color-gray-9;
} }
+11 -2
View File
@@ -5,6 +5,10 @@
display: block; display: block;
.section & {
padding-right: $item-spacing-h / 2;
}
> .label { > .label {
display: block; display: block;
padding-bottom: $item-spacing-v / 2; padding-bottom: $item-spacing-v / 2;
@@ -12,13 +16,14 @@
.checkbox-group { .checkbox-group {
padding-bottom: $item-spacing-v / 2;
label { label {
padding: $item-spacing-v / 2 0; padding: $item-spacing-v / 2 $item-spacing-h / 2;
} }
.label { .label {
font-size: 0.9em; font-size: 0.9em;
padding: 0 $item-spacing-h / 2;
} }
input { input {
@@ -56,6 +61,10 @@
} }
} }
}
.description {
padding-left: 0;
padding-right: 0;
} }
} }
+4
View File
@@ -2,6 +2,10 @@
.component-color { .component-color {
.section & {
padding: 0;
}
.value { .value {
width: $small-component-width; width: $small-component-width;
height: $base-height; height: $base-height;
+7 -1
View File
@@ -2,7 +2,13 @@
.component-input { .component-input {
display: block; .section & {
padding: 0;
}
label {
display: block;
}
.label { .label {
padding-bottom: $item-spacing-v; padding-bottom: $item-spacing-v;
+12 -2
View File
@@ -5,6 +5,10 @@
display: block; display: block;
.section & {
padding-right: $item-spacing-h / 2;
}
> .label { > .label {
display: block; display: block;
padding-bottom: $item-spacing-v / 2; padding-bottom: $item-spacing-v / 2;
@@ -12,13 +16,14 @@
.radio-group { .radio-group {
padding-bottom: $item-spacing-v / 2;
label { label {
padding: $item-spacing-v / 2 0; padding: $item-spacing-v / 2 $item-spacing-h / 2;
} }
.label { .label {
font-size: 0.9em; font-size: 0.9em;
padding: 0 $item-spacing-h / 2;
} }
input { input {
@@ -55,4 +60,9 @@
} }
} }
.description {
padding-left: 0;
padding-right: 0;
}
} }
+5 -1
View File
@@ -3,6 +3,10 @@
.component-select { .component-select {
.section & {
padding: 0;
}
label { label {
position: relative; position: relative;
} }
@@ -19,7 +23,7 @@
right: 0; right: 0;
top: 50%; top: 50%;
margin-top: -0.1rem; margin-top: -0.1rem;
@include triangle($triangle-size, $color-gray-10, down); @include triangle($triangle-size, $color-orange, down);
} }
} }
+4
View File
@@ -6,6 +6,10 @@
$slide-width: $small-component-width; $slide-width: $small-component-width;
$marker-diameter: $base-height; $marker-diameter: $base-height;
.section & {
padding: 0;
}
input { input {
display: none; // @todo make sure this doesn't mess up interactivity on iOS display: none; // @todo make sure this doesn't mess up interactivity on iOS
} }
+2 -2
View File
@@ -1,5 +1,5 @@
<div class="component component-color tap-highlight"> <div class="component component-color">
<label> <label class="tap-highlight">
<input <input
data-manipulator-target data-manipulator-target
type="hidden" type="hidden"
+10 -7
View File
@@ -1,12 +1,15 @@
<label class="component component-input tap-highlight"> <div class="component component-input">
<span class="label">{{{label}}}</span> <label class="tap-highlight">
<span class="input"> <span class="label">{{{label}}}</span>
<input <span class="input">
<input
data-manipulator-target data-manipulator-target
{{each key: attributes}}{{key}}="{{this}}"{{/each}} {{each key: attributes}}{{key}}="{{this}}"{{/each}}
/> />
</span> </span>
</label>
{{if description}} {{if description}}
<div class="description">{{{description}}}</div> <div class="description">{{{description}}}</div>
{{/if}} {{/if}}
</label> </div>
+2 -2
View File
@@ -1,5 +1,5 @@
<div class="component component-select tap-highlight"> <div class="component component-select">
<label> <label class="tap-highlight">
<span class="label">{{{label}}}</span> <span class="label">{{{label}}}</span>
<span class="value"></span> <span class="value"></span>
<select data-manipulator-target {{each key: attributes}}{{key}}="{{this}}"{{/each}}> <select data-manipulator-target {{each key: attributes}}{{key}}="{{this}}"{{/each}}>