Skip to content

Commit

Permalink
Adding @include everytime it's not the case
Browse files Browse the repository at this point in the history
  • Loading branch information
louismaximepiton authored and mdo committed Mar 31, 2022
1 parent 8006203 commit 00d028e
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion scss/_badge.scss
Expand Up @@ -17,7 +17,7 @@

display: inline-block;
padding: var(--#{$prefix}badge-padding-y) var(--#{$prefix}badge-padding-x);
font-size: var(--#{$prefix}badge-font-size);
@include font-size(var(--#{$prefix}badge-font-size));
font-weight: var(--#{$prefix}badge-font-weight);
line-height: 1;
color: var(--#{$prefix}badge-color);
Expand Down
3 changes: 1 addition & 2 deletions scss/_breadcrumb.scss
Expand Up @@ -17,8 +17,7 @@
flex-wrap: wrap;
padding: var(--#{$prefix}breadcrumb-padding-y) var(--#{$prefix}breadcrumb-padding-x);
margin-bottom: var(--#{$prefix}breadcrumb-margin-bottom);
@include font-size($breadcrumb-font-size);
font-size: var(--#{$prefix}breadcrumb-font-size);
@include font-size(var(--#{$prefix}breadcrumb-font-size));
list-style: none;
background-color: var(--#{$prefix}breadcrumb-bg);
@include border-radius(var(--#{$prefix}breadcrumb-border-radius));
Expand Down
2 changes: 1 addition & 1 deletion scss/_buttons.scss
Expand Up @@ -25,7 +25,7 @@
display: inline-block;
padding: var(--#{$prefix}btn-padding-y) var(--#{$prefix}btn-padding-x);
font-family: var(--#{$prefix}btn-font-family);
font-size: var(--#{$prefix}btn-font-size);
@include font-size(var(--#{$prefix}btn-font-size));
font-weight: var(--#{$prefix}btn-font-weight);
line-height: var(--#{$prefix}btn-line-height);
color: var(--#{$prefix}btn-color);
Expand Down
2 changes: 1 addition & 1 deletion scss/_pagination.scss
Expand Up @@ -32,7 +32,7 @@
position: relative;
display: block;
padding: var(--#{$prefix}pagination-padding-y) var(--#{$prefix}pagination-padding-x);
font-size: var(--#{$prefix}pagination-font-size);
@include font-size(var(--#{$prefix}pagination-font-size));
color: var(--#{$prefix}pagination-color);
text-decoration: if($link-decoration == none, null, none);
background-color: var(--#{$prefix}pagination-bg);
Expand Down
2 changes: 1 addition & 1 deletion scss/_popover.scss
Expand Up @@ -31,7 +31,7 @@
// 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.
@include reset-text();
font-size: var(--#{$prefix}popover-font-size);
@include font-size(var(--#{$prefix}popover-font-size));
// Allow breaking very long words so they don't overflow the popover's bounds
word-wrap: break-word;
background-color: var(--#{$prefix}popover-bg);
Expand Down
4 changes: 2 additions & 2 deletions scss/_reboot.scss
Expand Up @@ -27,7 +27,7 @@

:root {
@if $font-size-root != null {
font-size: var(--#{$prefix}root-font-size);
@include font-size(var(--#{$prefix}root-font-size));
}

@if $enable-smooth-scroll {
Expand All @@ -49,7 +49,7 @@
body {
margin: 0; // 1
font-family: var(--#{$prefix}body-font-family);
font-size: var(--#{$prefix}body-font-size);
@include font-size(var(--#{$prefix}body-font-size));
font-weight: var(--#{$prefix}body-font-weight);
line-height: var(--#{$prefix}body-line-height);
color: var(--#{$prefix}body-color);
Expand Down

0 comments on commit 00d028e

Please sign in to comment.