Skip to content

Commit ee3665c

Browse files
committed
Merge branch 'ouds/main' into ouds/main-his-default-ouds-tags
# Conflicts: # site/src/content/docs/getting-started/migration-from-boosted.mdx
2 parents 875814d + f7e12cb commit ee3665c

Some content is hidden

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

42 files changed

+1486
-648
lines changed

.bundlewatch.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"files": [
33
{
44
"path": "./packages/orange/dist/css/ouds-web-bootstrap.css",
5-
"maxSize": "75.5 kB"
5+
"maxSize": "75.75 kB"
66
},
77
{
88
"path": "./packages/orange/dist/css/ouds-web-bootstrap.min.css",

.github/workflows/bundlewatch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: npm ci
4343

4444
- name: Run dist
45-
run: npm run dist
45+
run: npm run css-dev-orange && npm run js
4646

4747
- name: Run bundlewatch
4848
run: npm run bundlewatch

packages/orange-compact/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ ouds:
2929
debug_template: "https://codepen.io/louismaximepiton/pen/XJKpRqd"
3030

3131
algolia:
32-
app_id: "F4PKENW3TB"
33-
api_key: "d04e794979727856a09d53f12ead9069"
34-
index_name: "boosted-orange"
32+
app_id: "AKIHKMSEKB"
33+
api_key: "8863f72a6120798814c9bd8353ba50f5"
34+
index_name: "orange-compact"
3535

3636
download:
3737
source: "https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/archive/v1.1.0-ouds-web.zip"

packages/orange-compact/scss/ouds-web.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
@import "@ouds/web-common/scss/carousel";
4848
@import "@ouds/web-common/scss/spinners";
4949
@import "@ouds/web-common/scss/offcanvas";
50-
@import "@ouds/web-common/scss/placeholders";
50+
@import "@ouds/web-common/scss/skeleton";
5151

5252
// OUDS Web
5353
@import "@ouds/web-common/scss/back-to-top";

packages/orange-compact/scss/tokens/_composite.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,12 @@ $alert-icon-important: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/200
112112
$select-input-chevron: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M4.874 9.977 12 17.25l7.125-7.273-2.034-2.079L12 13.095 6.91 7.898 4.874 9.977Z'/></svg>") !default;
113113
$select-input-expanded-chevron: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M19.124 14.023 12 6.75l-7.125 7.273 2.035 2.079L12 10.905l5.088 5.197 2.037-2.079Z'/></svg>") !default;
114114

115+
// Navigation button
116+
// icon button previous v1.4
117+
$btn-previous-icon: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='currentColor' viewBox='0 0 24 24'><path d='M14.023 4.875 6.75 12l7.273 7.125 2.079-2.035L10.905 12l5.197-5.088-2.079-2.037Z'/></svg>") !default;
118+
// icon button next v1.4
119+
$btn-next-icon: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='currentColor' viewBox='0 0 24 24'><path d='M9.977 19.125 17.25 12 9.977 4.875 7.898 6.91 13.095 12l-5.197 5.088 2.079 2.037Z'/></svg>") !default;
120+
115121
//// SVG used several times
116122
$svg-as-custom-props: (
117123
"chevron": $chevron-icon,

packages/orange/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ debug_template: "https://codepen.io/louismaximepiton/pen/WbreE
3131
algolia:
3232
app_id: "AKIHKMSEKB"
3333
api_key: "8863f72a6120798814c9bd8353ba50f5"
34-
index_name: "Orange crawler"
34+
index_name: "orange"
3535

3636
download:
3737
source: "https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/archive/v1.1.0-ouds-web.zip"

packages/orange/scss/ouds-web.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
@import "@ouds/web-common/scss/carousel";
4848
@import "@ouds/web-common/scss/spinners";
4949
@import "@ouds/web-common/scss/offcanvas";
50-
@import "@ouds/web-common/scss/placeholders";
50+
@import "@ouds/web-common/scss/skeleton";
5151

5252
// OUDS Web
5353
@import "@ouds/web-common/scss/back-to-top";

packages/orange/scss/tokens/_composite.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,12 @@ $alert-icon-important: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/200
112112
$select-input-chevron: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M4.874 9.977 12 17.25l7.125-7.273-2.034-2.079L12 13.095 6.91 7.898 4.874 9.977Z'/></svg>") !default;
113113
$select-input-expanded-chevron: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><path d='M19.124 14.023 12 6.75l-7.125 7.273 2.035 2.079L12 10.905l5.088 5.197 2.037-2.079Z'/></svg>") !default;
114114

115+
// Navigation button
116+
// icon button previous v1.4
117+
$btn-previous-icon: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='currentColor' viewBox='0 0 24 24'><path d='M14.023 4.875 6.75 12l7.273 7.125 2.079-2.035L10.905 12l5.197-5.088-2.079-2.037Z'/></svg>") !default;
118+
// icon button next v1.4
119+
$btn-next-icon: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' fill='currentColor' viewBox='0 0 24 24'><path d='M9.977 19.125 17.25 12 9.977 4.875 7.898 6.91 13.095 12l-5.197 5.088 2.079 2.037Z'/></svg>") !default;
120+
115121
//// SVG used several times
116122
$svg-as-custom-props: (
117123
"chevron": $chevron-icon,

packages/sosh/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ debug_template: "https://codepen.io/louismaximepiton/pen/OPMLj
3131
algolia:
3232
app_id: "AKIHKMSEKB"
3333
api_key: "8863f72a6120798814c9bd8353ba50f5"
34-
index_name: "Orange crawler"
34+
index_name: "sosh"
3535

3636
download:
3737
source: "https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/archive/v1.1.0-ouds-web.zip"

packages/sosh/scss/ouds-web.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
@import "@ouds/web-common/scss/carousel";
4848
@import "@ouds/web-common/scss/spinners";
4949
@import "@ouds/web-common/scss/offcanvas";
50-
@import "@ouds/web-common/scss/placeholders";
50+
@import "@ouds/web-common/scss/skeleton";
5151

5252
// OUDS Web
5353
@import "@ouds/web-common/scss/back-to-top";

0 commit comments

Comments
 (0)