From dec347e5238f785b690b4bc7d3682ef3ee9cc2df Mon Sep 17 00:00:00 2001 From: Asva Date: Fri, 5 Apr 2019 23:09:16 +0300 Subject: [PATCH] fix: button correct gradient --- public/index.html | 3 +- src/services/color-functions.js | 4 +- .../va-button-group/VaButtonGroup.demo.vue | 28 +++++- .../va-button-group/VaButtonGroup.vue | 57 ++++++++++- .../vuestic-components/va-button/VaButton.vue | 99 +++++++++++-------- .../overrides/_override-custom-libs.scss | 2 +- .../vuestic-sass/resources/_mixins.scss | 7 ++ 7 files changed, 152 insertions(+), 48 deletions(-) diff --git a/public/index.html b/public/index.html index df30de7c2..a9668c7b5 100644 --- a/public/index.html +++ b/public/index.html @@ -3,7 +3,8 @@ - + + Vuestic Admin diff --git a/src/services/color-functions.js b/src/services/color-functions.js index 6de4cba4a..6de8eb30d 100644 --- a/src/services/color-functions.js +++ b/src/services/color-functions.js @@ -46,6 +46,6 @@ export const getGradientColor = (color) => { } export const getGradientBackground = (color) => { - return 'linear-gradient(to right,' + getGradientColor(color)[0] + - ',' + getGradientColor(color)[1] + ')' + const [left, right] = getGradientColor(color) + return `linear-gradient(to right, ${left}, ${right})` } diff --git a/src/vuestic-theme/vuestic-components/va-button-group/VaButtonGroup.demo.vue b/src/vuestic-theme/vuestic-components/va-button-group/VaButtonGroup.demo.vue index 13fe7bbcb..609a7a7e1 100644 --- a/src/vuestic-theme/vuestic-components/va-button-group/VaButtonGroup.demo.vue +++ b/src/vuestic-theme/vuestic-components/va-button-group/VaButtonGroup.demo.vue @@ -1,5 +1,23 @@