diff --git a/client/core/src/multi-check/multi-check.html b/client/core/src/multi-check/multi-check.html index 720eec2ae..0dce98a8a 100644 --- a/client/core/src/multi-check/multi-check.html +++ b/client/core/src/multi-check/multi-check.html @@ -1,7 +1,19 @@ - - - - + + + + + + + + + + + + + + + + - - \ No newline at end of file + + \ No newline at end of file diff --git a/client/core/src/multi-check/multi-check.js b/client/core/src/multi-check/multi-check.js index dc548cf34..43d65ba89 100644 --- a/client/core/src/multi-check/multi-check.js +++ b/client/core/src/multi-check/multi-check.js @@ -2,11 +2,8 @@ import {module} from '../module'; import './multi-check.scss'; export default class MultiCheck { - constructor($element, $document, $timeout) { - this.$element = $element; - this.$document = $document; - this.$timeout = $timeout; - this._checkAll = false; + constructor() { + this._checkAll = 0; this.type = {}; this.labelType = null; this.showDropDown = false; @@ -30,7 +27,7 @@ export default class MultiCheck { checked = el[this.labelType] ? true : false; } } else { - checked = this.checkAll; + checked = this.checkAll === 1; } el.checked = checked; } @@ -42,29 +39,28 @@ export default class MultiCheck { switch (this.type.id) { case 'all': this.labelType = null; - this.checkAll = true; + this.checkAll = 1; break; case 'any': this.labelType = null; - this.checkAll = false; + this.checkAll = 0; break; default: this.labelType = this.type.id; - this.checkAll = false; + this.checkAll = 2; break; } this.type = {}; } } } -MultiCheck.$inject = ['$element', '$document', '$timeout']; +MultiCheck.$inject = []; module.component('vnMultiCheck', { template: require('./multi-check.html'), controller: MultiCheck, bindings: { options: '<', - container: '@', models: '=', className: '@?' } diff --git a/client/core/src/multi-check/multi-check.scss b/client/core/src/multi-check/multi-check.scss index 65925e54c..420816487 100644 --- a/client/core/src/multi-check/multi-check.scss +++ b/client/core/src/multi-check/multi-check.scss @@ -1,7 +1,4 @@ vn-multi-check { - vn-drop-down{ - margin-top: 23px; - } vn-icon{ cursor: pointer; } @@ -9,4 +6,23 @@ vn-multi-check { outline: none; border: none; } + .primaryCheckbox { + vn-icon{ + font-size: 22px; + margin-left: -4px; + i{ + color: rgba(0,0,0,.54); + } + } + &.color { + i{ + color: rgb(255,152,0); + } + } + } + .arrow_down{ + i{ + padding-top: 8px; + } + } } \ No newline at end of file diff --git a/client/production/src/index/index.html b/client/production/src/index/index.html index 4403e434c..6c3612a7e 100644 --- a/client/production/src/index/index.html +++ b/client/production/src/index/index.html @@ -53,7 +53,7 @@ - +