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

[OUDS] Css: drop deprecated Boosted variables and change deprecated comments #2638

Merged
merged 4 commits into from
Jul 23, 2024
Merged

[OUDS] Css: drop deprecated Boosted variables and change deprecated comments #2638

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48453d7
css: drop deprecated Boosted variables and change deprecated comments
julien-deramond Jul 22, 2024
c040542
.
julien-deramond Jul 22, 2024
e5935cb
.
julien-deramond Jul 23, 2024
29c5986
Merge branch 'ouds/main' into ouds/main-drop-deprecate-sass-variables
julien-deramond Jul 23, 2024
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
4 changes: 2 additions & 2 deletions js/src/scrollspy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ const SELECTOR_DROPDOWN = '.dropdown'
const SELECTOR_DROPDOWN_TOGGLE = '.dropdown-toggle'

const Default = {
offset: null, // TODO: v6 @deprecated, keep it for backwards compatibility reasons
offset: null, // TODO: Bootstrap v6 @deprecated, keep it for backwards compatibility reasons
rootMargin: '0px 0px -25%',
smoothScroll: false,
target: null,
threshold: [0.1, 0.5, 1]
}

const DefaultType = {
offset: '(number|null)', // TODO v6 @deprecated, keep it for backwards compatibility reasons
offset: '(number|null)', // TODO Bootstrap v6 @deprecated, keep it for backwards compatibility reasons
rootMargin: 'string',
smoothScroll: 'boolean',
target: 'element',
Expand Down
6 changes: 3 additions & 3 deletions js/src/toast.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const EVENT_SHOW = `show${EVENT_KEY}`
const EVENT_SHOWN = `shown${EVENT_KEY}`

const CLASS_NAME_FADE = 'fade'
const CLASS_NAME_HIDE = 'hide' // @deprecated - kept here only for backwards compatibility
const CLASS_NAME_HIDE = 'hide' // Bootstrap @deprecated - kept here only for backwards compatibility
const CLASS_NAME_SHOW = 'show'
const CLASS_NAME_SHOWING = 'showing'

Expand Down Expand Up @@ -92,7 +92,7 @@ class Toast extends BaseComponent {
this._maybeScheduleHide()
}

this._element.classList.remove(CLASS_NAME_HIDE) // @deprecated
this._element.classList.remove(CLASS_NAME_HIDE) // Bootstrap @deprecated
reflow(this._element)
this._element.classList.add(CLASS_NAME_SHOW, CLASS_NAME_SHOWING)

Expand All @@ -111,7 +111,7 @@ class Toast extends BaseComponent {
}

const complete = () => {
this._element.classList.add(CLASS_NAME_HIDE) // @deprecated
this._element.classList.add(CLASS_NAME_HIDE) // Bootstrap @deprecated
this._element.classList.remove(CLASS_NAME_SHOWING, CLASS_NAME_SHOW)
EventHandler.trigger(this._element, EVENT_HIDDEN)
}
Expand Down
3 changes: 2 additions & 1 deletion scss/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
color: var(--#{$prefix}dropdown-link-color);
}

// Deprecated in v5.3.3
// OUDS mod: deprecated in OUDS Web, kept for Bootstrap compatibility
// Dark dropdowns
.dropdown-menu-dark {
--#{$prefix}dropdown-color: #{$dropdown-dark-color};
Expand All @@ -254,3 +254,4 @@
--#{$prefix}dropdown-link-disabled-color: #{$dropdown-dark-link-disabled-color};
--#{$prefix}dropdown-header-color: #{$dropdown-dark-header-color};
}
// End mod
3 changes: 2 additions & 1 deletion scss/_navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@
@include deprecate("`.navbar-light`", "v5.2.0", "v6.0.0", true);
}

// Deprecated in v5.3.3
// OUDS mod: deprecated in OUDS Web, kept for Bootstrap compatibility
// OUDS mod: no `navbar[data-bs-theme="dark"]` selector
.navbar-dark {
--#{$prefix}navbar-border-color: #{$navbar-dark-border-color}; // OUDS mod
Expand All @@ -557,5 +557,6 @@
--#{$prefix}navbar-toggler-border-color: #{$navbar-dark-toggler-border-color};
// OUDS mod: No --#{$prefix}navbar-toggler-icon-bg: #{escape-svg($navbar-dark-toggler-icon-bg)}; since we handle the variant with filter
}
// End mod

// OUDS mod: no `@if enable-dark-mode`
2 changes: 1 addition & 1 deletion scss/_root.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
--#{$prefix}border-radius-lg: #{$border-radius-lg};
--#{$prefix}border-radius-xl: #{$border-radius-xl};
--#{$prefix}border-radius-xxl: #{$border-radius-xxl};
--#{$prefix}border-radius-2xl: var(--#{$prefix}border-radius-xxl); // Deprecated in v5.3.0 for consistency
--#{$prefix}border-radius-2xl: var(--#{$prefix}border-radius-xxl); // Deprecated in Bootstrap v5.3.0 for consistency
--#{$prefix}border-radius-pill: #{$border-radius-pill};
// scss-docs-end root-border-var

Expand Down
6 changes: 3 additions & 3 deletions scss/_utilities.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,9 +586,9 @@ $utilities: map-merge(
values: map-merge(
$utilities-text-colors,
(
"muted": var(--#{$prefix}secondary-color), // deprecated
"black-50": rgba($black, .5), // deprecated
"white-50": rgba($white, .5), // deprecated
"muted": var(--#{$prefix}secondary-color), // Deprecated in Bootstrap
"black-50": rgba($black, .5), // Deprecated in Bootstrap
"white-50": rgba($white, .5), // Deprecated in Bootstrap
"body-secondary": var(--#{$prefix}secondary-color),
"body-tertiary": var(--#{$prefix}tertiary-color),
"body-emphasis": var(--#{$prefix}emphasis-color),
Expand Down
79 changes: 31 additions & 48 deletions scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,9 +418,6 @@ $svg-as-custom-props: (
//// Filters
// see https://codepen.io/sosuke/pen/Pjoqqp
$invert-filter: invert(1) !default;
// fusv-disable
$orange-filter: invert(46%) sepia(60%) saturate(2878%) hue-rotate(6deg) brightness(98%) contrast(104%) !default; // Deprecated in v5.3.3
// fusv-enable
// End mod

// Options
Expand Down Expand Up @@ -450,12 +447,8 @@ $color-mode-type: data !default; // `data` or `media-query`

// Prefix for :root CSS variables

$variable-prefix: bs- !default; // Deprecated in v5.2.0 for the shorter `$prefix`
$variable-prefix: bs- !default; // Deprecated in Bootstrap v5.2.0 for the shorter `$prefix`
$prefix: $variable-prefix !default;
// fusv-disable
$boosted-variable-prefix: o- !default; // Deprecated in v5.2.0 for the shorter `$prefix`
$boosted-prefix: $boosted-variable-prefix !default; // Deprecated in v5.3.0 for the shorter `$prefix`
// fusv-enable

// Gradient
//
Expand Down Expand Up @@ -642,12 +635,7 @@ $border-radius-xxl: 2rem !default;
$border-radius-pill: 50rem !default;
// scss-docs-end border-radius-variables
// fusv-disable
$border-radius-2xl: $border-radius-xxl !default; // Deprecated in v5.3.0
// fusv-enable

// fusv-disable
$outline-width: var(--#{$prefix}border-width) !default; // Deprecated in v5.2.3
$outline-offset: $outline-width !default; // Deprecated in v5.2.3
$border-radius-2xl: $border-radius-xxl !default; // Deprecated in Bootstrap v5.3.0
// fusv-enable

// scss-docs-start focus-visible-variables
Expand Down Expand Up @@ -826,7 +814,7 @@ $small-font-size: .875rem !default;
$sub-sup-font-size: .75em !default;

// fusv-disable
$text-muted: var(--#{$prefix}secondary-color) !default; // Deprecated in 5.3.0
$text-muted: var(--#{$prefix}secondary-color) !default; // Deprecated in Bootstrap 5.3.0
// fusv-enable

$initialism-font-size: $small-font-size !default;
Expand All @@ -842,8 +830,8 @@ $hr-margin-y: $spacer !default;
$hr-color: inherit !default;

// fusv-disable
$hr-bg-color: null !default; // Deprecated in v5.2.0
$hr-height: null !default; // Deprecated in v5.2.0
$hr-bg-color: null !default; // Deprecated in Bootstrap v5.2.0
$hr-height: null !default; // Deprecated in Bootstrap v5.2.0
// fusv-enable

$hr-border-color: null !default; // Allows for inherited colors
Expand Down Expand Up @@ -948,7 +936,11 @@ $input-btn-focus-width: $focus-visible-outer-offset !default; // OUDS mod:
// OUDS mod: no `$input-btn-focus-color-opacity`
// OUDS mod: no `$input-btn-focus-color`
// OUDS mod: no `$input-btn-focus-blur`
// OUDS mod: deprecated in OUDS Web, kept for Bootstrap compatibility
// fusv-disable
$input-btn-focus-box-shadow: $focus-ring-box-shadow !default;
// fusv-enable
// End mod

$input-btn-padding-y-sm: $spacer * .25 !default;
$input-btn-padding-x-sm: $spacer * .5 !default;
Expand Down Expand Up @@ -1228,13 +1220,6 @@ $form-star-rating-checked-icon: escape-svg(url("data:image/svg+xml,<svg
$form-star-rating-unchecked-icon: escape-svg(url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 25 25'><path fill='transparent' stroke='#{$black}' d='m12.5 4.523 2.016 6.227 6.542-.005-5.296 3.843 2.027 6.224L12.5 16.96l-5.289 3.852 2.027-6.224-5.296-3.843 6.542.005L12.5 4.523Z'/></svg>")) !default;
$form-star-rating-sm-checked-icon: escape-svg(url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'><path fill='#{$black}' stroke='#{$black}' d='M10 3.943 11.54 8.7l4.998-.004-4.046 2.936 1.548 4.755L10 13.444l-4.04 2.943 1.548-4.755-4.046-2.936L8.46 8.7 10 3.943Z'/></svg>")) !default;
$form-star-rating-sm-unchecked-icon: escape-svg(url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'><path fill='transparent' stroke='#{$black}' d='M10 3.943 11.54 8.7l4.998-.004-4.046 2.936 1.548 4.755L10 13.444l-4.04 2.943 1.548-4.755-4.046-2.936L8.46 8.7 10 3.943Z'/></svg>")) !default;
//fusv-disable
$form-star-focus-color: $black !default; // Deprecated in v5.2.3
$form-star-focus-outline: var(--#{$prefix}border-width) solid $form-star-focus-color !default; // Deprecated in v5.2.3
$form-star-focus-color-dark: $white !default; // Deprecated in v5.2.3
$form-star-focus-outline-dark: var(--#{$prefix}border-width) solid $form-star-focus-color-dark !default; // Deprecated in v5.2.3
$form-star-focus-box-shadow: $input-btn-focus-box-shadow !default; // Deprecated in v5.2.3
//fusv-enable

// End mod
// scss-docs-end form-check-variables
Expand Down Expand Up @@ -1366,10 +1351,12 @@ $form-file-button-hover-bg: var(--#{$prefix}secondary-bg) !default;
$form-feedback-margin-top: $form-text-margin-top !default;
$form-feedback-font-size: $small-font-size !default;
$form-feedback-font-style: null !default;
// OUDS mod: deprecated in OUDS Web, kept for Bootstrap compatibility
// fusv-disable
$form-feedback-valid-color: $success !default; // OUDS mod: deprecated in v5.3.0
$form-feedback-invalid-color: $danger !default; // OUDS mod: deprecated in v5.3.0
$form-feedback-valid-color: $success !default;
$form-feedback-invalid-color: $danger !default;
// fusv-enable
// End mod

$form-feedback-icon-valid: var(--#{$prefix}success-icon) !default;
$form-feedback-icon-invalid: var(--#{$prefix}error-icon) !default;
Expand Down Expand Up @@ -1569,7 +1556,7 @@ $navbar-badge-margin-top: .375rem !default;
// scss-docs-end orange-navbar-variables
// End mod

// Deprecated in v5.3.3: all `$navbar-dark-*`
// OUDS mod: deprecated all `$navbar-dark-*` in OUDS Web, kept for Bootstrap compatibility
$navbar-dark-border-color: $gray-700 !default; // OUDS mod
$navbar-dark-color: $white !default; // OUDS mod: instead of `rgba($white, .55)`
$navbar-dark-hover-color: $supporting-orange !default; // OUDS mod: instead of `rgba($white, .75)`
Expand All @@ -1580,7 +1567,7 @@ $navbar-dark-disabled-color: $gray-700 !default; // OUDS mod: instead of
$navbar-dark-toggler-border-color: transparent !default; // OUDS mod: instead of `rgba($white, .1)`
$navbar-dark-brand-color: inherit !default; // OUDS mod: instead of `$navbar-dark-active-color`
$navbar-dark-brand-hover-color: $navbar-dark-active-color !default;

// End mod

// Dropdowns
//
Expand Down Expand Up @@ -1619,11 +1606,11 @@ $dropdown-header-color: null !default; // OUDS mod: instead of `$gra
$dropdown-header-padding-x: $dropdown-item-padding-x !default;
$dropdown-header-padding-y: $spacer !default; // OUDS mod: instead of `$dropdown-padding-y`
// fusv-disable
$dropdown-header-padding: $dropdown-header-padding-y $dropdown-header-padding-x !default; // Deprecated in v5.2.0
$dropdown-header-padding: $dropdown-header-padding-y $dropdown-header-padding-x !default; // Deprecated in Bootstrap v5.2.0
// fusv-enable
// scss-docs-end dropdown-variables

// Deprecated in v5.3.3: all `$dropdown-dark-*`
// OUDS mod: deprecated all `$dropdown-dark-*` in OUDS Web, kept for Bootstrap compatibility
$dropdown-dark-color: $white !default; // OUDS mod
$dropdown-dark-bg: $black !default; // OUDS mod
$dropdown-dark-border-color: $gray-700 !default; // OUDS mod
Expand All @@ -1636,6 +1623,7 @@ $dropdown-dark-link-active-color: $black !default; // OUDS mod
$dropdown-dark-link-active-bg: $white !default; // OUDS mod
$dropdown-dark-link-disabled-color: $gray-700 !default; // OUDS mod
$dropdown-dark-header-color: $white !default; // OUDS mod
// End mod

// Pagination

Expand All @@ -1658,13 +1646,14 @@ $pagination-margin-start: 0 !default; // OUDS mod: instead of `calc($p
$pagination-margin-x-first-last: $spacer * .5 !default; // OUDS mod
$pagination-border-color: transparent !default; // OUDS mod: instead of `var(--#{$prefix}border-color)`

// Deprecated in v5.3.3
// OUDS mod: deprecated all `$pagination-focus-*` in OUDS Web, kept for Bootstrap compatibility
// fusv-disable
$pagination-focus-color: null !default; // OUDS mod
$pagination-focus-bg: null !default; // OUDS mod: instead of `var(--#{$prefix}secondary-bg)`
$pagination-focus-box-shadow: 0 0 0 $focus-visible-inner-width var(--#{$prefix}focus-visible-inner-color) !default; // OUDS mod: no `$focus-ring-box-shadow`
$pagination-focus-outline: null !default; // OUDS mod
// fusv-enable
// End mod

$pagination-hover-color: var(--#{$prefix}body-color) !default; // OUDS mod: instead of `var(--#{$prefix}link-hover-color)`
$pagination-hover-bg: var(--#{$prefix}secondary-bg) !default; // OUDS mod: instead of `var(--#{$prefix}tertiary-bg)`
Expand Down Expand Up @@ -1709,9 +1698,11 @@ $placeholder-opacity-min: .2 !default;
// scss-docs-start card-variables
$card-spacer-top: $spacer * .75 !default; // OUDS mod
$card-spacer-bottom: $spacer !default; // OUDS mod
// OUDS mod: deprecated in OUDS Web, kept for Bootstrap compatibility
// fusv-disable
$card-spacer-y: $spacer !default; // Deprecated in v5.2.3
$card-spacer-y: $spacer !default;
// fusv-enable
// End mod
$card-spacer-x: $spacer !default;
$card-title-spacer-y: $spacer * .5 !default;
$card-title-color: null !default;
Expand Down Expand Up @@ -1751,10 +1742,12 @@ $accordion-body-padding-top: $spacer !default; // OUDS mod
$accordion-body-padding-end: 0 !default; // OUDS mod
$accordion-body-padding-bottom: $spacer * 1.5 !default; // OUDS mod
$accordion-body-padding-start: 0 !default; // OUDS mod
// OUDS mod: deprecated in OUDS Web, kept for Bootstrap compatibility
// fusv-disable
$accordion-body-padding-y: $spacer !default; // Deprecated in Boosted 5.2.3 to divide it in -padding<top | end | bottom |start>
$accordion-body-padding-x: $spacer !default; // Deprecated in Boosted 5.2.3 to divide it in -padding<top | end | bottom |start>
$accordion-body-padding-y: $spacer !default; // Deprecated in OUDS Web to divide it in -padding<top | end | bottom |start>
$accordion-body-padding-x: $spacer !default; // Deprecated in OUDS Web to divide it in -padding<top | end | bottom |start>
// fusv-enable
// End mod

$accordion-button-padding-y: $accordion-padding-y !default;
$accordion-button-padding-x: $accordion-padding-x !default;
Expand Down Expand Up @@ -1812,7 +1805,7 @@ $tooltip-margin: null !default; // TODO: remove this in v6
$tooltip-arrow-width: $spacer * .5 !default;
$tooltip-arrow-height: $tooltip-arrow-width * .5 !default;
// fusv-disable
$tooltip-arrow-color: null !default; // Deprecated in Boosted 5.2.0 for CSS variables
$tooltip-arrow-color: null !default; // Deprecated in Bootstrap 5.2.0 for CSS variables
// fusv-enable
// scss-docs-end tooltip-variables

Expand Down Expand Up @@ -2091,10 +2084,6 @@ $title-bar-letter-spacing-md: $display2-spacing !default;

$title-bar-font-size-xl: $display1-size !default;
$title-bar-letter-spacing-xl: $display1-spacing !default;

// fusv-disable
$title-bar-border-color-dark: $gray-700 !default; // Deprecated in v5.3.3
// fusv-enable
// scss-docs-end title-bars-variables
// End mod

Expand Down Expand Up @@ -2208,9 +2197,9 @@ $btn-close-border-width: var(--#{$prefix}border-width) !default; // OUDS
$btn-close-border-color: transparent !default; // OUDS mod
$btn-close-color: var(--#{$prefix}emphasis-color) !default;
$btn-close-bg: var(--#{$prefix}close-icon) !default; // OUDS mod
// OUDS mod
// OUDS mod: deprecated in OUDS Web, kept for Bootstrap compatibility
// fusv-disable
$btn-close-focus-shadow: $btn-focus-box-shadow !default; // Deprecated in v5.3.0
$btn-close-focus-shadow: $btn-focus-box-shadow !default;
// fusv-enable
// End mod

Expand Down Expand Up @@ -2255,7 +2244,7 @@ $kbd-padding-x: $spacer * .05 !default;
$kbd-font-size: $code-font-size !default;
$kbd-color: var(--#{$prefix}kbd-color, $black) !default;
$kbd-bg: var(--#{$prefix}kbd-bg, $gray-300) !default;
$nested-kbd-font-weight: null !default; // Deprecated in v5.2.0, removing in v6
$nested-kbd-font-weight: null !default; // Deprecated in Bootstrap v5.2.0, removing in v6

$pre-color: var(--#{$prefix}code-color) !default;
$pre-line-height: 1.25 !default;
Expand Down Expand Up @@ -2297,9 +2286,6 @@ $stepped-process-counter: step !default; // Used as a counter name
$stepped-process-bg: var(--#{$prefix}body-bg) !default;

$step-item-padding: 7px !default;
// fusv-disable
$step-item-padding-end: $step-item-padding * 2 !default; // Deprecated in v5.2.0
// fusv-enable
$step-item-margin-end: var(--#{$prefix}border-width) !default;
$step-item-bg: var(--#{$prefix}secondary) !default;
$step-item-active-bg: $supporting-orange !default;
Expand Down Expand Up @@ -2380,9 +2366,6 @@ $footer-letter-spacing: $letter-spacing-base !default;
$footer-accordion-line-height: $spacer * 1.45 !default;
$footer-accordion-active-color: var(--#{$prefix}primary) !default;
$footer-accordion-btn-hover-bg: null !default;
// fusv-disable
$footer-nav-link-font-weight: $font-weight-bold !default; // Deprecated in v5.3.3
// fusv-enable

$footer-title-content-padding-top: $spacer * 1.25 !default;
$footer-title-content-padding-bottom: $spacer * 1.45 !default;
Expand Down
Loading
Loading