sharpetronics/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-05-31 00:02:18 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19889 from twbs/v4-popovers

Browse Source 
v4: Couple popover fixes
This commit is contained in:
Mark Otto 2016-05-12 12:54:02 -07:00
commit 9a50b1f04f
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scss/_popover.scss
View File

@ -5,7 +5,7 @@
z-index: $zindex-popover; z-index: $zindex-popover;
display: block; display: block;
max-width: $popover-max-width; max-width: $popover-max-width;
padding: 1px; padding: $popover-inner-padding;
// Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element. // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
// So reset our font and text properties to avoid inheriting weird values. // So reset our font and text properties to avoid inheriting weird values.
@include reset-text(); @include reset-text();
@ -112,6 +112,10 @@
border-bottom: $popover-border-width solid darken($popover-title-bg, 5%); border-bottom: $popover-border-width solid darken($popover-title-bg, 5%);
$offset-border-width: ($border-width / $font-size-root); $offset-border-width: ($border-width / $font-size-root);
@include border-radius(($border-radius-lg - $offset-border-width) ($border-radius-lg - $offset-border-width) 0 0); @include border-radius(($border-radius-lg - $offset-border-width) ($border-radius-lg - $offset-border-width) 0 0);
&:empty {
display: none;
}
} }
.popover-content { .popover-content {

1
scss/_variables.scss
View File

@ -606,6 +606,7 @@ $tooltip-arrow-color: $tooltip-bg !default;
// Popovers // Popovers
$popover-inner-padding: 1px !default;
$popover-bg: #fff !default; $popover-bg: #fff !default;
$popover-max-width: 276px !default; $popover-max-width: 276px !default;
$popover-border-width: $border-width !default; $popover-border-width: $border-width !default;