diff options
author | Shohei Yoshida <ysds.code@gmail.com> | 2019-05-07 13:01:30 +0300 |
---|---|---|
committer | Martijn Cuppens <martijn.cuppens@gmail.com> | 2019-05-07 13:01:30 +0300 |
commit | dfab49aab7ac4a23139acb25247d7ba06bd9058b (patch) | |
tree | 4c63980d077c828f626d39d2910b2c8c15d80c4a /scss | |
parent | 45a1954740b27a710c7aedd03192aa3c95f435f6 (diff) |
Fix incorrect variable for popover border radius (#28733)
* Use $popover-border-radius
* Move and rename the local $offset-border-width to the global variable
Diffstat (limited to 'scss')
-rw-r--r-- | scss/_popover.scss | 9 | ||||
-rw-r--r-- | scss/_variables.scss | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scss/_popover.scss b/scss/_popover.scss index fe70dd071f..512a25fb39 100644 --- a/scss/_popover.scss +++ b/scss/_popover.scss @@ -22,7 +22,7 @@ display: block; width: $popover-arrow-width; height: $popover-arrow-height; - margin: 0 $border-radius-lg; + margin: 0 $popover-border-radius; &::before, &::after { @@ -62,7 +62,7 @@ left: calc((#{$popover-arrow-height} + #{$popover-border-width}) * -1); width: $popover-arrow-height; height: $popover-arrow-width; - margin: $border-radius-lg 0; // make sure the arrow does not touch the popover's rounded corners + margin: $popover-border-radius 0; // make sure the arrow does not touch the popover's rounded corners &::before { left: 0; @@ -117,7 +117,7 @@ right: calc((#{$popover-arrow-height} + #{$popover-border-width}) * -1); width: $popover-arrow-height; height: $popover-arrow-width; - margin: $border-radius-lg 0; // make sure the arrow does not touch the popover's rounded corners + margin: $popover-border-radius 0; // make sure the arrow does not touch the popover's rounded corners &::before { right: 0; @@ -157,8 +157,7 @@ color: $popover-header-color; background-color: $popover-header-bg; border-bottom: $popover-border-width solid darken($popover-header-bg, 5%); - $offset-border-width: calc(#{$border-radius-lg} - #{$popover-border-width}); - @include border-top-radius($offset-border-width); + @include border-top-radius($popover-inner-border-radius); &:empty { display: none; diff --git a/scss/_variables.scss b/scss/_variables.scss index 9d83f8c615..e2271491d5 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -889,6 +889,7 @@ $popover-max-width: 276px !default; $popover-border-width: $border-width !default; $popover-border-color: rgba($black, .2) !default; $popover-border-radius: $border-radius-lg !default; +$popover-inner-border-radius: calc(#{$popover-border-radius} - #{$popover-border-width}) !default; $popover-box-shadow: 0 .25rem .5rem rgba($black, .2) !default; $popover-header-bg: darken($popover-bg, 3%) !default; |