Skip to content

feat(lib): Remove useless mixin rfs and font-size + remove vendor #3504

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

Open
louismaximepiton wants to merge 6 commits into
base: ouds/main
Choose a base branch
from
Open

feat(lib): Remove useless mixin rfs and font-size + remove vendor #3504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b82c3f
feat(lib): Remove useless mixin rfs and font-size + remove vendor
louismaximepiton Apr 9, 2026
cba159f
fix ci + migrations
louismaximepiton Apr 9, 2026
38becd8
fix review copilot
louismaximepiton Apr 16, 2026
36018d6
fix review
louismaximepiton Apr 27, 2026
641dca9
Merge remote-tracking branch 'origin/ouds/main' into ouds/main-lmp-re…
louismaximepiton Apr 27, 2026
e729c38
.
louismaximepiton Apr 27, 2026
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
1 change: 0 additions & 1 deletion packages/orange-compact/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ authors: "Orange and OUDS Web Orange Compact contributo
current_version: "1.2.0"
current_ruby_version: "1.2.0"
docs_version: "1.2"
rfs_version: "v10.0.0"
bootstrap_current_version: "5.3.6"
bootstrap_docs_version: "5.3"
bootstrap_github_org: "https://github.com/twbs"
Expand Down
2 changes: 0 additions & 2 deletions packages/orange-compact/scss/ouds-web-grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ $include-column-box-sizing: true !default;
@import "@ouds/web-common/scss/mixins/grid";
@import "@ouds/web-common/scss/mixins/utilities";

@import "@ouds/web-common/scss/vendor/rfs";

@import "@ouds/web-common/scss/containers";
@import "@ouds/web-common/scss/grid";

Expand Down
1 change: 0 additions & 1 deletion packages/orange/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ authors: "Orange and OUDS Web contributors"
current_version: "1.2.0"
current_ruby_version: "1.2.0"
docs_version: "1.2"
rfs_version: "v10.0.0"
bootstrap_current_version: "5.3.6"
bootstrap_docs_version: "5.3"
bootstrap_github_org: "https://github.com/twbs"
Expand Down
2 changes: 0 additions & 2 deletions packages/orange/scss/ouds-web-grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ $include-column-box-sizing: true !default;
@import "@ouds/web-common/scss/mixins/grid";
@import "@ouds/web-common/scss/mixins/utilities";

@import "@ouds/web-common/scss/vendor/rfs";

@import "@ouds/web-common/scss/containers";
@import "@ouds/web-common/scss/grid";

Expand Down
1 change: 0 additions & 1 deletion packages/sosh/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ authors: "Orange and OUDS Web Sosh contributors"
current_version: "1.2.0"
current_ruby_version: "1.2.0"
docs_version: "1.2"
rfs_version: "v10.0.0"
bootstrap_current_version: "5.3.6"
bootstrap_docs_version: "5.3"
bootstrap_github_org: "https://github.com/twbs"
Expand Down
2 changes: 0 additions & 2 deletions packages/sosh/scss/ouds-web-grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ $include-column-box-sizing: true !default;
@import "@ouds/web-common/scss/mixins/grid";
@import "@ouds/web-common/scss/mixins/utilities";

@import "@ouds/web-common/scss/vendor/rfs";

@import "@ouds/web-common/scss/containers";
@import "@ouds/web-common/scss/grid";

Expand Down
2 changes: 1 addition & 1 deletion scss/_accordion.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
align-items: center;
width: 100%;
padding: var(--#{$prefix}accordion-btn-padding-y) var(--#{$prefix}accordion-btn-padding-x);
@include font-size(var(--#{$prefix}accordion-btn-font-size)); // OUDS mod
font-size: var(--#{$prefix}accordion-btn-font-size); // OUDS mod
font-weight: var(--#{$prefix}accordion-btn-font-weight); // OUDS mod
line-height: var(--#{$prefix}accordion-btn-line-height); // OUDS mod
color: var(--#{$prefix}accordion-btn-color);
Expand Down
2 changes: 1 addition & 1 deletion scss/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
// OUDS mod: no --#{$prefix}btn-padding-x
--#{$prefix}btn-padding-y: #{$btn-padding-y};
// OUDS mod: no --#{$prefix}btn-font-family
// OUDS mod: no `@include rfs($btn-font-size, --#{$prefix}btn-font-size)`
// OUDS mod: no --#{$prefix}btn-font-size
--#{$prefix}btn-font-weight: #{$btn-font-weight};
// OUDS mod: no `--#{$prefix}btn-line-height`
--#{$prefix}btn-color: #{$btn-color};
Expand Down
6 changes: 3 additions & 3 deletions scss/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
// OUDS mod: no --#{$prefix}dropdown-padding-x
--#{$prefix}dropdown-padding-y: #{$dropdown-padding-y};
--#{$prefix}dropdown-spacer: #{$dropdown-spacer};
@include rfs($dropdown-font-size, --#{$prefix}dropdown-font-size);
--#{$prefix}dropdown-font-size: #{$dropdown-font-size};
--#{$prefix}dropdown-line-height: #{$dropdown-line-height}; // OUDS mod
--#{$prefix}dropdown-color: #{$dropdown-color};
--#{$prefix}dropdown-bg: #{$dropdown-bg};
Expand Down Expand Up @@ -55,7 +55,7 @@
min-width: var(--#{$prefix}dropdown-min-width);
padding: var(--#{$prefix}dropdown-padding-y) var(--#{$prefix}dropdown-padding-y);
margin: 0; // Override default margin of ul
@include font-size(var(--#{$prefix}dropdown-font-size));
font-size: var(--#{$prefix}dropdown-font-size);
line-height: var(--#{$prefix}dropdown-line-height); // OUDS mod
color: var(--#{$prefix}dropdown-color);
text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
Expand Down Expand Up @@ -224,7 +224,7 @@
display: block;
padding: var(--#{$prefix}dropdown-header-padding-y) var(--#{$prefix}dropdown-header-padding-x);
margin-bottom: 0; // for use with heading elements
@include font-size($font-size-sm);
font-size: $font-size-sm;
color: var(--#{$prefix}dropdown-header-color);
white-space: nowrap; // as with > li > a
}
Expand Down
2 changes: 1 addition & 1 deletion scss/_images.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
}

.figure-caption {
@include font-size($figure-caption-font-size);
font-size: $figure-caption-font-size;
color: $figure-caption-color;
}
3 changes: 0 additions & 3 deletions scss/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
//
// Used in conjunction with global variables to enable certain theme features.

// Vendor
@import "vendor/rfs";

// Deprecate
@import "mixins/deprecate";

Expand Down
4 changes: 2 additions & 2 deletions scss/_nav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// scss-docs-start nav-css-vars
--#{$prefix}nav-link-padding-x: #{$nav-link-padding-x};
--#{$prefix}nav-link-padding-y: #{$nav-link-padding-y};
@include rfs($nav-link-font-size, --#{$prefix}nav-link-font-size);
--#{$prefix}nav-link-font-size: #{$nav-link-font-size};
--#{$prefix}nav-link-font-weight: #{$nav-link-font-weight};
--#{$prefix}nav-link-color: #{$nav-link-color};
--#{$prefix}nav-link-hover-color: #{$nav-link-hover-color};
Expand All @@ -26,7 +26,7 @@
display: flex; // OUDS mod: instead of `block`
align-items: center; // OUDS mod
padding: var(--#{$prefix}nav-link-padding-y) var(--#{$prefix}nav-link-padding-x);
@include font-size(var(--#{$prefix}nav-link-font-size));
font-size: var(--#{$prefix}nav-link-font-size);
font-weight: var(--#{$prefix}nav-link-font-weight);
color: var(--#{$prefix}nav-link-color);
text-decoration: if($link-decoration == none, null, none);
Expand Down
10 changes: 5 additions & 5 deletions scss/_navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
--bs-dropdown-min-width: 8.75rem;

@include media-breakpoint-down(lg) {
@include rfs($font-size-sm, --bs-dropdown-font-size);
--bs-dropdown-font-size: #{$font-size-sm};
--bs-dropdown-line-height: #{$line-height-sm};
--bs-dropdown-item-padding-y: #{$dropdown-item-padding-y + .0625rem};
}
Expand All @@ -147,7 +147,7 @@
margin-top: var(--#{$prefix}navbar-brand-margin-y);
margin-right: var(--#{$prefix}navbar-brand-margin-end);
margin-bottom: var(--#{$prefix}navbar-brand-margin-y);
@include font-size(var(--#{$prefix}navbar-brand-font-size));
font-size: var(--#{$prefix}navbar-brand-font-size);
line-height: 1;
color: var(--#{$prefix}navbar-brand-color);
text-decoration: if($link-decoration == none, null, none);
Expand Down Expand Up @@ -195,7 +195,7 @@
// scss-docs-start navbar-nav-css-vars
--#{$prefix}nav-link-padding-x: var(--#{$prefix}navbar-nav-link-padding-x); // OUDS mod
--#{$prefix}nav-link-padding-y: var(--#{$prefix}navbar-nav-link-padding-y); // OUDS mod
@include rfs(var(--#{$prefix}navbar-nav-font-size, $font-size-base), --#{$prefix}nav-link-font-size); // OUDS mod
--#{$prefix}nav-link-font-size: var(--#{$prefix}navbar-nav-font-size, $font-size-base); // OUDS mod
--#{$prefix}nav-link-font-weight: #{$nav-link-font-weight};
--#{$prefix}nav-link-color: var(--#{$prefix}navbar-color);
--#{$prefix}nav-link-hover-color: var(--#{$prefix}navbar-hover-color);
Expand All @@ -207,7 +207,7 @@
flex-direction: column; // cannot use `inherit` to get the `.navbar`s value
padding: var(--#{$prefix}navbar-nav-padding-top) var(--#{$prefix}navbar-nav-padding-x) var(--#{$prefix}navbar-nav-padding-bottom); // OUDS mod
margin-bottom: 0;
@include font-size(var(--#{$prefix}navbar-nav-font-size)); // OUDS mod
font-size: var(--#{$prefix}navbar-nav-font-size); // OUDS mod
line-height: var(--#{$prefix}navbar-nav-line-height, $line-height-base); // OUDS mod
letter-spacing: var(--#{$prefix}navbar-nav-letter-spacing, $letter-spacing-base); // OUDS mod
// OUDS mod: Handle .nav-link and .nav-icon slightly differently than Bs
Expand Down Expand Up @@ -326,7 +326,7 @@
.navbar-toggler {
padding: var(--#{$prefix}navbar-toggler-padding-y) calc(var(--#{$prefix}navbar-toggler-padding-x) / 2) var(--#{$prefix}navbar-toggler-padding-y) var(--#{$prefix}navbar-toggler-padding-x); // OUDS mod
margin-right: calc(-.5 * var(--#{$prefix}navbar-toggler-padding-x)); // OUDS mod
@include font-size(var(--#{$prefix}navbar-toggler-font-size));
font-size: var(--#{$prefix}navbar-toggler-font-size);
line-height: 1;
color: var(--#{$prefix}navbar-color);
background-color: transparent; // remove default button style
Expand Down
4 changes: 2 additions & 2 deletions scss/_pagination.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
--#{$prefix}pagination-padding-end: #{$pagination-padding-end}; // OUDS mod
--#{$prefix}pagination-margin-y: #{$pagination-margin-y}; // OUDS mod
--#{$prefix}pagination-margin-x-first-last: #{$pagination-margin-x-first-last}; // OUDS mod
@include rfs($pagination-font-size, --#{$prefix}pagination-font-size);
--#{$prefix}pagination-font-size: #{$pagination-font-size};
--#{$prefix}pagination-font-weight: #{$font-weight-bold}; // OUDS mod
--#{$prefix}pagination-color: #{$pagination-color};
--#{$prefix}pagination-bg: #{$pagination-bg};
Expand Down Expand Up @@ -47,7 +47,7 @@
align-items: center; // OUDS mod
justify-content: center; // OUDS mod
padding: var(--#{$prefix}pagination-padding-y) var(--#{$prefix}pagination-padding-x);
@include font-size(var(--#{$prefix}pagination-font-size));
font-size: var(--#{$prefix}pagination-font-size);
font-weight: var(--#{$prefix}pagination-font-weight); // OUDS mod
color: var(--#{$prefix}pagination-color);
text-decoration: if($link-decoration == none, null, none);
Expand Down
8 changes: 4 additions & 4 deletions scss/_popover.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// scss-docs-start popover-css-vars
--#{$prefix}popover-zindex: #{$zindex-popover};
--#{$prefix}popover-max-width: #{$popover-max-width};
@include rfs($popover-font-size, --#{$prefix}popover-font-size);
--#{$prefix}popover-font-size: #{$popover-font-size};
--#{$prefix}popover-line-height: #{$popover-line-height}; // OUDS mod
--#{$prefix}popover-font-weight: #{$popover-font-weight}; // OUDS mod
--#{$prefix}popover-bg: #{$popover-bg};
Expand All @@ -15,7 +15,7 @@
--#{$prefix}popover-header-padding-y: #{$popover-header-padding-y};
--#{$prefix}popover-header-padding-top: #{$popover-header-padding-top}; // OUDS mod
--#{$prefix}popover-header-padding-bottom: #{$popover-header-padding-bottom}; // OUDS mod
@include rfs($popover-header-font-size, --#{$prefix}popover-header-font-size);
--#{$prefix}popover-header-font-size: #{$popover-header-font-size};
--#{$prefix}popover-header-line-height: #{$popover-header-line-height}; // OUDS mod
--#{$prefix}popover-header-color: #{$popover-header-color};
--#{$prefix}popover-header-bg: #{$popover-header-bg};
Expand All @@ -35,7 +35,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();
@include font-size(var(--#{$prefix}popover-font-size));
font-size: var(--#{$prefix}popover-font-size);
line-height: var(--#{$prefix}popover-line-height); // OUDS mod
// Allow breaking very long words so they don't overflow the popover's bounds
word-wrap: break-word;
Expand Down Expand Up @@ -187,9 +187,9 @@
.popover-header {
padding: var(--#{$prefix}popover-header-padding-y, var(--#{$prefix}popover-header-padding-top)) var(--#{$prefix}popover-header-padding-x) var(--#{$prefix}popover-header-padding-y, var(--#{$prefix}popover-header-padding-bottom)); // OUDS mod: instead of `var(--#{$prefix}popover-header-padding-y) var(--#{$prefix}popover-header-padding-x)`
margin-bottom: 0; // Reset the default from Reboot
font-size: var(--#{$prefix}popover-header-font-size);
font-weight: var(--#{$prefix}popover-font-weight); // OUDS mod
line-height: var(--#{$prefix}popover-header-line-height); // OUDS mod
@include font-size(var(--#{$prefix}popover-header-font-size));
color: var(--#{$prefix}popover-header-color);

/* rtl:remove */
Expand Down
4 changes: 2 additions & 2 deletions scss/_progress.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
.progress-stacked {
// scss-docs-start progress-css-vars
--#{$prefix}progress-height: #{$progress-height};
@include rfs($progress-font-size, --#{$prefix}progress-font-size);
--#{$prefix}progress-font-size: #{$progress-font-size};
--#{$prefix}progress-bg: #{$progress-bg};
--#{$prefix}progress-border-radius: #{$progress-border-radius};
--#{$prefix}progress-box-shadow: #{$progress-box-shadow};
Expand All @@ -26,7 +26,7 @@
display: flex;
height: var(--#{$prefix}progress-height);
overflow: hidden; // force rounded corners by cropping it
@include font-size(var(--#{$prefix}progress-font-size));
font-size: var(--#{$prefix}progress-font-size);
background-color: var(--#{$prefix}progress-bg);
@include border-radius(var(--#{$prefix}progress-border-radius));
@include box-shadow(var(--#{$prefix}progress-box-shadow));
Expand Down
36 changes: 18 additions & 18 deletions scss/_reboot.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#{$ouds-root-selector} { // OUDS mod: instead of `:root`
@if $font-size-root != null {
@include font-size(var(--#{$prefix}root-font-size));
font-size: var(--#{$prefix}root-font-size);
}

// OUDS mod: Improve focus visibility when fixed/sticky header is used
Expand Down Expand Up @@ -66,7 +66,7 @@
margin: 0; // 1
font-family: var(--#{$prefix}body-font-family);
font-synthesis: none; // OUDS mod // 5
@include font-size(var(--#{$prefix}body-font-size));
font-size: var(--#{$prefix}body-font-size);
font-weight: var(--#{$prefix}body-font-weight);
line-height: var(--#{$prefix}body-line-height);
color: var(--#{$prefix}color-content-default); // OUDS mod: instead of `var(--#{$prefix}body-color)`
Expand Down Expand Up @@ -129,32 +129,32 @@ hr {

h1 {
@extend %heading;
@include get-font-size("heading-xlarge"); // OUDS mod: instead of `@include font-size($h1-font-size)`
@include get-font-size("heading-xlarge"); // OUDS mod: instead of `font-size: $h1-font-size`
Copy link
Copy Markdown
Collaborator

@MaxLardenois MaxLardenois Apr 22, 2026

Choose a reason for hiding this comment

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

Question: do you consider those "instead of" to be agains Boosted, Bootstrap or Bootstrap v6 ? For Boosted or Bootstrap it should still say "instead of @include font-size() no?

Copy link
Copy Markdown
Member Author

@louismaximepiton louismaximepiton Apr 27, 2026

Choose a reason for hiding this comment

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

Hmm you're right, since it's a commit that comes from Bootstrap v6, I updated against v6, but it might be wrong. Don't know if we should keep them or not.

}

h2 {
@extend %heading;
@include get-font-size("heading-large"); // OUDS mod: instead of `@include font-size($h2-font-size)`
@include get-font-size("heading-large"); // OUDS mod: instead of `font-size: $h2-font-size`
}

h3 {
@extend %heading;
@include get-font-size("heading-medium"); // OUDS mod: instead of `@include font-size($h3-font-size)`
@include get-font-size("heading-medium"); // OUDS mod: instead of `font-size: $h3-font-size`
}

h4 {
@extend %heading;
@include get-font-size("heading-small"); // OUDS mod: instead of `@include font-size($h4-font-size)`
@include get-font-size("heading-small"); // OUDS mod: instead of `font-size: $h4-font-size`
}

h5 {
@extend %heading;
@include get-font-size("body-large"); // OUDS mod: instead of `@include font-size($h5-font-size)`
@include get-font-size("body-large"); // OUDS mod: instead of `font-size: $h5-font-size`
}

h6 {
@extend %heading;
@include get-font-size("body-medium"); // OUDS mod: instead of `@include font-size($h6-font-size)`
@include get-font-size("body-medium"); // OUDS mod: instead of `font-size: $h6-font-size`
}
// scss-docs-end ouds-font-implementation

Expand Down Expand Up @@ -289,7 +289,7 @@ strong {
// Add the correct font size in all browsers

small {
@include get-font-size("body-small"); // OUDS mod: instead of `@include font-size($small-font-size)`
@include get-font-size("body-small"); // OUDS mod: instead of `font-size: $small-font-size`
}


Expand All @@ -310,7 +310,7 @@ mark {
sub,
sup {
position: relative;
@include font-size($sub-sup-font-size);
font-size: $sub-sup-font-size;
line-height: 0;
vertical-align: baseline;
}
Expand Down Expand Up @@ -391,7 +391,7 @@ code,
kbd,
samp {
font-family: $font-family-code;
@include font-size(1em); // Correct the odd `em` font sizing in all browsers.
font-size: 1em; // Correct the odd `em` font sizing in all browsers.
}

// 1. Remove browser default top margin
Expand All @@ -403,20 +403,20 @@ pre {
margin-top: 0; // 1
margin-bottom: $ouds-space-fixed-medium; // 2 // OUDS mod: instead of `1rem`
overflow: auto; // 3
@include get-font-size("code-medium"); // OUDS mod: instead of `@include font-size($code-font-size)`
@include get-font-size("code-medium"); // OUDS mod: instead of `font-size: $code-font-size`
color: $pre-color;

// Account for some code outputs that place code tags in pre tags
code {
@include font-size(inherit);
font-size: inherit;
color: inherit;
word-break: normal;
}
}

var, // OUDS mod
code {
@include font-size($code-font-size);
font-size: $code-font-size;
font-style: normal; // OUDS mod: <var> is italic in all browsers
color: var(--#{$prefix}color-content-muted);
word-wrap: break-word;
Expand All @@ -429,14 +429,14 @@ a > :is(var, code) {

kbd {
padding: $kbd-padding-y $kbd-padding-x;
@include font-size($kbd-font-size);
font-size: $kbd-font-size;
color: $kbd-color;
background-color: $kbd-bg;
@include border-radius($border-radius-sm, $border-radius-sm); // OUDS mod: instead of `@include border-radius($border-radius-sm)`

kbd {
padding: 0;
@include font-size(1em);
font-size: 1em;
font-weight: $nested-kbd-font-weight;
}
}
Expand Down Expand Up @@ -547,7 +547,7 @@ optgroup,
textarea {
margin: 0; // 1
font-family: inherit;
@include font-size(inherit);
font-size: inherit;
line-height: inherit;

/* rtl:remove */
Expand Down Expand Up @@ -641,7 +641,7 @@ legend {
margin-bottom: $legend-margin-bottom;
font-weight: $legend-font-weight;
// OUDS mod: no line-height
@include get-font-size("body-large"); // OUDS mod: instead of `@include font-size($legend-font-size)`
@include get-font-size("body-large"); // OUDS mod: instead of `font-size: $legend-font-size`

+ * {
clear: left; // 2
Expand Down
Loading
Loading