Skip to content

Commit 2545c24

Browse files
committed
Merge branch 'main' of https://github.com/coreui/coreui into v4-dev-sync
# Conflicts: # .github/workflows-turnoff/browserstack.yml # README.md # config.yml # dist/css/coreui-grid.css # dist/css/coreui-grid.css.map # dist/css/coreui-grid.min.css # dist/css/coreui-grid.min.css.map # dist/css/coreui-grid.rtl.css # dist/css/coreui-grid.rtl.css.map # dist/css/coreui-grid.rtl.min.css # dist/css/coreui-grid.rtl.min.css.map # dist/css/coreui-reboot.css # dist/css/coreui-reboot.css.map # dist/css/coreui-reboot.min.css # dist/css/coreui-reboot.min.css.map # dist/css/coreui-reboot.rtl.css # dist/css/coreui-reboot.rtl.css.map # dist/css/coreui-reboot.rtl.min.css # dist/css/coreui-reboot.rtl.min.css.map # dist/css/coreui-utilities.css # dist/css/coreui-utilities.css.map # dist/css/coreui-utilities.min.css # dist/css/coreui-utilities.min.css.map # dist/css/coreui-utilities.rtl.css # dist/css/coreui-utilities.rtl.css.map # dist/css/coreui-utilities.rtl.min.css # dist/css/coreui-utilities.rtl.min.css.map # dist/css/coreui.css # dist/css/coreui.css.map # dist/css/coreui.min.css # dist/css/coreui.min.css.map # dist/css/coreui.rtl.css # dist/css/coreui.rtl.css.map # dist/css/coreui.rtl.min.css # dist/css/coreui.rtl.min.css.map # dist/js/coreui.bundle.js # dist/js/coreui.bundle.js.map # dist/js/coreui.bundle.min.js # dist/js/coreui.bundle.min.js.map # dist/js/coreui.esm.js # dist/js/coreui.esm.js.map # dist/js/coreui.esm.min.js # dist/js/coreui.esm.min.js.map # dist/js/coreui.js # dist/js/coreui.js.map # dist/js/coreui.min.js # dist/js/coreui.min.js.map # js/dist/alert.js # js/dist/alert.js.map # js/dist/base-component.js # js/dist/base-component.js.map # js/dist/button.js # js/dist/button.js.map # js/dist/carousel.js # js/dist/carousel.js.map # js/dist/collapse.js # js/dist/collapse.js.map # js/dist/dom/data.js # js/dist/dom/data.js.map # js/dist/dom/event-handler.js # js/dist/dom/event-handler.js.map # js/dist/dom/manipulator.js # js/dist/dom/manipulator.js.map # js/dist/dom/selector-engine.js # js/dist/dom/selector-engine.js.map # js/dist/dropdown.js # js/dist/dropdown.js.map # js/dist/modal.js # js/dist/modal.js.map # js/dist/offcanvas.js # js/dist/offcanvas.js.map # js/dist/popover.js # js/dist/popover.js.map # js/dist/scrollspy.js # js/dist/scrollspy.js.map # js/dist/tab.js # js/dist/tab.js.map # js/dist/toast.js # js/dist/toast.js.map # js/dist/tooltip.js # js/dist/tooltip.js.map # js/index.esm.js # js/index.umd.js # js/src/alert.js # js/src/base-component.js # js/src/button.js # js/src/carousel.js # js/src/collapse.js # js/src/dom/data.js # js/src/dom/event-handler.js # js/src/dom/manipulator.js # js/src/dom/selector-engine.js # js/src/dropdown.js # js/src/modal.js # js/src/navigation.js # js/src/offcanvas.js # js/src/popover.js # js/src/scrollspy.js # js/src/sidebar.js # js/src/tab.js # js/src/toast.js # js/src/tooltip.js # js/src/util/index.js # js/src/util/sanitizer.js # package-lock.json # package.js # package.json # scss/coreui-grid.rtl.scss # scss/coreui-grid.scss # scss/coreui-reboot.rtl.scss # scss/coreui-reboot.scss # scss/coreui-utilities.rtl.scss # scss/coreui-utilities.scss # scss/coreui.rtl.scss # scss/coreui.scss
2 parents 1235ccc + 8a00c7c commit 2545c24

39 files changed

+55
-252
lines changed

.bundlewatch.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
],
6060
"ci": {
6161
"trackBranches": [
62-
"v4-dev"
62+
"main"
6363
]
6464
}
6565
}

.github/CODEOWNERS

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/SUPPORT.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ See the [contributing guidelines](CONTRIBUTING.md) for sharing bug reports.
66

77
For general troubleshooting or help getting started:
88

9-
- Join [the official Slack room](https://bootstrap-slack.herokuapp.com/).
10-
- Chat with fellow Bootstrappers in IRC. On the `irc.libera.chat` server, in the `#bootstrap` channel.
11-
- Ask and explore Stack Overflow with the [`bootstrap-5`](https://stackoverflow.com/questions/tagged/bootstrap-5) tag.
9+
- Join [the official community](https://community.coreui.io/).
10+
- Ask and explore Stack Overflow with the [`coreui`](https://stackoverflow.com/questions/tagged/coreui) tag.

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ updates:
99
timezone: Europe/Athens
1010
open-pull-requests-limit: 10
1111
reviewers:
12-
- XhmikosR
12+
- mrholek
1313
labels:
1414
- dependencies
15-
- v5
15+
- v4
1616
versioning-strategy: increase
1717
rebase-strategy: disabled
1818
- package-ecosystem: "github-actions"

.github/workflows-turnoff/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
push:
55
branches:
66
- main
7-
- v4-dev
7+
- main
88
- "!dependabot/**"
99
pull_request:
1010
# The branches below must be a subset of the branches above
1111
branches:
1212
- main
13-
- v4-dev
13+
- main
1414
- "!dependabot/**"
1515
schedule:
1616
- cron: "0 2 * * 5"

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
3434

3535
## Enforcement
3636

37-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
3838

3939
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
4040

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ Read the [Getting started page](https://coreui.io/docs/4.0/getting-started/intro
5757
[![Packagist Prerelease](https://img.shields.io/packagist/vpre/coreui/coreui)](https://packagist.org/packages/coreui/coreui)
5858
[![peerDependencies Status](https://img.shields.io/david/peer/coreui/coreui)](https://david-dm.org/coreui/coreui?type=peer)
5959
[![devDependency Status](https://img.shields.io/david/dev/coreui/coreui)](https://david-dm.org/coreui/coreui?type=dev)
60-
[![Coverage Status](https://img.shields.io/coveralls/github/coreui/coreui/v4-dev)](https://coveralls.io/github/coreui/coreui?branch=v4-dev)
61-
[![CSS gzip size](https://img.badgesize.io/coreui/coreui/main/dist/css/coreui.min.css?compression=gzip&label=CSS%20gzip%20size)](https://github.com/coreui/coreui/blob/v4-dev/dist/css/coreui.min.css)
62-
[![CSS Brotli size](https://img.badgesize.io/coreui/coreui/main/dist/css/coreui.min.css?compression=brotli&label=CSS%20Brotli%20size)](https://github.com/coreui/coreui/blob/v4-dev/dist/css/coreui.min.css)
63-
[![JS gzip size](https://img.badgesize.io/coreui/coreui/main/dist/js/coreui.min.js?compression=gzip&label=JS%20gzip%20size)](https://github.com/coreui/coreui/blob/v4-dev/dist/js/coreui.min.js)
64-
[![JS Brotli size](https://img.badgesize.io/coreui/coreui/main/dist/js/coreui.min.js?compression=brotli&label=JS%20Brotli%20size)](https://github.com/coreui/coreui/blob/v4-dev/dist/js/coreui.min.js)
60+
[![Coverage Status](https://img.shields.io/coveralls/github/coreui/coreui/main)](https://coveralls.io/github/coreui/coreui?branch=main)
61+
[![CSS gzip size](https://img.badgesize.io/coreui/coreui/main/dist/css/coreui.min.css?compression=gzip&label=CSS%20gzip%20size)](https://github.com/coreui/coreui/blob/main/dist/css/coreui.min.css)
62+
[![CSS Brotli size](https://img.badgesize.io/coreui/coreui/main/dist/css/coreui.min.css?compression=brotli&label=CSS%20Brotli%20size)](https://github.com/coreui/coreui/blob/main/dist/css/coreui.min.css)
63+
[![JS gzip size](https://img.badgesize.io/coreui/coreui/main/dist/js/coreui.min.js?compression=gzip&label=JS%20gzip%20size)](https://github.com/coreui/coreui/blob/main/dist/js/coreui.min.js)
64+
[![JS Brotli size](https://img.badgesize.io/coreui/coreui/main/dist/js/coreui.min.js?compression=brotli&label=JS%20Brotli%20size)](https://github.com/coreui/coreui/blob/main/dist/js/coreui.min.js)
6565

6666

6767
## What's included
@@ -123,7 +123,7 @@ We provide compiled CSS and JS (`coreui.*`), as well as compiled and minified CS
123123

124124
## Bugs and feature requests
125125

126-
Have a bug or a feature request? Please first read the [issue guidelines](https://github.com/coreui/coreui/blob/v4-dev/.github/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/coreui/coreui/issues/new).
126+
Have a bug or a feature request? Please first read the [issue guidelines](https://github.com/coreui/coreui/blob/main/.github/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/coreui/coreui/issues/new).
127127

128128
## Documentation
129129

@@ -142,9 +142,9 @@ Learn more about using Hugo by reading its [documentation](https://gohugo.io/doc
142142

143143
## Contributing
144144

145-
Please read through our [contributing guidelines](https://github.com/coreui/coreui/blob/v4-dev/.github/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
145+
Please read through our [contributing guidelines](https://github.com/coreui/coreui/blob/main/.github/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
146146

147-
Editor preferences are available in the [editor config](https://github.com/coreui/coreui/blob/v4-dev/.editorconfig) for easy use in common text editors. Read more and download plugins at <https://editorconfig.org/>.
147+
Editor preferences are available in the [editor config](https://github.com/coreui/coreui/blob/main/.editorconfig) for easy use in common text editors. Read more and download plugins at <https://editorconfig.org/>.
148148

149149

150150
## Community
@@ -180,4 +180,4 @@ CoreUI is designed as the extension of [Bootstrap](https://getbootstrap.com). Sp
180180

181181
## Copyright and license
182182

183-
Copyright 2021 creativeLabs Łukasz Holeczek. Code released under the [MIT License](https://github.com/coreui/coreui/blob/v4-dev/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
183+
Copyright 2021 creativeLabs Łukasz Holeczek. Code released under the [MIT License](https://github.com/coreui/coreui/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).

SECURITY.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Reporting Security Issues
22

3-
The Bootstrap team and community take security issues in Bootstrap seriously. We appreciate your efforts to responsibly disclose your findings, and will make every effort to acknowledge your contributions.
3+
The CoreUI team and community take security issues in CoreUI seriously. We appreciate your efforts to responsibly disclose your findings, and will make every effort to acknowledge your contributions.
44

5-
To report a security issue, email [[email protected]](mailto:[email protected]) and include the word "SECURITY" in the subject line.
5+
To report a security issue, email [[email protected]](mailto:[email protected]) and include the word "SECURITY" in the subject line.
66

77
We'll endeavor to respond quickly, and will keep you updated throughout the process.

build/zip-examples.js

Lines changed: 0 additions & 90 deletions
This file was deleted.

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
"authors": [
1616
{
1717
"name": "The CoreUI Team",
18-
"homepage": "https://github.com/orgs/coreui/people",
18+
"homepage": "https://github.com/orgs/coreui/people"
1919
}
2020
],
2121
"support": {
2222
"issues": "https://github.com/coreui/coreui/issues"
2323
},
2424
"license": "MIT",
2525
"replace": {
26-
"twitter/bootstrap": "self.version"
26+
"coreui/coreui": "self.version"
2727
}
2828
}

0 commit comments

Comments
 (0)