github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Button: fix disabled attribute

pull/7353/head
Leopoldthecoder 2017-10-04 20:44:56 +08:00 committed by 杨奕
parent 42cde204da
commit e2be799e6d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/components/theme-picker.vue
View File

@ -97,7 +97,7 @@
let green = parseInt(color.slice(2, 4), 16); let green = parseInt(color.slice(2, 4), 16);
let blue = parseInt(color.slice(4, 6), 16); let blue = parseInt(color.slice(4, 6), 16);
if (tint === 0) { if (tint === 0) { // when primary color is in its rgb space
return [red, green, blue].join(','); return [red, green, blue].join(',');
} else { } else {
red += Math.round(tint * (255 - red)); red += Math.round(tint * (255 - red));

2
packages/button/src/button.vue
View File

@ -2,6 +2,8 @@
<button <button
class="el-button" class="el-button"
@click="handleClick" @click="handleClick"
:disabled="disabled"
:autofocus="autofocus"
:type="nativeType" :type="nativeType"
:class="[ :class="[
type ? 'el-button--' + type : '', type ? 'el-button--' + type : '',