Merge remote-tracking branch 'origin/master' into #11/description-for-input-components

# Conflicts:
#	dist/clay.js
#	src/styles/clay/_base.scss
#	src/templates/components/select.tpl
#	src/templates/components/toggle.tpl
This commit is contained in:
Keegan
2016-03-02 10:58:17 +11:00
26 changed files with 236 additions and 46 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
<span class="label">{{{label}}}</span>
<div class="checkbox-group">
{{each options}}
<label>
<label class="tap-highlight">
<span class="label">{{{this.label}}}</span>
<input
type="checkbox"
+1 -1
View File
@@ -1,4 +1,4 @@
<div class="component component-color">
<div class="component component-color tap-highlight">
<label>
<input
data-manipulator-target
+1 -1
View File
@@ -1,4 +1,4 @@
<label class="component component-input">
<label class="component component-input tap-highlight">
<span class="label">{{{label}}}</span>
<span class="input">
<input
+1 -1
View File
@@ -2,7 +2,7 @@
<span class="label">{{{label}}}</span>
<div class="radio-group">
{{each options}}
<label>
<label class="tap-highlight">
<span class="label">{{{this.label}}}</span>
<input
type="radio"
+1 -1
View File
@@ -1,4 +1,4 @@
<div class="component component-select">
<div class="component component-select tap-highlight">
<label>
<span class="label">{{{label}}}</span>
<span class="value"></span>
+1 -1
View File
@@ -1,4 +1,4 @@
<div class="component component-button">
<div class="component component-submit">
<button
data-manipulator-target
type="submit"
+1 -1
View File
@@ -1,5 +1,5 @@
<div class="component component-toggle">
<label>
<label class="tap-highlight">
<span class="label">{{{label}}}</span>
<span class="input">
<input