From 59f369659a6a9166f1da223f334ce0c16fdb293c Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 9 Dec 2020 15:11:42 +0100 Subject: [PATCH] Fix button style conflict wiht bootstrap --- customize.dist/src/less2/include/forms.less | 6 ++++-- www/profile/inner.js | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/customize.dist/src/less2/include/forms.less b/customize.dist/src/less2/include/forms.less index 65eedf263..b6b25de6c 100644 --- a/customize.dist/src/less2/include/forms.less +++ b/customize.dist/src/less2/include/forms.less @@ -119,6 +119,8 @@ } &:hover, &:active, &:focus { + color: @alertify-btn-fg; + border: 1px solid @alertify-btn-fg; background-color: lighten(@alertify-fore, 35%); } @@ -145,7 +147,7 @@ } } - &.danger-alt, &.btn-danger-alt { + &.danger-alt, &.btn-danger-alt, &.btn-danger-outline { border-color: @colortheme_alertify-red; color: @colortheme_alertify-red; &:hover, &:active, &:focus { @@ -163,7 +165,7 @@ } } - &.primary, &.btn-primary { + &.primary, &.btn-primary, &.btn-success { background-color: @colortheme_alertify-primary; color: @colortheme_alertify-primary-text; border-color: @colortheme_alertify-primary-border; diff --git a/www/profile/inner.js b/www/profile/inner.js index 95b5c5031..1483901aa 100644 --- a/www/profile/inner.js +++ b/www/profile/inner.js @@ -101,13 +101,13 @@ define([ var url = APP.origin + '/profile/#' + hash; $('