iov-design 2.15.114 → 2.15.115

package/lib/avatar.js

@@ -200,6 +200,7 @@ function normalizeComponent(
 __webpack_require__.r(__webpack_exports__);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/avatar/src/main.vue?vue&type=script&lang=js
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
 /* harmony default export */ var mainvue_type_script_lang_js = ({
   name: 'ElAvatar',
@@ -209,7 +210,7 @@ __webpack_require__.r(__webpack_exports__);
       type: [Number, String],
       validator: function validator(val) {
         if (typeof val === 'string') {
-          return ['large', 'medium', 'small'].includes(val);
+          return ['large', 'medium', 'small', 'mini'].includes(val);
         }
         return typeof val === 'number';
       }
@@ -229,6 +230,18 @@ __webpack_require__.r(__webpack_exports__);
     fit: {
       type: String,
       default: 'cover'
+    },
+    backgroundColor: String,
+    color: String,
+    fontSize: {
+      type: [Number, String],
+      validator: function validator(val) {
+        if (typeof val === 'string') {
+          return (/^\d+(px|em|rem|%)$/.test(val)
+          );
+        }
+        return typeof val === 'number';
+      }
     }
   },
 
@@ -243,7 +256,10 @@ __webpack_require__.r(__webpack_exports__);
     avatarClass: function avatarClass() {
       var size = this.size,
           icon = this.icon,
-          shape = this.shape;
+          shape = this.shape,
+          backgroundColor = this.backgroundColor,
+          color = this.color,
+          fontSize = this.fontSize;
 
       var classList = ['el-avatar'];
 
@@ -259,6 +275,18 @@ __webpack_require__.r(__webpack_exports__);
         classList.push('el-avatar--' + shape);
       }
 
+      if (backgroundColor) {
+        classList.push('el-avatar--custom-bg');
+      }
+
+      if (color) {
+        classList.push('el-avatar--custom-color');
+      }
+
+      if (fontSize) {
+        classList.push('el-avatar--custom-font-size');
+      }
+
       return classList.join(' ');
     }
   },
@@ -307,7 +335,10 @@ __webpack_require__.r(__webpack_exports__);
   render: function render() {
     var h = arguments[0];
     var avatarClass = this.avatarClass,
-        size = this.size;
+        size = this.size,
+        backgroundColor = this.backgroundColor,
+        color = this.color,
+        fontSize = this.fontSize;
 
 
     var sizeStyle = typeof size === 'number' ? {
@@ -316,9 +347,17 @@ __webpack_require__.r(__webpack_exports__);
       lineHeight: size + 'px'
     } : {};
 
+    var customStyle = {
+      background: backgroundColor || undefined,
+      color: color || undefined,
+      fontSize: fontSize ? typeof fontSize === 'number' ? fontSize + 'px' : fontSize : undefined
+    };
+
+    var mergedStyle = _extends({}, sizeStyle, customStyle);
+
     return h(
       'span',
-      { 'class': avatarClass, style: sizeStyle },
+      { 'class': avatarClass, style: mergedStyle },
       [this.renderAvatar()]
     );
   }

package/lib/checkbox.js

@@ -206,9 +206,9 @@ module.exports = require("iov-design/lib/mixins/emitter");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/checkbox/src/checkbox.vue?vue&type=template&id=599d077e
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/checkbox/src/checkbox.vue?vue&type=template&id=36eb8f41
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('label',{staticClass:"el-checkbox",class:[
-    (_vm.border || _vm.button) && _vm.checkboxSize ? 'el-checkbox--' + _vm.checkboxSize : '',
+    _vm.checkboxSize ? 'el-checkbox--' + _vm.checkboxSize : '',
     { 'is-disabled': _vm.isDisabled },
     { 'is-bordered': _vm.border },
     { 'is-card': _vm.card},
@@ -224,7 +224,7 @@ var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._sel
 var staticRenderFns = []
 render._withStripped = true
 
-// CONCATENATED MODULE: ./packages/checkbox/src/checkbox.vue?vue&type=template&id=599d077e
+// CONCATENATED MODULE: ./packages/checkbox/src/checkbox.vue?vue&type=template&id=36eb8f41
 
 // EXTERNAL MODULE: external "iov-design/lib/mixins/emitter"
 var emitter_ = __webpack_require__(4);