From 0af8cb5acd0a9ab9070636114c2ecb75ad4990a5 Mon Sep 17 00:00:00 2001 From: Joerg Schneider Date: Wed, 24 Apr 2019 10:23:07 +0200 Subject: [PATCH] fix(style): fixed button disabled styles --- src/elements/button/_button.scss | 32 ++++++++++++++++++++++--------- src/elements/button/buttonData.js | 4 ++-- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/elements/button/_button.scss b/src/elements/button/_button.scss index b6bba7e..9589ab8 100644 --- a/src/elements/button/_button.scss +++ b/src/elements/button/_button.scss @@ -29,12 +29,18 @@ background-color: themed('hover'); } } - &:disabled, &.#{$prefix}button-primary--disabled { color: get('colors.gray.disabled.hex'); background-color: get('colors.gray.grayLighter.hex'); cursor: not-allowed; + + &:hover, + &:focus, + &.#{$prefix}button-primary--hover { + color: get('colors.gray.disabled.hex'); + background-color: get('colors.gray.grayLighter.hex'); + } } } @@ -55,17 +61,25 @@ color: themed('buttonTextSecondaryHover'); } } - } - &:disabled, - &.#{$prefix}button-secondary--disabled { - color: get('colors.gray.grayLighter.hex'); - background-color: get('colors.gray.white.hex'); - border-color: get('colors.gray.grayLighter.hex'); - cursor: not-allowed; + &:disabled, + &.#{$prefix}button-secondary--disabled { + color: get('colors.gray.grayLighter.hex'); + background-color: get('colors.gray.white.hex'); + border-color: get('colors.gray.grayLighter.hex'); + cursor: not-allowed; + + &:hover, + &:focus, + &.#{$prefix}button-secondary--hover { + color: get('colors.gray.grayLighter.hex'); + background-color: get('colors.gray.white.hex'); + border-color: get('colors.gray.grayLighter.hex'); + } + } } - &.#{$prefix}button--number-input { + .#{$prefix}button--number-input { background-color: get('colors.gray.grayLighter.hex'); padding: 0; width: 3rem; diff --git a/src/elements/button/buttonData.js b/src/elements/button/buttonData.js index 62a8b67..de58a7c 100644 --- a/src/elements/button/buttonData.js +++ b/src/elements/button/buttonData.js @@ -42,13 +42,13 @@ const buttonData = { }, catSecondary: { name: 'secondary', - js: `
`, + }button__text">Cat Secondary`, react: false, angular: false, vue: false