Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feat/2.4.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
linx4200 committed Apr 2, 2018
2 parents 69688a6 + 1b8d211 commit 2da5a5a
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.babelrc
3 changes: 2 additions & 1 deletion dist/vue-color.js
Original file line number Diff line number Diff line change
Expand Up @@ -2063,7 +2063,7 @@ var _color2 = _interopRequireDefault(_color);
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

var VueColor = {
version: '2.4.5',
version: '2.4.6',
Compact: _Compact2.default,
Grayscale: _Grayscale2.default,
Material: _Material2.default,
Expand Down Expand Up @@ -3471,6 +3471,7 @@ var render = function() {
],
ref: "input",
staticClass: "vc-input__input",
attrs: { "aria-label": _vm.value },
domProps: { value: _vm.val },
on: {
keydown: _vm.handleKeyDown,
Expand Down
2 changes: 1 addition & 1 deletion dist/vue-color.min.js

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.

1 change: 1 addition & 0 deletions src/components/common/EditableInput.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<template>
<div class="vc-editable-input">
<input class="vc-input__input"
:aria-label="value"
v-model="val"
@keydown="handleKeyDown"
@input="update"
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import Saturation from './components/common/Saturation.vue'
import ColorMixin from './mixin/color.js'

const VueColor = {
version: '2.4.5',
version: '2.4.6',
Compact,
Grayscale,
Material,
Expand Down

0 comments on commit 2da5a5a

Please sign in to comment.