Skip to content

Commit 1ad9b6e

Browse files
julien-deramondjulien-deramond
committed
chore(merge main): patched commit → 7f8fed4 (#2594)
1 parent ef9ca58 commit 1ad9b6e

10 files changed

+1377
-1509
lines changed

Diff for: ‎.eslintrc.json

+2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@
9898
"unicorn/prefer-module": "off",
9999
"unicorn/prefer-query-selector": "off",
100100
"unicorn/prefer-spread": "off",
101+
"unicorn/prefer-string-raw": "off",
101102
"unicorn/prefer-string-replace-all": "off",
103+
"unicorn/prefer-structured-clone": "off",
102104
"unicorn/prevent-abbreviations": "off"
103105
},
104106
"overrides": [

Diff for: ‎package-lock.json

+1,324-1,459
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎package.json

+18-18
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,16 @@
103103
"@popperjs/core": "^2.11.8"
104104
},
105105
"devDependencies": {
106-
"@babel/cli": "^7.24.5",
107-
"@babel/core": "^7.24.5",
108-
"@babel/preset-env": "^7.24.5",
106+
"@babel/cli": "^7.24.8",
107+
"@babel/core": "^7.24.9",
108+
"@babel/preset-env": "^7.24.8",
109109
"@docsearch/js": "^3.6.0",
110110
"@popperjs/core": "^2.11.8",
111111
"@rollup/plugin-babel": "^6.0.4",
112-
"@rollup/plugin-commonjs": "^25.0.8",
112+
"@rollup/plugin-commonjs": "^26.0.1",
113113
"@rollup/plugin-node-resolve": "^15.2.3",
114-
"@rollup/plugin-replace": "^5.0.5",
115-
"@stackblitz/sdk": "^1.9.0",
114+
"@rollup/plugin-replace": "^5.0.7",
115+
"@stackblitz/sdk": "^1.11.0",
116116
"@storybook/addon-a11y": "^8.2.4",
117117
"@storybook/addon-essentials": "^8.2.4",
118118
"@storybook/addon-themes": "^8.2.4",
@@ -131,14 +131,14 @@
131131
"eslint-config-xo": "^0.45.0",
132132
"eslint-plugin-html": "^8.1.1",
133133
"eslint-plugin-import": "^2.29.1",
134-
"eslint-plugin-markdown": "^5.0.0",
134+
"eslint-plugin-markdown": "^5.1.0",
135135
"eslint-plugin-storybook": "^0.8.0",
136-
"eslint-plugin-unicorn": "^52.0.0",
136+
"eslint-plugin-unicorn": "^54.0.0",
137137
"find-unused-sass-variables": "^6.0.0",
138138
"focus-visible": "^5.2.0",
139139
"globby": "^14.0.1",
140140
"hammer-simulator": "0.0.1",
141-
"hugo-bin": "^0.123.3",
141+
"hugo-bin": "^0.125.2",
142142
"ip": "^2.0.0",
143143
"jasmine": "^5.1.0",
144144
"jquery": "^3.7.1",
@@ -151,27 +151,27 @@
151151
"karma-jasmine": "^5.1.0",
152152
"karma-jasmine-html-reporter": "^2.1.0",
153153
"karma-rollup-preprocessor": "7.0.7",
154-
"lockfile-lint": "^4.13.2",
155-
"nodemon": "^3.1.3",
156-
"npm-run-all2": "^6.1.2",
154+
"lockfile-lint": "^4.14.0",
155+
"nodemon": "^3.1.4",
156+
"npm-run-all2": "^6.2.2",
157157
"ods-storybook-theme": "^1.1.0",
158158
"pa11y-ci": "^3.1.0",
159159
"pa11y-ci-reporter-html": "^6.0.2",
160-
"postcss": "^8.4.38",
160+
"postcss": "^8.4.39",
161161
"postcss-cli": "^11.0.0",
162-
"rollup": "^4.18.0",
162+
"rollup": "^4.18.1",
163163
"rollup-plugin-istanbul": "^5.0.0",
164164
"rtlcss": "^4.1.1",
165-
"sass": "^1.77.4",
165+
"sass": "^1.77.8",
166166
"sass-loader": "^14.2.1",
167167
"sass-true": "^8.0.0",
168168
"shelljs": "^0.8.5",
169169
"sirv-cli": "^2.0.2",
170170
"storybook": "^8.2.4",
171-
"stylelint": "^16.6.1",
172-
"stylelint-config-twbs-bootstrap": "^14.1.0",
171+
"stylelint": "^16.7.0",
172+
"stylelint-config-twbs-bootstrap": "^14.2.0",
173173
"tarteaucitronjs": "^1.19.0",
174-
"terser": "^5.31.0",
174+
"terser": "^5.31.2",
175175
"vnu-jar": "^23.4.11"
176176
},
177177
"files": [

Diff for: ‎scss/_back-to-top.scss

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@
2424
--#{$prefix}back-to-top-title-active-decoration: #{$link-decoration};
2525
// scss-docs-end back-to-top-css-vars
2626

27-
// scss-docs-start back-to-top-xl-css-vars
28-
@include media-breakpoint-up(xl) {
29-
--#{$prefix}back-to-top-right: #{$back-to-top-offset-right * 2};
30-
--#{$prefix}back-to-top-bottom: #{$back-to-top-offset-bottom * 2};
31-
--#{$prefix}back-to-top-link-offset-top: #{$back-to-top-link-offset-top-xl};
32-
}
33-
// scss-docs-end back-to-top-xl-css-vars
34-
3527
position: absolute;
3628
top: var(--#{$prefix}back-to-top-top);
3729
right: var(--#{$prefix}back-to-top-right);
3830
bottom: var(--#{$prefix}back-to-top-bottom);
3931
z-index: var(--#{$prefix}back-to-top-zindex);
4032
pointer-events: none;
4133
background-color: transparent;
34+
35+
// scss-docs-start back-to-top-xl-css-vars
36+
@include media-breakpoint-up(xl) {
37+
--#{$prefix}back-to-top-right: #{$back-to-top-offset-right * 2};
38+
--#{$prefix}back-to-top-bottom: #{$back-to-top-offset-bottom * 2};
39+
--#{$prefix}back-to-top-link-offset-top: #{$back-to-top-link-offset-top-xl};
40+
}
41+
// scss-docs-end back-to-top-xl-css-vars
4242
}
4343

4444
.back-to-top-link {

Diff for: ‎scss/_carousel.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@
152152
.carousel-control-next-icon {
153153
display: inline-block;
154154
background-color: var(--#{$prefix}control-bg); // OUDS mod
155-
@include button-icon($carousel-control-icon-bg, $carousel-control-icon-width, $size: $carousel-control-icon-size, $position: subtract(50%, $spacer * .1) 50%); // OUDS mod
156155
@include border-radius(50%, 50%);
156+
@include button-icon($carousel-control-icon-bg, $carousel-control-icon-width, $size: $carousel-control-icon-size, $position: subtract(50%, $spacer * .1) 50%); // OUDS mod
157157
}
158158

159159
// OUDS mod

Diff for: ‎scss/_modal.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363

6464
// When fading in the modal, animate it to slide down
6565
.modal.fade & {
66-
@include transition($modal-transition);
6766
transform: $modal-fade-transform;
67+
@include transition($modal-transition);
6868
}
6969
.modal.show & {
7070
transform: $modal-show-transform;

Diff for: ‎scss/_navbar.scss

+3-2
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
// OUDS mod
5656
font-weight: var(--#{$prefix}navbar-font-weight);
5757
box-shadow: inset 0 calc(-1 * var(--#{$prefix}navbar-border-width)) 0 var(--#{$prefix}navbar-border-color); // stylelint-disable-line function-disallowed-list
58+
@include gradient-bg(var(--#{$prefix}navbar-bg)); // OUDS mod: instead of `@include gradient-bg()`
5859
@include transition($navbar-transition);
5960
// End mod
60-
@include gradient-bg(var(--#{$prefix}navbar-bg)); // OUDS mod: instead of `@include gradient-bg()`
6161

6262
// OUDS mod: Difference between xs and md breakpoints
6363
// scss-docs-start orange-navbar-css-vars
@@ -155,11 +155,12 @@
155155

156156
// No focus
157157
&:hover {
158+
text-decoration: if($link-hover-decoration == underline, none, null);
159+
158160
.title,
159161
.two-lined {
160162
color: var(--#{$prefix}navbar-brand-hover-color);
161163
}
162-
text-decoration: if($link-hover-decoration == underline, none, null);
163164
}
164165

165166
//// Orange's master logo

Diff for: ‎scss/_reboot.scss

+10-10
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,6 @@
2626
// null by default, thus nothing is generated.
2727

2828
:root {
29-
@if $font-size-root != null {
30-
@include font-size(var(--#{$prefix}root-font-size));
31-
}
32-
33-
@if $enable-smooth-scroll {
34-
@media (prefers-reduced-motion: no-preference) {
35-
scroll-behavior: smooth;
36-
}
37-
}
38-
3929
// OUDS mod: Improve focus visibility when fixed/sticky header is used
4030
// See https://caniuse.com/?search=scroll-padding
4131
// scss-docs-start scroll-offset
@@ -48,6 +38,16 @@
4838
}
4939
// scss-docs-end scroll-offset
5040
// End mod
41+
42+
@if $font-size-root != null {
43+
@include font-size(var(--#{$prefix}root-font-size));
44+
}
45+
46+
@if $enable-smooth-scroll {
47+
@media (prefers-reduced-motion: no-preference) {
48+
scroll-behavior: smooth;
49+
}
50+
}
5151
}
5252

5353

Diff for: ‎scss/forms/_form-check.scss

+6-6
Original file line numberDiff line numberDiff line change
@@ -187,12 +187,6 @@
187187
filter: $form-switch-checked-filter; // OUDS mod
188188
border-color: $form-switch-checked-border-color;
189189

190-
&:focus {
191-
&[data-focus-visible-added] {
192-
@include focus-visible($color: $form-switch-checked-focus-outer, $box-color: $form-switch-checked-focus-inner);
193-
}
194-
}
195-
196190
@if $enable-gradients {
197191
--#{$prefix}form-switch-bg: #{escape-svg($form-switch-checked-bg-image)}, var(--#{$prefix}gradient);
198192
background-position: $form-switch-checked-bg-position, 100%, 100% 0;
@@ -203,6 +197,12 @@
203197
background-size: $form-switch-checked-bg-size, $form-switch-bg-square-size 100%;
204198
}
205199

200+
&:focus {
201+
&[data-focus-visible-added] {
202+
@include focus-visible($color: $form-switch-checked-focus-outer, $box-color: $form-switch-checked-focus-inner);
203+
}
204+
}
205+
206206
&:not(:disabled) {
207207
--#{$prefix}switch-gradient: #{linear-gradient(to right, $form-switch-checked-square-bg $form-switch-bg-square-size, transparent)};
208208
}

Diff for: ‎scss/forms/_quantity-selector.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
}
3939

4040
&:first-of-type {
41-
@include button-icon($quantity-selector-icon-remove, $size: $quantity-selector-icon-width $quantity-selector-icon-remove-height, $pseudo: "after");
4241
order: -1;
4342
padding-right: $quantity-selector-btn-padding-x;
4443
border-right-width: 0;
44+
@include button-icon($quantity-selector-icon-remove, $size: $quantity-selector-icon-width $quantity-selector-icon-remove-height, $pseudo: "after");
4545

4646
&:focus {
4747
&[data-focus-visible-added] { // stylelint-disable-line selector-no-qualifying-type
@@ -51,8 +51,8 @@
5151
}
5252

5353
&.btn-sm { // stylelint-disable-line selector-no-qualifying-type
54-
@include button-icon($quantity-selector-icon-remove-sm, $width: 1rem, $height: 1rem, $size: $quantity-selector-icon-sm-width $quantity-selector-icon-sm-remove-height, $pseudo: "after");
5554
padding-right: $quantity-selector-btn-padding-x-sm;
55+
@include button-icon($quantity-selector-icon-remove-sm, $width: 1rem, $height: 1rem, $size: $quantity-selector-icon-sm-width $quantity-selector-icon-sm-remove-height, $pseudo: "after");
5656

5757
&:focus {
5858
&[data-focus-visible-added] { // stylelint-disable-line selector-no-qualifying-type
@@ -63,9 +63,9 @@
6363
}
6464

6565
&:last-of-type {
66-
@include button-icon($quantity-selector-icon-add, $size: $quantity-selector-icon-width $quantity-selector-icon-add-height, $pseudo: "after");
6766
padding-left: $quantity-selector-btn-padding-x;
6867
border-left-width: 0;
68+
@include button-icon($quantity-selector-icon-add, $size: $quantity-selector-icon-width $quantity-selector-icon-add-height, $pseudo: "after");
6969

7070
&:focus {
7171
&[data-focus-visible-added] { // stylelint-disable-line selector-no-qualifying-type
@@ -75,8 +75,8 @@
7575
}
7676

7777
&.btn-sm { // stylelint-disable-line selector-no-qualifying-type
78-
@include button-icon($quantity-selector-icon-add-sm, $width: 1rem, $height: 1rem, $size: $quantity-selector-icon-sm-width $quantity-selector-icon-sm-add-height, $pseudo: "after");
7978
padding-left: $quantity-selector-btn-padding-x-sm;
79+
@include button-icon($quantity-selector-icon-add-sm, $width: 1rem, $height: 1rem, $size: $quantity-selector-icon-sm-width $quantity-selector-icon-sm-add-height, $pseudo: "after");
8080

8181
&:focus {
8282
&[data-focus-visible-added] { // stylelint-disable-line selector-no-qualifying-type

0 commit comments

Comments
 (0)