From 11ceaf8416ec7c91cd39086d5b631171000b72ca Mon Sep 17 00:00:00 2001 From: Ghazal Salehi Date: Wed, 29 Mar 2023 10:18:10 +1000 Subject: [PATCH] QOLDEV-34 Removing boxshadow and applying 4px border-radius for focused primary button --- .../_project/_blocks/components/buttons/_qg-buttons.scss | 2 +- src/assets/_project/_blocks/scss-general/_qg-variables.scss | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/assets/_project/_blocks/components/buttons/_qg-buttons.scss b/src/assets/_project/_blocks/components/buttons/_qg-buttons.scss index c5a6eaee3..a5f14b752 100644 --- a/src/assets/_project/_blocks/components/buttons/_qg-buttons.scss +++ b/src/assets/_project/_blocks/components/buttons/_qg-buttons.scss @@ -74,7 +74,7 @@ .qg-btn { @extend .btn; - @include qg-button-outline-decoration; + @include qg-button-outline-decoration($border-radius: $btn-border-radius-base); border-radius: $btn-border-radius-base; &.btn-outline-dark{ diff --git a/src/assets/_project/_blocks/scss-general/_qg-variables.scss b/src/assets/_project/_blocks/scss-general/_qg-variables.scss index feea9fc21..7da5c6d13 100644 --- a/src/assets/_project/_blocks/scss-general/_qg-variables.scss +++ b/src/assets/_project/_blocks/scss-general/_qg-variables.scss @@ -343,14 +343,15 @@ $qg-linkedin: #0077b5; $text-underline-offset: 5px; -@mixin qg-button-outline-decoration($margin: 2px, $outline-color: $qg-active-outline) { +@mixin qg-button-outline-decoration($margin: 2px, $outline-color: $qg-active-outline, $border-radius: 0) { // Surround buttons and links with a blue outline when active/focused @include on-active { outline-width: 3px; outline-style: solid; outline-color: $outline-color; outline-offset: 2px; - border-radius: 0; + border-radius: $border-radius; + box-shadow: none; @content; * { // don't apply an extra outline to any children