Skip to content

Commit

Permalink
Bring small tweaks to the CSS
Browse files Browse the repository at this point in the history
  • Loading branch information
louismaximepiton committed Oct 23, 2024
1 parent a176a90 commit ce4bb27
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
3 changes: 2 additions & 1 deletion scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -562,8 +562,9 @@ $grid-breakpoints: (
) !default;
// scss-docs-end grid-breakpoints

// This weird change is here to have the map in the correct ascending order for the checks right after.
// This change implies that the `$enbale-bootstrap-compatibility` is set before the import of this file.
@if $enable-bootstrap-compatibility {
// Copy 2xl breakpoint into xxl breakpoint
$breakpoint-2xl: map-get($grid-breakpoints, 2xl);
$breakpoint-3xl: map-get($grid-breakpoints, 3xl);
$grid-breakpoints: map-remove($grid-breakpoints, 2xl, 3xl);
Expand Down
3 changes: 1 addition & 2 deletions scss/mixins/_container.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

// scss-docs-start container-mixins
@mixin make-container($gutter: $container-padding-x) {
--#{$prefix}gutter-x: #{$gutter};
--#{$prefix}gutter-y: 0;
// OUDS mod: no gutter definition inside containers
width: 100%;
padding-right: var(--#{$prefix}container-margin-x); // OUDS mod: instead of `calc(var(--#{$prefix}gutter-x) * .5)`
padding-left: var(--#{$prefix}container-margin-x); // OUDS mod: instead of `calc(var(--#{$prefix}gutter-x) * .5)`
Expand Down
4 changes: 2 additions & 2 deletions scss/mixins/_grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,12 @@
@each $key, $value in $gutters {
.g#{$infix}-#{$key},
.gx#{$infix}-#{$key} {
--#{$prefix}gutter-x: #{$value};
--#{$prefix}gutter-x: #{$value} if($enable-important-utilities, !important, null);
}

.g#{$infix}-#{$key},
.gy#{$infix}-#{$key} {
--#{$prefix}gutter-y: #{$value};
--#{$prefix}gutter-y: #{$value} if($enable-important-utilities, !important, null);
}
}
}
Expand Down

0 comments on commit ce4bb27

Please sign in to comment.