Skip to content
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

chore(merge): fc3f4b6 #1757

Merged
merged 32 commits into from
Jan 12, 2023
Merged

chore(merge): fc3f4b6 #1757

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
fd5a983
chore(merge): fc3f4b6
julien-deramond Jan 3, 2023
fcd93a9
Remove useless comment in list-group.scss
julien-deramond Jan 9, 2023
e72e0bb
Add Boosted mod in list-group.scss
julien-deramond Jan 9, 2023
fd58df1
Change --bd-callout-bg
julien-deramond Jan 9, 2023
e35b062
.
julien-deramond Jan 9, 2023
1130bb1
Update site/assets/scss/_callouts.scss
julien-deramond Jan 10, 2023
2f29505
Fix switch rendering
julien-deramond Jan 10, 2023
7659e56
Move callout in utilities/background.md
julien-deramond Jan 10, 2023
1c533b5
Merge branch 'main' into main-jd-chore-merge-fc3f4b6
julien-deramond Jan 10, 2023
dcb0585
Update comments for .highlight-toolbar
julien-deramond Jan 10, 2023
a624a5d
Attempt to fix pa11y-ci
julien-deramond Jan 10, 2023
9d43843
Fix .alert-link
julien-deramond Jan 11, 2023
16d0b84
Fix missing stuff in toasts.md
julien-deramond Jan 11, 2023
7b8e9b1
Replace map-get(border-width, 1) by 1px in assets/scss/_component-exa…
julien-deramond Jan 11, 2023
0e7754d
Reintroduce '// Prevent breaking of code' comment
julien-deramond Jan 11, 2023
b47a7bf
Enhance data-bs-theme='blue' example
julien-deramond Jan 11, 2023
5eb92ac
Add // Boosted mod to .bi in assets/scss/_content.scss
julien-deramond Jan 11, 2023
baf4903
Replace --{prefix} by --bs- in assets/scss/_content.scss
julien-deramond Jan 11, 2023
c5d4b02
Replace --{prefix} by --bs- in assets/scss/_navbar.scss
julien-deramond Jan 11, 2023
a543691
Added a Boosted mod to keep the default behavior in assets/scss/_side…
julien-deramond Jan 11, 2023
8a0e7b0
Simplified .bd-links-link color rules
julien-deramond Jan 11, 2023
9a535e6
Display all bg-* utilities unitary
julien-deramond Jan 11, 2023
7b9e846
Remove unused contrast_color from theme-colors.yml
julien-deramond Jan 11, 2023
4b7d435
.
julien-deramond Jan 11, 2023
74dc528
Handle the theme icons slightly differently
louismaximepiton Jan 12, 2023
16ba1ab
Use `--bs-body-bg` instead of the tertiary bg
louismaximepiton Jan 12, 2023
895e9f8
Better flexibility of the border-radius in pagination
louismaximepiton Jan 12, 2023
41495d7
Change progress bg
louismaximepiton Jan 12, 2023
4fba83b
Update migration guide
julien-deramond Jan 12, 2023
a3fe190
Fix generate-utility
julien-deramond Jan 12, 2023
a24b197
Fix bundlewatch
julien-deramond Jan 12, 2023
ff9df99
Reorder alphabetically vars in migration guide
julien-deramond Jan 12, 2023
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
16 changes: 8 additions & 8 deletions .bundlewatch.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,35 @@
"files": [
{
"path": "./dist/css/boosted-grid.css",
"maxSize": "11.75 kB"
"maxSize": "12.75 kB"
},
{
"path": "./dist/css/boosted-grid.min.css",
"maxSize": "10.75 kB"
"maxSize": "11.75 kB"
},
{
"path": "./dist/css/boosted-reboot.css",
"maxSize": "3.75 kB"
"maxSize": "4.5 kB"
},
{
"path": "./dist/css/boosted-reboot.min.css",
"maxSize": "3.75 kB"
"maxSize": "4.25 kB"
},
{
"path": "./dist/css/boosted-utilities.css",
"maxSize": "10.5 kB"
"maxSize": "11.5 kB"
},
{
"path": "./dist/css/boosted-utilities.min.css",
"maxSize": "9.75 kB"
"maxSize": "10.5 kB"
},
{
"path": "./dist/css/boosted.css",
"maxSize": "39.75 kB"
"maxSize": "41.0 kB"
},
{
"path": "./dist/css/boosted.min.css",
"maxSize": "36.75 kB"
"maxSize": "38.0 kB"
},
{
"path": "./dist/js/boosted.bundle.js",
Expand Down
2 changes: 2 additions & 0 deletions scss/_accordion.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@

// Boosted mod: no Flush accordion items

// Boosted mod: no `@if enable-dark-mode` since Boosted doesn't have any dark mode for now

//
// Boosted mod:
// - Sizes
Expand Down
13 changes: 7 additions & 6 deletions scss/_alert.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
--#{$prefix}alert-border-color: transparent;
--#{$prefix}alert-border: #{$alert-border-width} solid var(--#{$prefix}alert-border-color);
--#{$prefix}alert-border-radius: #{$alert-border-radius};
--#{$prefix}alert-link-color: inherit;
--#{$prefix}alert-logo-size: #{$alert-logo-size}; // Boosted mod
--#{$prefix}alert-icon-size: #{$alert-icon-size}; // Boosted mod
--#{$prefix}alert-icon-margin-y: #{$alert-icon-margin-y}; // Boosted mod
Expand Down Expand Up @@ -50,6 +51,7 @@
// Provide class for links that match alerts
.alert-link {
font-weight: var(--#{$prefix}alert-link-font-weight); // Boosted mod
color: var(--#{$prefix}alert-link-color);
louismaximepiton marked this conversation as resolved.
Show resolved Hide resolved
}


Expand All @@ -75,13 +77,11 @@
// Generate contextual modifier classes for colorizing the alert.

@each $state, $value in $alert-colors {
$alert-background: transparent; // Boosted mod
$alert-border: $alert-border-width solid $value; // Boosted mod
// Boosted mod: no $alert-color change

// Boosted mod: no contrast-ratio test
.alert-#{$state} {
@include alert-variant($alert-background, $alert-border, $alert-color, map-get($alert-icons, $state)); // Boosted mod
--#{$prefix}alert-color: var(--#{$prefix}#{$state}-text);
--#{$prefix}alert-border-color: var(--#{$prefix}#{$state}-border-subtle);
--#{$prefix}alert-link-color: var(--#{$prefix}#{$state}-text);
--#{$prefix}alert-icon-bg-image: #{map-get($alert-icons, $state)}; // Boosted mod
}
}
// scss-docs-end alert-modifiers
Expand Down Expand Up @@ -118,6 +118,7 @@
order: -1;
height: var(--#{$prefix}alert-logo-size);
content: "";
background-image: var(--#{$prefix}alert-icon-bg-image);
background-repeat: no-repeat;

/* rtl:raw:
Expand Down
2 changes: 1 addition & 1 deletion scss/_carousel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
background-color: color-contrast($carousel-caption-color); // Boosted mod: ensure contrast
}

// Boosted mod: no dark carousel
// Boosted mod: no dark carousel nor carousel in dark mode since Boosted doesn't have any dark mode for now

// Boosted mod: play/pause button
.carousel-control-play-pause {
Expand Down
4 changes: 3 additions & 1 deletion scss/_close.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@
}
}

// Boosted mod: changing color instead of using filter
// Boosted mod:
// - no dark mode management so we keep our .btn-close-white
// - changing color instead of using filter
.btn-close-white {
// scss-docs-start btn-close-white-css-vars
--#{$prefix}btn-close-color: #{$btn-close-white-color}; // Boosted mod
Expand Down
1 change: 1 addition & 0 deletions scss/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@
white-space: nowrap; // prevent links from randomly breaking onto new lines
background-color: transparent; // For `<button>`s
border: 0; // For `<button>`s
@include border-radius(var(--#{$prefix}dropdown-item-border-radius, 0));

// Boosted mod: no focus
&:hover {
Expand Down
20 changes: 16 additions & 4 deletions scss/_list-group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
--#{$prefix}list-group-item-padding-y: #{$list-group-item-padding-y};
--#{$prefix}list-group-action-color: #{$list-group-action-color};
--#{$prefix}list-group-action-hover-color: #{$list-group-action-hover-color};
// Boosted mod: no --#{$prefix}list-group-action-hover-bg
--#{$prefix}list-group-action-hover-bg: #{$list-group-hover-bg};
--#{$prefix}list-group-action-active-color: #{$list-group-action-active-color};
--#{$prefix}list-group-action-active-bg: #{$list-group-action-active-bg};
--#{$prefix}list-group-disabled-color: #{$list-group-disabled-color};
Expand Down Expand Up @@ -59,7 +59,7 @@
z-index: 1; // Place hover/focus items above their siblings for proper border styling
color: var(--#{$prefix}list-group-action-hover-color);
text-decoration: none;
// Boosted mod: no background-color
background-color: var(--#{$prefix}list-group-action-hover-bg);
}

&:active {
Expand Down Expand Up @@ -197,8 +197,20 @@
//
// Add modifier classes to change text and background color on individual items.
// Organizationally, this must come after the `:hover` states.
@each $color, $value in $background-colors {
@include list-group-item-variant($color, $value, color-contrast($value));
@each $state, $value in $background-colors { // Boosted mod: instead of `@each $state in map-keys($theme-colors)`
.list-group-item-#{$state} {
--#{$prefix}list-group-color: #{color-contrast($value)}; // Boosted mod: instead of `var(--#{$prefix}#{state}-text)`
--#{$prefix}list-group-bg: #{$value}; // Boosted mod: instead of `var(--#{$prefix}#{$state}-bg-subtle)`
// Boosted mod: no `--#{$prefix}list-group-border-color`

&.list-group-item-action {
&:hover { // Boosted mod: no `&:focus`
louismaximepiton marked this conversation as resolved.
Show resolved Hide resolved
--#{$prefix}list-group-action-hover-color: #{color-contrast($value)}; // Boosted mod: instead of `var(--#{$prefix}emphasis-color)`;
--#{$prefix}list-group-action-hover-bg: #{if(color-contrast($value) == $white, shade-color($value, 10%), tint-color($value, 10%))}; // Boosted mod: instead of `var(--#{$prefix}#{state}-border-subtle)`;
}
}
louismaximepiton marked this conversation as resolved.
Show resolved Hide resolved
}
// @include list-group-item-variant($color, $value, color-contrast($value));
louismaximepiton marked this conversation as resolved.
Show resolved Hide resolved
}
// scss-docs-end list-group-modifiers

Expand Down
67 changes: 67 additions & 0 deletions scss/_maps.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,39 @@
$theme-colors-rgb: map-loop($theme-colors, to-rgb, "$value") !default;
// scss-docs-end theme-colors-rgb

$theme-colors-text: (
"primary": $primary-text,
Copy link
Member

@louismaximepiton louismaximepiton Jan 9, 2023 •
edited by julien-deramond
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Bootstrap side] Same modif -> Bs side

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See twbs/bootstrap#37907.

"secondary": $secondary-text,
"success": $success-text,
"info": $info-text,
"warning": $warning-text,
"danger": $danger-text,
"light": $light-text,
"dark": $dark-text,
) !default;

$theme-colors-bg-subtle: (
"primary": $primary-bg-subtle,
"secondary": $secondary-bg-subtle,
"success": $success-bg-subtle,
"info": $info-bg-subtle,
"warning": $warning-bg-subtle,
"danger": $danger-bg-subtle,
"light": $light-bg-subtle,
"dark": $dark-bg-subtle,
) !default;

$theme-colors-border-subtle: (
"primary": $primary-border-subtle,
"secondary": $secondary-border-subtle,
"success": $success-border-subtle,
"info": $info-border-subtle,
"warning": $warning-border-subtle,
"danger": $danger-border-subtle,
"light": $light-border-subtle,
"dark": $dark-border-subtle,
) !default;

// Boosted mod
$background-colors: map-merge(
$theme-colors,
Expand Down Expand Up @@ -36,6 +69,17 @@ $utilities-text: (
"body": to-rgb($body-color),
) !default;
$utilities-text-colors: map-loop($utilities-text, rgba-css-var, "$key", "text") !default;

$utilities-text-emphasis-colors: (
"primary-emphasis": var(--#{$prefix}primary-text),
Copy link
Member

@louismaximepiton louismaximepiton Jan 9, 2023 •
edited by julien-deramond
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Bootstrap side] Why no emphasis inside the variable name ? Bs side, change variables, variables-dark, doc, maps, root

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See twbs/bootstrap#37907.

"secondary-emphasis": var(--#{$prefix}secondary-text),
"success-emphasis": var(--#{$prefix}success-text),
"info-emphasis": var(--#{$prefix}info-text),
"warning-emphasis": var(--#{$prefix}warning-text),
"danger-emphasis": var(--#{$prefix}danger-text),
"light-emphasis": var(--#{$prefix}light-text),
julien-deramond marked this conversation as resolved.
Show resolved Hide resolved
"dark-emphasis": var(--#{$prefix}dark-text)
) !default;
// scss-docs-end utilities-text-colors

// scss-docs-start utilities-bg-colors
Expand All @@ -48,6 +92,18 @@ $utilities-bg: map-merge(
)
) !default;
$utilities-bg-colors: map-loop($utilities-bg, rgba-css-var, "$key", "bg") !default;

$utilities-bg-subtle: (
"primary-subtle": var(--#{$prefix}primary-bg-subtle),
"secondary-subtle": var(--#{$prefix}secondary-bg-subtle),
julien-deramond marked this conversation as resolved.
Show resolved Hide resolved
"success-subtle": var(--#{$prefix}success-bg-subtle),
"info-subtle": var(--#{$prefix}info-bg-subtle),
"warning-subtle": var(--#{$prefix}warning-bg-subtle),
"danger-subtle": var(--#{$prefix}danger-bg-subtle),
"light-subtle": var(--#{$prefix}light-bg-subtle),
"dark-subtle": var(--#{$prefix}dark-bg-subtle)
) !default;
// $utilities-bg-subtle-colors: map-loop($utilities-bg-subtle, rgba-css-var, "$key", "bg") !default;
// scss-docs-end utilities-bg-colors

// scss-docs-start utilities-border-colors
Expand All @@ -60,6 +116,17 @@ $utilities-border: map-merge(
)
) !default;
$utilities-border-colors: map-loop($utilities-border, rgba-css-var, "$key", "border", "$value") !default; // Boosted mod

$utilities-border-subtle: (
"primary-subtle": var(--#{$prefix}primary-border-subtle),
"secondary-subtle": var(--#{$prefix}secondary-border-subtle),
"success-subtle": var(--#{$prefix}success-border-subtle),
"info-subtle": var(--#{$prefix}info-border-subtle),
"warning-subtle": var(--#{$prefix}warning-border-subtle),
"danger-subtle": var(--#{$prefix}danger-border-subtle),
"light-subtle": var(--#{$prefix}light-border-subtle),
"dark-subtle": var(--#{$prefix}dark-border-subtle)
) !default;
// scss-docs-end utilities-border-colors

$negative-spacers: if($enable-negative-margins, negativify-map($spacers), null) !default;
Expand Down
3 changes: 1 addition & 2 deletions scss/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

// Helpers
@import "mixins/breakpoints";
@import "mixins/color-mode";
@import "mixins/color-scheme";
@import "mixins/image";
@import "mixins/resize";
Expand All @@ -22,13 +23,11 @@
@import "mixins/utilities";

// Components
@import "mixins/alert";
@import "mixins/backdrop";
@import "mixins/buttons";
@import "mixins/caret";
@import "mixins/pagination";
@import "mixins/lists";
@import "mixins/list-group";
@import "mixins/forms";
@import "mixins/table-variants";
@import "mixins/star-rating"; // Boosted mod
Expand Down
2 changes: 2 additions & 0 deletions scss/_navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,3 +517,5 @@
--#{$prefix}navbar-toggler-icon-filter: #{$invert-filter}; // Boosted mod
// scss-docs-end navbar-dark-css-vars
}

// Boosted mod: no `@if enable-dark-mode` since Boosted doesn't have any dark mode for now
6 changes: 3 additions & 3 deletions scss/_reboot.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ hr {
font-style: $headings-font-style;
font-weight: $headings-font-weight;
line-height: $headings-line-height;
color: $headings-color;
color: var(--#{$prefix}heading-color, inherit);
Copy link
Member

@louismaximepiton louismaximepiton Jan 9, 2023 •
edited by julien-deramond
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Bootstrap side] Couldn't we initialize this variable to inherit instead of null? Bs side ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See twbs/bootstrap#37904.


/* rtl:remove */
letter-spacing: $letter-spacing-base; // Boosted mod
Expand Down Expand Up @@ -336,11 +336,11 @@ sup { top: -.5em; }
// Links

a {
color: var(--#{$prefix}link-color);
color: rgba(var(--#{$prefix}link-color-rgb), var(--#{$prefix}link-opacity, 1));
Copy link
Member

@louismaximepiton louismaximepiton Jan 9, 2023 •
edited by julien-deramond
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[Bootstrap side] Same question for link-opacity, BS side

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See twbs/bootstrap#37904.

text-decoration: $link-decoration;

&:hover {
color: var(--#{$prefix}link-hover-color);
--#{$prefix}link-color-rgb: var(--#{$prefix}link-hover-color-rgb);
text-decoration: $link-hover-decoration;
}
}
Expand Down
Loading