From a31c76292e8d8a711f94629ce80f9b36fbfb044c Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 30 Mar 2018 15:19:02 +0000 Subject: [PATCH] Elastic: Fix .btn.active colors --- skins/elastic/styles/widgets/buttons.less | 21 ++++++++++++++++++--- skins/elastic/styles/widgets/dialogs.less | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/skins/elastic/styles/widgets/buttons.less b/skins/elastic/styles/widgets/buttons.less index 9a3ff4843..bfbb9e995 100644 --- a/skins/elastic/styles/widgets/buttons.less +++ b/skins/elastic/styles/widgets/buttons.less @@ -212,11 +212,16 @@ html.touch { opacity: 1; } - &:not([disabled]):not(.disabled):active { + &:not(:disabled):not(.disabled):active { background: darken(@color-btn-secondary-background, 11%); border-color: darken(@color-btn-secondary-background, 13%); box-shadow: 0 0 0 .2rem fade(@color-btn-secondary-background, 53%); } + + &:not(:disabled):not(.disabled).active { + background: darken(@color-btn-secondary-background, 20%); + border-color: darken(@color-btn-secondary-background, 22%); + } } .btn-primary { @@ -240,11 +245,16 @@ html.touch { opacity: 1; } - &:not([disabled]):not(.disabled):active { + &:not(:disabled):not(.disabled):active { background: darken(@color-btn-primary-background, 11%); border-color: darken(@color-btn-primary-background, 13%); box-shadow: 0 0 0 .2rem fade(@color-btn-primary-background, 53%); } + + &:not(:disabled):not(.disabled).active { + background: darken(@color-btn-primary-background, 20%); + border-color: darken(@color-btn-primary-background, 22%); + } } .btn-danger { @@ -268,9 +278,14 @@ html.touch { opacity: 1; } - &:not([disabled]):not(.disabled):active { + &:not(:disabled):not(.disabled):active { background: darken(@color-btn-danger-background, 11%); border-color: darken(@color-btn-danger-background, 13%); box-shadow: 0 0 0 .2rem fade(@color-btn-danger-background, 53%); } + + &:not(:disabled):not(.disabled).active { + background: darken(@color-btn-danger-background, 20%); + border-color: darken(@color-btn-danger-background, 22%); + } } diff --git a/skins/elastic/styles/widgets/dialogs.less b/skins/elastic/styles/widgets/dialogs.less index ae5c709de..2ce83ed91 100644 --- a/skins/elastic/styles/widgets/dialogs.less +++ b/skins/elastic/styles/widgets/dialogs.less @@ -214,7 +214,7 @@ html.touch .popover { right: 0; } - button[disabled] { + button:disabled { display: none; } }