Skip to content

Popup and tooltip: dimensions in rem and bug fix of arrow placement #23820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
NielsHolt wants to merge 11 commits into from
Closed

Popup and tooltip: dimensions in rem and bug fix of arrow placement #23820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
06b37c2
Test
NielsHolt Sep 1, 2017
dbb4d39
Fix bug in placing popover and its arrow
NielsHolt Sep 1, 2017
851a3ec
Fix bug in placing popover and its arrow
NielsHolt Sep 1, 2017
1fa7116
Merge branch 'popup-in-rem' of https://github.com/FCOO/bootstrap into…
NielsHolt Sep 1, 2017
8d01e06
Change sign of scss-variable
NielsHolt Sep 3, 2017
e33bb6e
Change dimension of tooltip from px to rem
NielsHolt Sep 3, 2017
cafb8d7
0.XXrem -> .XXrem
NielsHolt Sep 3, 2017
f8c465c
Typo bugs
NielsHolt Sep 3, 2017
38dbdd8
Merge branch 'v4-dev' into popup-in-rem
NielsHolt Sep 3, 2017
db2f2db
Typo bugs
NielsHolt Sep 3, 2017
e22d0a5
Merge branch 'popup-in-rem' of https://github.com/FCOO/bootstrap into…
NielsHolt Sep 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions scss/_popover.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,14 @@
.arrow {
position: absolute;
display: block;
width: $popover-arrow-width;
height: $popover-arrow-height;
width: calc(2*#{$popover-border-width} + #{$popover-arrow-width});
height: calc(2*#{$popover-border-width} + #{$popover-arrow-height});
}

$popover-arrow-margin: -$popover-arrow-width / 2;
$popover-arrow-before-coor: calc(-#{$popover-arrow-width} - #{$popover-border-width});
$popover-arrow-after-coor: -$popover-arrow-width;

.arrow::before,
.arrow::after {
position: absolute;
Expand All @@ -39,11 +43,11 @@

.arrow::before {
content: "";
border-width: $popover-arrow-outer-width;
border-width: $popover-arrow-width;
}
.arrow::after {
content: "";
border-width: $popover-arrow-outer-width;
border-width: $popover-arrow-width;
}

// Popover directions
Expand All @@ -57,18 +61,17 @@

.arrow::before,
.arrow::after {
margin-left: $popover-arrow-margin;
border-bottom-width: 0;
}

.arrow::before {
bottom: -$popover-arrow-outer-width;
margin-left: -($popover-arrow-outer-width - 5);
bottom: $popover-arrow-before-coor;
border-top-color: $popover-arrow-outer-color;
}

.arrow::after {
bottom: -($popover-arrow-outer-width - 1);
margin-left: -($popover-arrow-outer-width - 5);
bottom: $popover-arrow-after-coor;
border-top-color: $popover-arrow-color;
}
}
Expand All @@ -82,17 +85,17 @@

.arrow::before,
.arrow::after {
margin-top: -($popover-arrow-outer-width - 3);
margin-top: $popover-arrow-margin;
border-left-width: 0;
}

.arrow::before {
left: -$popover-arrow-outer-width;
left: $popover-arrow-before-coor;
border-right-color: $popover-arrow-outer-color;
}

.arrow::after {
left: -($popover-arrow-outer-width - 1);
left: $popover-arrow-after-coor;
border-right-color: $popover-arrow-color;
}
}
Expand All @@ -106,17 +109,17 @@

.arrow::before,
.arrow::after {
margin-left: -($popover-arrow-width - 3);
margin-left: $popover-arrow-margin;
border-top-width: 0;
}

.arrow::before {
top: -$popover-arrow-outer-width;
top: $popover-arrow-before-coor;
border-bottom-color: $popover-arrow-outer-color;
}

.arrow::after {
top: -($popover-arrow-outer-width - 1);
top: $popover-arrow-after-coor;
border-bottom-color: $popover-arrow-color;
}

Expand All @@ -142,17 +145,17 @@

.arrow::before,
.arrow::after {
margin-top: -($popover-arrow-outer-width - 3);
margin-top: $popover-arrow-margin;
border-right-width: 0;
}

.arrow::before {
right: -$popover-arrow-outer-width;
right: $popover-arrow-before-coor;
border-left-color: $popover-arrow-outer-color;
}

.arrow::after {
right: -($popover-arrow-outer-width - 1);
right: $popover-arrow-after-coor;
border-left-color: $popover-arrow-color;
}
}
Expand Down
11 changes: 7 additions & 4 deletions scss/_tooltip.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Base class

.tooltip {
position: absolute;
z-index: $zindex-tooltip;
Expand All @@ -21,14 +22,16 @@
height: $tooltip-arrow-height;
}

$tooltip-arrow-margin: -$tooltip-arrow-width / 2;

&.bs-tooltip-top {
padding: $tooltip-arrow-width 0;
.arrow {
bottom: 0;
}

.arrow::before {
margin-left: -($tooltip-arrow-width - 2);
margin-left: $tooltip-arrow-margin;
content: "";
border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
border-top-color: $tooltip-arrow-color;
Expand All @@ -41,7 +44,7 @@
}

.arrow::before {
margin-top: -($tooltip-arrow-width - 2);
margin-top: $tooltip-arrow-margin;
content: "";
border-width: $tooltip-arrow-width $tooltip-arrow-width $tooltip-arrow-width 0;
border-right-color: $tooltip-arrow-color;
Expand All @@ -54,7 +57,7 @@
}

.arrow::before {
margin-left: -($tooltip-arrow-width - 2);
margin-left: $tooltip-arrow-margin;
content: "";
border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
border-bottom-color: $tooltip-arrow-color;
Expand All @@ -68,7 +71,7 @@

.arrow::before {
right: 0;
margin-top: -($tooltip-arrow-width - 2);
margin-top: $tooltip-arrow-margin;
content: "";
border-width: $tooltip-arrow-width 0 $tooltip-arrow-width $tooltip-arrow-width;
border-left-color: $tooltip-arrow-color;
Expand Down
27 changes: 13 additions & 14 deletions scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,40 +608,39 @@ $tooltip-max-width: 200px !default;
$tooltip-color: $white !default;
$tooltip-bg: $black !default;
$tooltip-opacity: .9 !default;
$tooltip-padding-y: 3px !default;
$tooltip-padding-x: 8px !default;
$tooltip-padding-y: .1875rem !default;
$tooltip-padding-x: .5rem !default;
$tooltip-margin: 0 !default;


$tooltip-arrow-width: 5px !default;
$tooltip-arrow-height: 5px !default;
$tooltip-arrow-width: .3125rem !default;
$tooltip-arrow-height: .3125rem !default;
$tooltip-arrow-color: $tooltip-bg !default;


// Popovers

$popover-inner-padding: 1px !default;
$popover-inner-padding: .0625rem !default;
$popover-bg: $white !default;
$popover-max-width: 276px !default;
$popover-border-width: $border-width !default;
$popover-border-color: rgba($black,.2) !default;
$popover-box-shadow: 0 5px 10px rgba($black,.2) !default;
$popover-box-shadow: 0 .3125rem .625rem rgba($black,.2) !default;

$popover-header-bg: darken($popover-bg, 3%) !default;
$popover-header-color: $headings-color !default;
$popover-header-padding-y: 8px !default;
$popover-header-padding-x: 14px !default;
$popover-header-padding-y: .5rem !default;
$popover-header-padding-x: .875rem !default;

$popover-body-color: $body-color !default;
$popover-body-padding-y: 9px !default;
$popover-body-padding-x: 14px !default;
$popover-body-padding-y: .5625rem !default;
$popover-body-padding-x: .875rem !default;

$popover-arrow-width: 10px !default;
$popover-arrow-height: 5px !default;
$popover-arrow-width: .8rem !default;
$popover-arrow-height: .4rem !default;
$popover-arrow-color: $popover-bg !default;

$popover-arrow-outer-width: ($popover-arrow-width + 1px) !default;
$popover-arrow-outer-color: fade-in($popover-border-color, .05) !default;
$popover-arrow-outer-color: fade-in($popover-border-color, .05) !default;


// Badges
Expand Down