Skip to content

Commit

Permalink
Merge branch 'main' into main-ic-fix-card-component-design
Browse files Browse the repository at this point in the history
  • Loading branch information
louismaximepiton committed Jan 4, 2024
2 parents f2cd85c + 00d701b commit 585532a
Show file tree
Hide file tree
Showing 413 changed files with 41,145 additions and 38,953 deletions.
24 changes: 12 additions & 12 deletions .bundlewatch.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,59 +2,59 @@
"files": [
{
"path": "./dist/css/boosted-grid.css",
"maxSize": "11.0 kB"
"maxSize": "7.0 kB"
},
{
"path": "./dist/css/boosted-grid.min.css",
"maxSize": "10.0 kB"
"maxSize": "6.25 kB"
},
{
"path": "./dist/css/boosted-reboot.css",
"maxSize": "4.5 kB"
},
{
"path": "./dist/css/boosted-reboot.min.css",
"maxSize": "4.25 kB"
"maxSize": "4.5 kB"
},
{
"path": "./dist/css/boosted-utilities.css",
"maxSize": "12.5 kB"
"maxSize": "12.75 kB"
},
{
"path": "./dist/css/boosted-utilities.min.css",
"maxSize": "11.5 kB"
"maxSize": "12.0 kB"
},
{
"path": "./dist/css/boosted.css",
"maxSize": "42.5 kB"
"maxSize": "44.5 kB"
},
{
"path": "./dist/css/boosted.min.css",
"maxSize": "39.25 kB"
"maxSize": "41.5 kB"
},
{
"path": "./dist/js/boosted.bundle.js",
"maxSize": "48.5 kB"
"maxSize": "48.25 kB"
},
{
"path": "./dist/js/boosted.bundle.min.js",
"maxSize": "25.0 kB"
"maxSize": "25.5 kB"
},
{
"path": "./dist/js/boosted.esm.js",
"maxSize": "33.25 kB"
"maxSize": "33.0 kB"
},
{
"path": "./dist/js/boosted.esm.min.js",
"maxSize": "20.5 kB"
"maxSize": "20.25 kB"
},
{
"path": "./dist/js/boosted.js",
"maxSize": "34.0 kB"
},
{
"path": "./dist/js/boosted.min.js",
"maxSize": "18.0 kB"
"maxSize": "18.25 kB"
}
],
"ci": {
Expand Down
11 changes: 6 additions & 5 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"Cpath",
"Crossfade",
"crossfading",
"cssgrid",
"csps",
"cssgrid",
"Csvg",
"Datalists",
"Deduping",
Expand All @@ -43,6 +43,7 @@
"dropright",
"dropstart",
"dropup",
"dgst",
"errorf",
"evenodd",
"favicon",
Expand All @@ -52,7 +53,6 @@
"française",
"fullscreen",
"getbootstrap",
"Gaël",
"Grayscale",
"Helv",
"Hoverable",
Expand All @@ -78,18 +78,18 @@
"mouseleave",
"myproject",
"navbars",
"navigations",
"navs",
"Neue",
"noindex",
"Noto",
"offcanvas",
"offcanvases",
"opensource",
"paginations",
"Packagist",
"paginations",
"pinterest",
"popperjs",
"Poupard",
"prebuild",
"preconnect",
"preconnecting",
Expand Down Expand Up @@ -121,6 +121,7 @@
"tabbable",
"tarteaucitron",
"textareas",
"tiktok",
"toggleable",
"topbar",
"touchend",
Expand All @@ -139,8 +140,8 @@
"Vite",
"vstack",
"walkthroughs",
"whatsapp",
"WCAG",
"whatsapp",
"WICG's",
"zindex",
"بالعالم",
Expand Down
11 changes: 7 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,14 @@
"unicorn/no-null": "off",
"unicorn/no-typeof-undefined": "off",
"unicorn/no-unused-properties": "error",
"unicorn/numeric-separators-style": "off",
"unicorn/prefer-array-flat": "off",
"unicorn/prefer-at": "off",
"unicorn/prefer-dom-node-dataset": "off",
"unicorn/prefer-module": "off",
"unicorn/prefer-query-selector": "off",
"unicorn/prefer-spread": "off",
"unicorn/prefer-string-replace-all": "off",
"unicorn/prevent-abbreviations": "off"
},
"overrides": [
Expand All @@ -105,7 +108,7 @@
"node": true
},
"parserOptions": {
"sourceType": "script"
"sourceType": "module"
},
"rules": {
"no-console": "off",
Expand Down Expand Up @@ -189,8 +192,7 @@
},
"rules": {
"no-new": "off",
"unicorn/no-array-for-each": "off",
"unicorn/numeric-separators-style": "off"
"unicorn/no-array-for-each": "off"
}
},
{
Expand All @@ -210,7 +212,8 @@
"no-multi-str": "off",
"strict": "error",
"unicorn/prefer-top-level-await": "off"
}
},
"extends": ["plugin:storybook/recommended"]
},
{
"files": [
Expand Down
6 changes: 6 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ restrictions:
Use [GitHub's "reactions" feature](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/)
instead. We reserve the right to delete comments which violate this rule.

## Issues assignment

The core team will be looking at the open issues, analyze them, and provide guidance on how to proceed. **Issues won't be assigned to anyone outside the core team.** However, contributors are welcome to participate in the discussion and provide their input on how to best solve the issue, and even submit a PR if they want to. Please wait that the issue is ready to be worked on before submitting a PR, we don't want to waste your time.

Please keep in mind that the core team is small, has limited resources and that we are not always able to respond immediately. We will try to provide feedback as soon as possible, but please be patient. If you don't get a response immediately, it doesn't mean that we are ignoring you or that we don't care about your issue or PR. We will get back to you as soon as we can.

## Issues and labels

Our bug tracker utilizes several labels to help organize and identify issues. Here's what they represent and how we use them:
Expand Down
28 changes: 14 additions & 14 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ _Note: Please transform `- [ ]` into `- (NA)` in the description when things are

### Types of change

<!-- What types of changes does you code introduce? -->
<!-- What types of changes do your code introduce? -->
<!-- Please remove the unused items in the list -->

- Bug fix (non-breaking which fixes an issue)
Expand Down Expand Up @@ -44,7 +44,7 @@ _Note: Please transform `- [ ]` into `- (NA)` in the description when things are
#### Design

- [ ] My change respects the design guidelines defined in [Orange Design System](https://system.design.orange.com/0c1af118d/p/8118d1-web)
- [ ] My change is compatible with responsive display
- [ ] My change is compatible with a responsive display

#### Development

Expand All @@ -59,7 +59,7 @@ _Note: Please transform `- [ ]` into `- (NA)` in the description when things are
### Checklist (for Core Team only)

- [ ] My change introduces changes to the migration guide
- [ ] My new component is added in Storybook
- [ ] My new component is well displayed in [Storybook](https://deploy-preview-{your_pr_number}--boosted.netlify.app/storybook)
- [ ] My new component is compatible with RTL
- [ ] Manually run [BrowserStack tests](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/actions/workflows/browserstack.yml)
- [ ] Manually test browser compatibility with BrowserStack (Chrome >= 60, Firefox >= 60 (+ ESR), Edge, Safari >= 12, iOS Safari, Chrome & Firefox on Android)
Expand Down Expand Up @@ -95,7 +95,7 @@ _Note: Please transform `- [ ]` into `- (NA)` in the description when things are
- then, if bumping a minor or major version:
- [ ] Manually change `version_short` in `package.json`
- [ ] Add docs version to `site/data/docs-versions.yml`
- [ ] Manually change `docs_version` in `config.yml` and other references to the previous version
- [ ] Manually change `docs_version` in `hugo.yml` and other references to the previous version
- [ ] Update redirects in docs frontmatter (`site/content/docs/_index.html`?)
- [ ] Move `site/content/docs/5.x` to `site/content/docs/5.x+1`
- [ ] Increment `site/static/docs/{version}` version
Expand All @@ -104,33 +104,33 @@ _Note: Please transform `- [ ]` into `- (NA)` in the description when things are
- check wrong matches in `CHANGELOG.md`, and maybe `site/content/docs/<version>/migration.md`
- :warning: check the `package-lock.json` and `package.json` content, only "boosted" should have its version changed!
- :warning: `site/content/docs/5.1/**/*.md` should not always be modified
- [ ] if year changed recently, happy new year :tada: but please change © year in `.scss` main files (reboot, grid, utilities and main file) as well as in `NOTICE.txt`.
- [ ] `npm run release` to compile dist, build Storybook, update SRI hashes in doc and package the release
- [ ] if the year changed recently, happy new year :tada: but please change © year in `.scss` main files (reboot, grid, utilities, and main file) as well as in `NOTICE.txt`.
- [ ] `npm run release` to compile dist, build Storybook, update SRI hashes in doc, and package the release
- [ ] Prepare changelog:
- install [Conventionnal Changelog](https://github.com/conventional-changelog/conventional-changelog) and `conventional-changelog-cli` globally
- run `conventional-changelog -p angular -i CHANGELOG.md -s`
- and probably maintain [a ship list (eg for v4.4.0)](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/issues/226)
- and probably maintain [a ship list (e.g. for v4.4.0)](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/issues/226)
- [ ] commit and push `dist` with a `chore(release)` commit message
- [ ] Manually run BrowserStack test
- [ ] Manually run Percy test
- [ ] merge (on `v4-dev` or `main`)
- [ ] tag your version, and push your tag
- [ ] [create a GitHub release](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/releases/new):
- attach zip file
- paste CHANGELOG / Ship list in the release's description
- attach the zip file
- paste the CHANGELOG / Ship list in the release's description
- [ ] Pack and publish
- `npm pack`
- if you are already logged in NPM (with a personnal account, for example), [you'd better use a repository scoped `.npmrc` file](https://stackoverflow.com/questions/30114166/how-to-have-multiple-npm-users-set-up-locally)
- if you are already logged in to NPM (with a personal account, for example), [you'd better use a repository scoped `.npmrc` file](https://stackoverflow.com/questions/30114166/how-to-have-multiple-npm-users-set-up-locally)
- Publish:
- if you're releasing a pre-release, use `--tag`, eg for v5-alpha1 `npm publish boosted-5.0.0-alpha1.tgz --tag next`
- if you're releasing a pre-release, use `--tag`, e.g. for v5-alpha1 `npm publish boosted-5.0.0-alpha1.tgz --tag next`
- (v4 only) `npm publish --tag v4.x.y` (if you forgot and v4 becomes the latest version on NPM, you can run `npm dist-tag add boosted@5.x.y latest to fix it)
- (v5 only) `npm publish`
- [ ] [publish on Nuget](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/wiki/Generate-NuGet-packages)
- [ ] check release on [NPM](https://www.npmjs.com/package/boosted), [Nuget](https://www.nuget.org/packages/boosted/), [Packagist](https://packagist.org/packages/orange-opensource/orange-boosted-bootstrap)…
- [ ] publish documentation on `gh-pages`:
- [ ] copy `../_site` to the `gh-pages` branch (don't forget to update Storybook as well)
- [ ] check every `index.html` used as redirections to be redirecting to the new release
- [ ] check every `index.html` used as redirections to redirect to the new release
- [ ] when bumping minor version: ensure `dist` URLs in examples' HTML has changed
- [ ] double-check everything before pushing, starting by searching for forgotten old version number occurences
- [ ] make an announcement in Plazza :tada:
- [ ] double-check everything before pushing, starting by searching for forgotten old version number occurrences
- [ ] make an announcement in [GitHub Discussions](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/discussions/categories/announcements) (+ pin the new GH Discussion) and internal communication channels :tada:
-->
15 changes: 12 additions & 3 deletions .github/SUPPORT.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@ See the [contributing guidelines](CONTRIBUTING.md) for sharing bug reports.

### How-to

For general troubleshooting or help getting started:
For general Boosted troubleshooting or help getting started:

- Ask and explore [our GitHub Discussions](https://github.com/twbs/bootstrap/discussions).
- Ask questions and explore [our GitHub Discussions](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/discussions).
- Chat with the core team and fellow Boosted users on internal Orange communication tools.

For general Bootstrap troubleshooting or help getting started:

- Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap).
- Read and subscribe to [The Official Bootstrap Blog](https://blog.getbootstrap.com/).
- Ask questions and explore [Bootstrap GitHub Discussions](https://github.com/twbs/bootstrap/discussions).
- Discuss, ask questions, and more on [the community Discord](https://discord.gg/bZUvakRU3M) or [Bootstrap subreddit](https://reddit.com/r/bootstrap).
- Chat with fellow Bootstrappers in IRC. On the `irc.libera.chat` server, in the `#bootstrap` channel.
- Ask and explore Stack Overflow with the [`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5) tag.
- Implementation help may be found at Stack Overflow (tagged [`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5)).
- Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ updates:
- dependency-name: "karma-rollup-preprocessor"
- dependency-name: "lockfile-lint"
- dependency-name: "nodemon"
- dependency-name: "npm-run-all"
- dependency-name: "npm-run-all2"
- dependency-name: "postcss"
- dependency-name: "postcss-cli"
- dependency-name: "rollup"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/browserstack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

env:
FORCE_COLOR: 2
NODE: 18
NODE: 20

permissions:
contents: read
Expand All @@ -15,16 +15,16 @@ jobs:
browserstack:
runs-on: ubuntu-latest
timeout-minutes: 30
if: "!(contains(github.event.*.labels.*.name, 'skip:ci') || github.actor == 'dependabot[bot]')"
if: github.actor != 'dependabot[bot]'

steps:
- name: Clone repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "${{ env.NODE }}"
cache: npm
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/bundlewatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,29 @@ on:
- 'js/**'
- 'scss/**'
pull_request:
types: [labeled, unlabeled, opened, reopened, synchronize]
types: [opened, reopened, synchronize]
workflow_dispatch:

env:
FORCE_COLOR: 2
NODE: 18
NODE: 20

permissions:
contents: read

jobs:
bundlewatch:
runs-on: ubuntu-latest
if: "!(contains(github.event.*.labels.*.name, 'skip:ci') || github.actor == 'dependabot[bot]')"
if: github.actor != 'dependabot[bot]'

steps:
- name: Clone repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "${{ env.NODE }}"
cache: npm
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/calibreapp-image-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,21 @@ on:
types: [opened, synchronize]
workflow_dispatch:

permissions:
contents: read

jobs:
build:
# Only run on Pull Requests within the same repository, and not from forks.
if: github.event.pull_request.head.repo.full_name == github.repository
name: calibreapp/image-actions
runs-on: ubuntu-latest
permissions:
# allow calibreapp/image-actions to update PRs
pull-requests: write
steps:
- name: Checkout Repo
uses: actions/checkout@v3
- name: Clone repository
uses: actions/checkout@v4
with:
persist-credentials: false

Expand Down
Loading

0 comments on commit 585532a

Please sign in to comment.