From 166c87945319508bb02133e90f23df44635dff6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D0=BC=D0=B5=D0=BD=20=D0=9B=D0=B0=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=BD=D1=82=D1=8C=D0=B5=D0=B2?= Date: Sat, 25 Feb 2023 16:02:24 +0500 Subject: [PATCH 1/3] Fix button visibility issue on dark theme --- scss/_buttons.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_buttons.scss b/scss/_buttons.scss index bb1ae3d840da..fbd8643dfcf4 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -10,7 +10,7 @@ @include rfs($btn-font-size, --#{$prefix}btn-font-size); --#{$prefix}btn-font-weight: #{$btn-font-weight}; --#{$prefix}btn-line-height: #{$btn-line-height}; - --#{$prefix}btn-color: #{$body-color}; + --#{$prefix}btn-color: var(--#{$prefix}body-color); --#{$prefix}btn-bg: transparent; --#{$prefix}btn-border-width: #{$btn-border-width}; --#{$prefix}btn-border-color: transparent; From 9704c5937851dfd851c55ec1b5fd19465b806bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D0=BC=D0=B5=D0=BD=20=D0=9B=D0=B0=D0=B2=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=BD=D1=82=D1=8C=D0=B5=D0=B2?= Date: Thu, 2 Mar 2023 17:41:42 +0500 Subject: [PATCH 2/3] Add $btn-color-variable in _buttons.scss --- scss/_buttons.scss | 4 ++-- scss/_variables.scss | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scss/_buttons.scss b/scss/_buttons.scss index fbd8643dfcf4..7c46b753e51c 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -7,10 +7,10 @@ --#{$prefix}btn-padding-x: #{$btn-padding-x}; --#{$prefix}btn-padding-y: #{$btn-padding-y}; --#{$prefix}btn-font-family: #{$btn-font-family}; - @include rfs($btn-font-size, --#{$prefix}btn-font-size); + @include rfs($btn-font-size, --#{$prefix}btn-font-size); --#{$prefix}btn-font-weight: #{$btn-font-weight}; --#{$prefix}btn-line-height: #{$btn-line-height}; - --#{$prefix}btn-color: var(--#{$prefix}body-color); + --#{$prefix}btn-color: #{$btn-color}; --#{$prefix}btn-bg: transparent; --#{$prefix}btn-border-width: #{$btn-border-width}; --#{$prefix}btn-border-color: transparent; diff --git a/scss/_variables.scss b/scss/_variables.scss index c20af01c5187..c982daaf03bf 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -801,6 +801,7 @@ $input-btn-border-width: var(--#{$prefix}border-width) !default; // For each of Bootstrap's buttons, define text, background, and border color. // scss-docs-start btn-variables +$btn-color: var(--#{$prefix}body-color)!default; $btn-padding-y: $input-btn-padding-y !default; $btn-padding-x: $input-btn-padding-x !default; $btn-font-family: $input-btn-font-family !default; From b9449ad230b440362489766235d8e97cc38923ff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 2 Mar 2023 10:46:51 -0800 Subject: [PATCH 3/3] Apply suggestions from code review --- scss/_buttons.scss | 2 +- scss/_variables.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/_buttons.scss b/scss/_buttons.scss index 7c46b753e51c..cbc0784a4d9c 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -7,7 +7,7 @@ --#{$prefix}btn-padding-x: #{$btn-padding-x}; --#{$prefix}btn-padding-y: #{$btn-padding-y}; --#{$prefix}btn-font-family: #{$btn-font-family}; - @include rfs($btn-font-size, --#{$prefix}btn-font-size); + @include rfs($btn-font-size, --#{$prefix}btn-font-size); --#{$prefix}btn-font-weight: #{$btn-font-weight}; --#{$prefix}btn-line-height: #{$btn-line-height}; --#{$prefix}btn-color: #{$btn-color}; diff --git a/scss/_variables.scss b/scss/_variables.scss index c982daaf03bf..19d1b6b80c5a 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -801,7 +801,7 @@ $input-btn-border-width: var(--#{$prefix}border-width) !default; // For each of Bootstrap's buttons, define text, background, and border color. // scss-docs-start btn-variables -$btn-color: var(--#{$prefix}body-color)!default; +$btn-color: var(--#{$prefix}body-color) !default; $btn-padding-y: $input-btn-padding-y !default; $btn-padding-x: $input-btn-padding-x !default; $btn-font-family: $input-btn-font-family !default;