Skip to content

Commit

Permalink
fix(Btn): avoid setting bg with disabled and color prop (#5734)
Browse files Browse the repository at this point in the history
fixes #5720
  • Loading branch information
rkomiyama authored and johnleider committed Nov 26, 2018
1 parent 9a5e305 commit 069558a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion packages/vuetify/src/components/VBtn/VBtn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export default mixins(
},

render (h): VNode {
const setColor = (!this.outline && !this.flat) ? this.setBackgroundColor : this.setTextColor
const setColor = (!this.outline && !this.flat && !this.disabled) ? this.setBackgroundColor : this.setTextColor
const { tag, data } = this.generateRouteLink(this.classes)
const children = [this.genContent()]

Expand Down

0 comments on commit 069558a

Please sign in to comment.