Skip to content

Commit

Permalink
Merge branch 'release/0.3.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
benjamindavid committed Aug 23, 2019
2 parents b7e3d78 + 7bb6203 commit 04a34ba
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 28 deletions.
2 changes: 1 addition & 1 deletion dist/craftui.cjs.js
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ var script$3 = {
/* script */
const __vue_script__$3 = script$3;
/* template */
var __vue_render__$3 = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('field',{staticClass:"c-dropdown",attrs:{"id":_vm.id + '-label',"label":_vm.label,"instructions":_vm.instructions,"errors":_vm.errors}},[_c('div',{staticClass:"c-dropdown-input",class:{'is-invalid': (_vm.errors && _vm.errors.length > 0)}},[_c('div',{staticClass:"select"},[_c('select',{class:{ 'w-full': _vm.fullwidth },attrs:{"disabled":_vm.disabled},domProps:{"value":_vm.value},on:{"input":function($event){return _vm.$emit('input', $event.target[$event.target.selectedIndex].value)}}},_vm._l((_vm.options),function(option,key){return _c('option',{key:key,domProps:{"value":option.value}},[_vm._v(_vm._s(option.label))])}),0)])])])};
var __vue_render__$3 = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('field',{staticClass:"c-dropdown",attrs:{"id":_vm.id + '-label',"label":_vm.label,"instructions":_vm.instructions,"errors":_vm.errors}},[_c('div',{staticClass:"c-dropdown-input",class:{'is-invalid': (_vm.errors && _vm.errors.length > 0)}},[_c('div',{staticClass:"select"},[_c('select',{class:{ 'w-full': _vm.fullwidth },attrs:{"disabled":_vm.disabled},domProps:{"value":_vm.value},on:{"change":function($event){return _vm.$emit('input', $event.target.value)}}},_vm._l((_vm.options),function(option,key){return _c('option',{key:key,domProps:{"value":option.value}},[_vm._v(_vm._s(option.label))])}),0)])])])};
var __vue_staticRenderFns__$3 = [];

/* style */
Expand Down
36 changes: 21 additions & 15 deletions dist/craftui.css
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,12 @@ textarea::-webkit-input-placeholder {
opacity: .5;
}

input::-moz-placeholder,
textarea::-moz-placeholder {
color: inherit;
opacity: .5;
}

input:-ms-input-placeholder,
textarea:-ms-input-placeholder {
color: inherit;
Expand Down Expand Up @@ -857,14 +863,6 @@ button.c-btn .c-btn-content {
display: inline-block;
}

body.ltr .c-checkbox input {
margin-right: .5rem;
}

body.rtl .c-checkbox input {
margin-left: .5rem;
}

.c-dropdown .c-dropdown-input select.w-full {
width: 100%;
}
Expand Down Expand Up @@ -1001,19 +999,14 @@ body.rtl .c-lightswitch .c-lightswitch-input label .slider:before {
cursor: default;
}

body.ltr .c-radio input {
body.ltr .c-checkbox input {
margin-right: .5rem;
}

body.rtl .c-radio input {
body.rtl .c-checkbox input {
margin-left: .5rem;
}

.c-radio .instructions {
color: #8795a1;
font-size: .875rem;
}

.c-spinner {
display: inline-block;
}
Expand Down Expand Up @@ -1066,6 +1059,19 @@ body.rtl .c-radio input {
}
}

body.ltr .c-radio input {
margin-right: .5rem;
}

body.rtl .c-radio input {
margin-left: .5rem;
}

.c-radio .instructions {
color: #8795a1;
font-size: .875rem;
}

.c-textbox .wrapper {
position: relative;
}
Expand Down
2 changes: 1 addition & 1 deletion dist/craftui.es.js
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ var script$3 = {
/* script */
const __vue_script__$3 = script$3;
/* template */
var __vue_render__$3 = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('field',{staticClass:"c-dropdown",attrs:{"id":_vm.id + '-label',"label":_vm.label,"instructions":_vm.instructions,"errors":_vm.errors}},[_c('div',{staticClass:"c-dropdown-input",class:{'is-invalid': (_vm.errors && _vm.errors.length > 0)}},[_c('div',{staticClass:"select"},[_c('select',{class:{ 'w-full': _vm.fullwidth },attrs:{"disabled":_vm.disabled},domProps:{"value":_vm.value},on:{"input":function($event){return _vm.$emit('input', $event.target[$event.target.selectedIndex].value)}}},_vm._l((_vm.options),function(option,key){return _c('option',{key:key,domProps:{"value":option.value}},[_vm._v(_vm._s(option.label))])}),0)])])])};
var __vue_render__$3 = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('field',{staticClass:"c-dropdown",attrs:{"id":_vm.id + '-label',"label":_vm.label,"instructions":_vm.instructions,"errors":_vm.errors}},[_c('div',{staticClass:"c-dropdown-input",class:{'is-invalid': (_vm.errors && _vm.errors.length > 0)}},[_c('div',{staticClass:"select"},[_c('select',{class:{ 'w-full': _vm.fullwidth },attrs:{"disabled":_vm.disabled},domProps:{"value":_vm.value},on:{"change":function($event){return _vm.$emit('input', $event.target.value)}}},_vm._l((_vm.options),function(option,key){return _c('option',{key:key,domProps:{"value":option.value}},[_vm._v(_vm._s(option.label))])}),0)])])])};
var __vue_staticRenderFns__$3 = [];

/* style */
Expand Down
2 changes: 1 addition & 1 deletion dist/craftui.js
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@
/* script */
const __vue_script__$3 = script$3;
/* template */
var __vue_render__$3 = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('field',{staticClass:"c-dropdown",attrs:{"id":_vm.id + '-label',"label":_vm.label,"instructions":_vm.instructions,"errors":_vm.errors}},[_c('div',{staticClass:"c-dropdown-input",class:{'is-invalid': (_vm.errors && _vm.errors.length > 0)}},[_c('div',{staticClass:"select"},[_c('select',{class:{ 'w-full': _vm.fullwidth },attrs:{"disabled":_vm.disabled},domProps:{"value":_vm.value},on:{"input":function($event){return _vm.$emit('input', $event.target[$event.target.selectedIndex].value)}}},_vm._l((_vm.options),function(option,key){return _c('option',{key:key,domProps:{"value":option.value}},[_vm._v(_vm._s(option.label))])}),0)])])])};
var __vue_render__$3 = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('field',{staticClass:"c-dropdown",attrs:{"id":_vm.id + '-label',"label":_vm.label,"instructions":_vm.instructions,"errors":_vm.errors}},[_c('div',{staticClass:"c-dropdown-input",class:{'is-invalid': (_vm.errors && _vm.errors.length > 0)}},[_c('div',{staticClass:"select"},[_c('select',{class:{ 'w-full': _vm.fullwidth },attrs:{"disabled":_vm.disabled},domProps:{"value":_vm.value},on:{"change":function($event){return _vm.$emit('input', $event.target.value)}}},_vm._l((_vm.options),function(option,key){return _c('option',{key:key,domProps:{"value":option.value}},[_vm._v(_vm._s(option.label))])}),0)])])])};
var __vue_staticRenderFns__$3 = [];

/* style */
Expand Down
8 changes: 4 additions & 4 deletions dist/craftui.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/craftui.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/craftui.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/craftui.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pixelandtonic/craftui",
"version": "0.3.6",
"version": "0.3.7",
"main": "dist/craftui.js",
"unpkg": "dist/craftui.min.js",
"module": "dist/craftui.es.js",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Dropdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<field :id="id + '-label'" :label="label" :instructions="instructions" :errors="errors" class="c-dropdown">
<div class="c-dropdown-input" :class="{'is-invalid': (errors && errors.length > 0)}">
<div class="select">
<select :disabled="disabled" :value="value" :class="{ 'w-full': fullwidth }" @input="$emit('input', $event.target[$event.target.selectedIndex].value)">
<select :disabled="disabled" :value="value" :class="{ 'w-full': fullwidth }" @change="$emit('input', $event.target.value)">
<option v-for="(option, key) in options" :value="option.value" :key="key">{{ option.label }}</option>
</select>
</div>
Expand Down

0 comments on commit 04a34ba

Please sign in to comment.