From b37448b0f17e0dc3bab0adb47c52295b5982eb57 Mon Sep 17 00:00:00 2001 From: Nikolay Evseev Date: Wed, 28 Jun 2023 17:35:51 +0100 Subject: [PATCH] Added missing mixins and removed obsolete parameter - added mixins missing in _hover.scss - removed line height parameter from button-size mixin includes --- src/assets/scss/core/_buttons.scss | 4 ++-- src/assets/scss/core/mixins/_hover.scss | 27 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/assets/scss/core/_buttons.scss b/src/assets/scss/core/_buttons.scss index 489a4d78..2ea3070f 100644 --- a/src/assets/scss/core/_buttons.scss +++ b/src/assets/scss/core/_buttons.scss @@ -71,11 +71,11 @@ // Size variations &.btn-lg, .btn-group-lg & { - @include button-size($input-btn-padding-y-lg, $input-btn-padding-x-lg, $bmd-btn-font-size, $btn-lg-line-height, $border-radius-sm); + @include button-size($input-btn-padding-y-lg, $input-btn-padding-x-lg, $bmd-btn-font-size, $border-radius-sm); } &.btn-sm, .btn-group-sm & { - @include button-size($input-btn-padding-y-sm, $input-btn-padding-x-sm, $bmd-btn-font-size-sm, $line-height-sm, $border-radius-sm); + @include button-size($input-btn-padding-y-sm, $input-btn-padding-x-sm, $bmd-btn-font-size-sm, $border-radius-sm); } &.btn-round { diff --git a/src/assets/scss/core/mixins/_hover.scss b/src/assets/scss/core/mixins/_hover.scss index b3bf2e17..9f84654c 100644 --- a/src/assets/scss/core/mixins/_hover.scss +++ b/src/assets/scss/core/mixins/_hover.scss @@ -1,3 +1,30 @@ +@mixin hover() { + &:hover { @content; } +} + +@mixin hover-focus() { + &:hover, + &:focus { + @content; + } +} + +@mixin plain-hover-focus() { + &, + &:hover, + &:focus { + @content; + } +} + +@mixin hover-focus-active() { + &:hover, + &:focus, + &:active { + @content; + } +} + @mixin bmd-hover-focus-active { // add the .active to the whole mix of hover-focus-active &.active {