Skip to content

Commit 51e3f9c

Browse files
louismaximepitonlouismaximepiton
authored
Merge branch 'ouds/main' into ouds/main-chore-merge-from-1751ffc
2 parents dfb4381 + 80f3518 commit 51e3f9c

File tree

176 files changed

+10102
-1874
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+10102
-1874
lines changed

‎.bundlewatch.config.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"files": [
33
{
44
"path": "./dist/css/ouds-web-bootstrap.css",
5-
"maxSize": "62.75 kB"
5+
"maxSize": "64.0 kB"
66
},
77
{
88
"path": "./dist/css/ouds-web-bootstrap.min.css",
9-
"maxSize": "59.5 kB"
9+
"maxSize": "61.0 kB"
1010
},
1111
{
1212
"path": "./dist/css/ouds-web-grid.css",
@@ -18,27 +18,27 @@
1818
},
1919
{
2020
"path": "./dist/css/ouds-web-reboot.css",
21-
"maxSize": "5.75 kB"
21+
"maxSize": "7.0 kB"
2222
},
2323
{
2424
"path": "./dist/css/ouds-web-reboot.min.css",
25-
"maxSize": "5.5 kB"
25+
"maxSize": "6.5 kB"
2626
},
2727
{
2828
"path": "./dist/css/ouds-web-utilities.css",
29-
"maxSize": "22.25 kB"
29+
"maxSize": "23.0 kB"
3030
},
3131
{
3232
"path": "./dist/css/ouds-web-utilities.min.css",
33-
"maxSize": "21.0 kB"
33+
"maxSize": "22.0 kB"
3434
},
3535
{
3636
"path": "./dist/css/ouds-web.css",
37-
"maxSize": "56.25 kB"
37+
"maxSize": "57.25 kB"
3838
},
3939
{
4040
"path": "./dist/css/ouds-web.min.css",
41-
"maxSize": "53.0 kB"
41+
"maxSize": "54.0 kB"
4242
},
4343
{
4444
"path": "./dist/js/ouds-web.bundle.js",

‎build/.pa11yci.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"axe"
1616
],
1717
"useIncognitoBrowserContext": false,
18-
"hideElements": "iframe, #text-decoration + p + div a.text-decoration-none, .accordion-collapse, #offcanvas, #offcanvasDark, #offcanvasResponsive, #bdSidebar, .overflow-y-scroll, .overflow-y-auto, .overflow-x-scroll, .overflow-x-auto, .table-responsive, fieldset.star-rating[disabled]",
18+
"hideElements": "iframe, #text-decoration + p + div a.text-decoration-none, .accordion-collapse, #offcanvas, #offcanvasDark, #offcanvasResponsive, #bdSidebar, #sidebarMenu, .overflow-y-scroll, .overflow-y-auto, .overflow-x-scroll, .overflow-x-auto, .table-responsive, fieldset.star-rating[disabled]",
1919
"ignore": [
2020
"color-contrast"
2121
]

‎hugo.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ params:
8080
icons_license: "https://design.orange.com/0c1af118d/p/92bb17-usage/t/63532c"
8181
icons_usage: "https://design.orange.com/0c1af118d/p/92bb17-usage"
8282
bootstrap: "https://getbootstrap.com"
83+
ouds:
84+
web: "https://unified-design-system.orange.com/" # TODO: replace this URL by the web one or even "https://oran.ge/ds-web" when it will changed
8385

8486
algolia:
8587
appId: "F4PKENW3TB"

‎js/tests/visual/dropdown.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<div class="container-fluid">
1111
<h1>Dropdown <small>Bootstrap Visual Test</small></h1>
1212

13-
<nav class="navbar navbar-expand-md bg-light">
13+
<nav class="navbar navbar-expand-md bg-always-white" data-bs-theme="light">
1414
<a class="navbar-brand" href="#">Navbar</a>
1515
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
1616
<span class="navbar-toggler-icon"></span>

‎js/tests/visual/modal.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
</style>
1414
</head>
1515
<body>
16-
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
16+
<nav class="navbar navbar-expand-lg navbar-dark bg-always-black" data-bs-theme="dark">
1717
<div class="container-fluid">
1818
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
1919
<span class="navbar-toggler-icon"></span>
2020
</button>
2121
<div class="collapse navbar-collapse" id="navbarResponsive">
22-
<a class="navbar-brand text-white" href="#">This shouldn't jump!</a>
22+
<a class="navbar-brand text-always-on-black" href="#">This shouldn't jump!</a>
2323
<ul class="navbar-nav">
2424
<li class="nav-item">
2525
<a class="nav-link active" href="#" aria-current="page">Home</a>
@@ -188,7 +188,7 @@ <h1 class="modal-title h4" id="slowModalLabel">Lorem slowly</h1>
188188

189189
<br><br>
190190

191-
<div class="text-bg-dark p-short" id="tall" style="display: none;">
191+
<div class="text-bg-always-black p-short" id="tall" style="display: none;" data-bs-theme="dark">
192192
Tall body content to force the page to have a scrollbar.
193193
</div>
194194

@@ -212,7 +212,7 @@ <h1 class="modal-title h4" id="slowModalLabel">Lorem slowly</h1>
212212

213213
function reportFirefoxTestResult(result) {
214214
if (!firefoxTestDone) {
215-
ffBugTestResult.classList.add(result ? 'text-success' : 'text-danger')
215+
ffBugTestResult.classList.add(result ? 'text-status-positive' : 'text-status-negative')
216216
ffBugTestResult.textContent = result ? 'PASS' : 'FAIL'
217217
}
218218
}

‎js/tests/visual/scrollspy.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</style>
1111
</head>
1212
<body data-bs-spy="scroll" data-bs-target=".navbar" data-bs-offset="70">
13-
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
14-
<a class="navbar-brand text-white" href="#">Scrollspy test</a>
13+
<nav class="navbar navbar-expand-md navbar-dark bg-always-black fixed-top" data-bs-theme="dark">
14+
<a class="navbar-brand text-always-on-black" href="#">Scrollspy test</a>
1515
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
1616
<span class="navbar-toggler-icon"></span>
1717
</button>

‎js/tests/visual/toast.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ <h1>Toast <small>Bootstrap Visual Test</small></h1>
2828
<div class="notifications">
2929
<div id="toastAutoHide" class="toast" role="alert" aria-live="assertive" aria-atomic="true" data-bs-delay="2000">
3030
<div class="toast-header">
31-
<span class="d-block bg-primary rounded me-short" style="width: 20px; height: 20px;"></span>
31+
<span class="d-block bg-brand-primary rounded me-short" style="width: 20px; height: 20px;"></span>
3232
<strong class="me-auto">Bootstrap</strong>
3333
<small>11 mins ago</small>
3434
</div>
@@ -39,9 +39,9 @@ <h1>Toast <small>Bootstrap Visual Test</small></h1>
3939

4040
<div class="toast" data-bs-autohide="false" role="alert" aria-live="assertive" aria-atomic="true">
4141
<div class="toast-header">
42-
<span class="d-block bg-primary rounded me-short" style="width: 20px; height: 20px;"></span>
42+
<span class="d-block bg-brand-primary rounded me-short" style="width: 20px; height: 20px;"></span>
4343
<strong class="me-auto">Bootstrap</strong>
44-
<small class="text-body-secondary">2 seconds ago</small>
44+
<small class="text-muted">2 seconds ago</small>
4545
<button type="button" class="ms-short mb-shortest btn-close" data-bs-dismiss="toast"><span class="visually-hidden">Close</span></button><!--OUDS mod: a11y-->
4646
</div>
4747
<div class="toast-body">

‎js/tests/visual/tooltip.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<div class="container-fluid">
2121
<h1>Tooltip <small>OUDS Web Visual Test</small></h1>
2222

23-
<p class="text-body-secondary">Tight pants next level keffiyeh <a href="#" data-bs-toggle="tooltip" title="Default tooltip">you probably</a> haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel <a href="#" data-bs-toggle="tooltip" title="Another tooltip">have a</a> terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan <a href="#" data-bs-toggle="tooltip" title="Another one here too">whatever keytar</a>, scenester farm-to-table banksy Austin <a href="#" data-bs-toggle="tooltip" title="The last tip!">twitter handle</a> freegan cred raw denim single-origin coffee viral.</p>
23+
<p class="text-muted">Tight pants next level keffiyeh <a href="#" data-bs-toggle="tooltip" title="Default tooltip">you probably</a> haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel <a href="#" data-bs-toggle="tooltip" title="Another tooltip">have a</a> terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan <a href="#" data-bs-toggle="tooltip" title="Another one here too">whatever keytar</a>, scenester farm-to-table banksy Austin <a href="#" data-bs-toggle="tooltip" title="The last tip!">twitter handle</a> freegan cred raw denim single-origin coffee viral.</p>
2424

2525
<hr>
2626

‎scss/_accordion.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
// OUDS mod
8383
&[data-focus-visible-added] {
8484
outline-offset: add($focus-visible-outer-offset, var(--#{$prefix}accordion-border-width));
85-
box-shadow: 0 0 0 add(var(--#{$prefix}accordion-border-width), $focus-visible-inner-width) var(--#{$prefix}focus-visible-inner-color);
85+
box-shadow: 0 0 0 add(var(--#{$prefix}accordion-border-width), $focus-visible-inner-width) var(--#{$prefix}color-border-focus-inset);
8686
}
8787
// End mod
8888
}

‎scss/_button-group.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,11 @@
142142
.btn.active + &,
143143
&:active + * + .btn,
144144
&.active + * + .btn {
145-
border-color: $supporting-orange;
145+
border-color: $ouds-color-orange-500;
146146
}
147147

148148
.btn-group.show > &:not(:focus):not(:active)::before {
149-
color: $supporting-orange;
149+
color: $ouds-color-orange-500;
150150
background-color: currentcolor;
151151
}
152152
// End mod

0 commit comments

Comments
 (0)