Skip to content

Commit e26e7fa

Browse files
digital-codesdigital-codes
authored
Merge branch 'coreui:main' into main
2 parents 933e0b5 + f389e6d commit e26e7fa

File tree

9 files changed

+233
-12
lines changed

9 files changed

+233
-12
lines changed

‎.github/FUNDING.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# These are supported funding model platforms
22

3-
custom: "https://coreui.io/pro/"
3+
custom: "https://coreui.io/pricing/?support=true"
4+
open_collective: coreui

‎README.md

+112-4
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,24 @@
2020
·
2121
<a href="https://github.com/coreui/coreui-vue/issues/new?template=feature_request.md">Request feature</a>
2222
·
23-
<a href="https://blog.coreui.io/">Blog</a>
23+
<a href="https://coreui.io/blog/">Blog</a>
2424
</p>
2525

2626

2727
## Table of contents
2828

2929
- [Quick start](#quick-start)
30+
- [Components](#components)
3031
- [Status](#status)
31-
- [What's included](#whats-included)
3232
- [Bugs and feature requests](#bugs-and-feature-requests)
3333
- [Documentation](#documentation)
34+
- [Frameworks](#frameworks)
35+
- [Templates](#templates)
3436
- [Contributing](#contributing)
3537
- [Community](#community)
3638
- [Versioning](#versioning)
3739
- [Creators](#creators)
40+
- [Support CoreUI Development](#support-coreui-development)
3841
- [Copyright and license](#copyright-and-license)
3942

4043
## Quick start
@@ -94,6 +97,55 @@ npm install bootstrap
9497
import "bootstrap/dist/css/bootstrap.min.css";
9598
```
9699

100+
## Components
101+
102+
- [Vue Accordion](https://coreui.io/vue/docs/components/accordion.html)
103+
- [Vue Alert](https://coreui.io/vue/docs/components/alert.html)
104+
- [Vue Avatar](https://coreui.io/vue/docs/components/avatar.html)
105+
- [Vue Badge](https://coreui.io/vue/docs/components/badge.html)
106+
- [Vue Breadcrumb](https://coreui.io/vue/docs/components/breadcrumb.html)
107+
- [Vue Button](https://coreui.io/vue/docs/components/button.html)
108+
- [Vue Button Group](https://coreui.io/vue/docs/components/button-group.html)
109+
- [Vue Callout](https://coreui.io/vue/docs/components/callout.html)
110+
- [Vue Card](https://coreui.io/vue/docs/components/card.html)
111+
- [Vue Carousel](https://coreui.io/vue/docs/components/carousel.html)
112+
- [Vue Checkbox](https://coreui.io/vue/docs/forms/checkbox.html)
113+
- [Vue Close Button](https://coreui.io/vue/docs/components/close-button.html)
114+
- [Vue Collapse](https://coreui.io/vue/docs/components/collapse.html)
115+
- [Vue Date Picker](https://coreui.io/vue/docs/forms/date-picker.html) **PRO**
116+
- [Vue Date Range Picker](https://coreui.io/vue/docs/forms/date-range-picker.html) **PRO**
117+
- [Vue Dropdown](https://coreui.io/vue/docs/components/dropdown.html)
118+
- [Vue Floating Labels](https://coreui.io/vue/docs/forms/floating-labels.html)
119+
- [Vue Footer](https://coreui.io/vue/docs/components/footer.html)
120+
- [Vue Header](https://coreui.io/vue/docs/components/header.html)
121+
- [Vue Image](https://coreui.io/vue/docs/components/image.html)
122+
- [Vue Input](https://coreui.io/vue/docs/forms/input.html)
123+
- [Vue Input Group](https://coreui.io/vue/docs/forms/input-group.html)
124+
- [Vue List Group](https://coreui.io/vue/docs/components/list-group.html)
125+
- [Vue Loading Button](https://coreui.io/vue/docs/components/loading-button.html) **PRO**
126+
- [Vue Modal](https://coreui.io/vue/docs/components/modal.html)
127+
- [Vue Multi Select](https://coreui.io/vue/docs/forms/multi-select.html) **PRO**
128+
- [Vue Navs & Tabs](https://coreui.io/vue/docs/components/navs-tabs.html)
129+
- [Vue Navbar](https://coreui.io/vue/docs/components/navbar.html)
130+
- [Vue Offcanvas](https://coreui.io/vue/docs/components/offcanvas.html)
131+
- [Vue Pagination](https://coreui.io/vue/docs/components/pagination.html)
132+
- [Vue Placeholder](https://coreui.io/vue/docs/components/placeholder.html)
133+
- [Vue Popover](https://coreui.io/vue/docs/components/popover.html)
134+
- [Vue Progress](https://coreui.io/vue/docs/components/progress.html)
135+
- [Vue Radio](https://coreui.io/vue/docs/forms/radio.html)
136+
- [Vue Range](https://coreui.io/vue/docs/forms/range.html)
137+
- [Vue Select](https://coreui.io/vue/docs/forms/select.html)
138+
- [Vue Sidebar](https://coreui.io/vue/docs/components/sidebar.html)
139+
- [Vue Smart Pagination](https://coreui.io/vue/docs/components/smart-pagination.html) **PRO**
140+
- [Vue Smart Table](https://coreui.io/vue/docs/components/smart-table.html) **PRO**
141+
- [Vue Spinner](https://coreui.io/vue/docs/components/spinner.html)
142+
- [Vue Switch](https://coreui.io/vue/docs/forms/switch.html)
143+
- [Vue Table](https://coreui.io/vue/docs/components/table.html)
144+
- [Vue Textarea](https://coreui.io/vue/docs/forms/textarea.html)
145+
- [Vue Time Picker](https://coreui.io/vue/docs/forms/time-picker.html) **PRO**
146+
- [Vue Toast](https://coreui.io/vue/docs/components/toast.html)
147+
- [Vue Tooltip](https://coreui.io/vue/docs/components/tooltip.html)
148+
97149
## Status
98150

99151
[![Build Status](https://github.com/coreui/coreui-vue/workflows/JS%20Tests/badge.svg?branch=main)](https://github.com/coreui/coreui-vue/actions?query=workflow%3AJS+Tests+branch%3Amain)
@@ -117,6 +169,24 @@ The documentation for the CoreUI & CoreUI PRO is hosted at our website [CoreUI f
117169
3. From the root directory, run `yarn docs:dev` or `npm run docs:dev` (or a specific npm script) to rebuild distributed CSS and JavaScript files, as well as our docs assets.
118170
4. Open `http://localhost:8000/` in your browser, and voilà.
119171

172+
## Frameworks
173+
174+
CoreUI supports most popular frameworks.
175+
176+
- [CoreUI for Angular](https://github.com/coreui/coreui-angular)
177+
- [CoreUI for Bootstrap (Vanilla JS)](https://github.com/coreui/coreui)
178+
- [CoreUI for React](https://github.com/coreui/coreui-react)
179+
- [CoreUI for Vue](https://github.com/coreui/coreui-vue)
180+
181+
## Templates
182+
183+
Fully featured, out-of-the-box, templates for your application based on CoreUI.
184+
185+
- [Angular Admin Template](https://coreui.io/angular)
186+
- [Bootstrap Admin Template](https://coreui.io/)
187+
- [React Admin Template](https://coreui.io/react)
188+
- [Vue Admin Template](https://coreui.io/vue)
189+
120190
## Contributing
121191

122192
Please read through our [contributing guidelines](https://github.com/coreui/coreui-vue/blob/main/.github/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
@@ -127,7 +197,7 @@ Editor preferences are available in the [editor config](https://github.com/coreu
127197

128198
Stay up to date on the development of CoreUI and reach out to the community with these helpful resources.
129199

130-
- Read and subscribe to [The Official CoreUI Blog](https://blog.coreui.io/).
200+
- Read and subscribe to [The Official CoreUI Blog](https://coreui.io/blog/).
131201

132202
You can also follow [@core_ui on Twitter](https://twitter.com/core_ui).
133203

@@ -152,6 +222,44 @@ See [the Releases section of our project](https://github.com/coreui/coreui-vue/r
152222

153223
- <https://github.com/orgs/coreui/people>
154224

225+
## Support CoreUI Development
226+
227+
CoreUI is an MIT-licensed open source project and is completely free to use. However, the amount of effort needed to maintain and develop new features for the project is not sustainable without proper financial backing. You can support development by buying the [CoreUI PRO](https://coreui.io/pricing/) or by becoming a sponsor via [Open Collective](https://opencollective.com/coreui/).
228+
229+
<!--- StartOpenCollectiveBackers -->
230+
231+
### Platinum Sponsors
232+
233+
Support this project by [becoming a Platinum Sponsor](https://opencollective.com/coreui/contribute/platinum-sponsor-40959/). A large company logo will be added here with a link to your website.
234+
235+
<a href="https://opencollective.com/coreui/contribute/platinum-sponsor-40959/checkout"><img src="https://opencollective.com/coreui/tiers/platinum-sponsor/0/avatar.svg?avatarHeight=100"></a>
236+
237+
### Gold Sponsors
238+
239+
Support this project by [becoming a Gold Sponsor](https://opencollective.com/coreui/contribute/gold-sponsor-40960/). A big company logo will be added here with a link to your website.
240+
241+
<a href="https://opencollective.com/coreui/contribute/gold-sponsor-40960/checkout"><img src="https://opencollective.com/coreui/tiers/gold-sponsor/0/avatar.svg?avatarHeight=100"></a>
242+
243+
### Silver Sponsors
244+
245+
Support this project by [becoming a Silver Sponsor](https://opencollective.com/coreui/contribute/silver-sponsor-40967/). A medium company logo will be added here with a link to your website.
246+
247+
<a href="https://opencollective.com/coreui/contribute/silver-sponsor-40967/checkout"><img src="https://opencollective.com/coreui/tiers/gold-sponsor/0/avatar.svg?avatarHeight=100"></a>
248+
249+
### Bronze Sponsors
250+
251+
Support this project by [becoming a Bronze Sponsor](https://opencollective.com/coreui/contribute/bronze-sponsor-40966/). The company avatar will show up here with a link to your OpenCollective Profile.
252+
253+
<a href="https://opencollective.com/coreui/contribute/bronze-sponsor-40966/checkout"><img src="https://opencollective.com/coreui/tiers/bronze-sponsor/0/avatar.svg?avatarHeight=100"></a>
254+
255+
### Backers
256+
257+
Thanks to all the backers and sponsors! Support this project by [becoming a backer](https://opencollective.com/coreui/contribute/backer-40965/).
258+
259+
<a href="https://opencollective.com/coreui/contribute/backer-40965/checkout" target="_blank" rel="noopener"><img src="https://opencollective.com/coreui/backers.svg?width=890"></a>
260+
261+
<!--- EndOpenCollectiveBackers -->
262+
155263
## Copyright and license
156264

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

‎packages/coreui-vue/README.md

+112-4
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,24 @@
2020
·
2121
<a href="https://github.com/coreui/coreui-vue/issues/new?template=feature_request.md">Request feature</a>
2222
·
23-
<a href="https://blog.coreui.io/">Blog</a>
23+
<a href="https://coreui.io/blog/">Blog</a>
2424
</p>
2525

2626

2727
## Table of contents
2828

2929
- [Quick start](#quick-start)
30+
- [Components](#components)
3031
- [Status](#status)
31-
- [What's included](#whats-included)
3232
- [Bugs and feature requests](#bugs-and-feature-requests)
3333
- [Documentation](#documentation)
34+
- [Frameworks](#frameworks)
35+
- [Templates](#templates)
3436
- [Contributing](#contributing)
3537
- [Community](#community)
3638
- [Versioning](#versioning)
3739
- [Creators](#creators)
40+
- [Support CoreUI Development](#support-coreui-development)
3841
- [Copyright and license](#copyright-and-license)
3942

4043
## Quick start
@@ -94,6 +97,55 @@ npm install bootstrap
9497
import "bootstrap/dist/css/bootstrap.min.css";
9598
```
9699

100+
## Components
101+
102+
- [Vue Accordion](https://coreui.io/vue/docs/components/accordion.html)
103+
- [Vue Alert](https://coreui.io/vue/docs/components/alert.html)
104+
- [Vue Avatar](https://coreui.io/vue/docs/components/avatar.html)
105+
- [Vue Badge](https://coreui.io/vue/docs/components/badge.html)
106+
- [Vue Breadcrumb](https://coreui.io/vue/docs/components/breadcrumb.html)
107+
- [Vue Button](https://coreui.io/vue/docs/components/button.html)
108+
- [Vue Button Group](https://coreui.io/vue/docs/components/button-group.html)
109+
- [Vue Callout](https://coreui.io/vue/docs/components/callout.html)
110+
- [Vue Card](https://coreui.io/vue/docs/components/card.html)
111+
- [Vue Carousel](https://coreui.io/vue/docs/components/carousel.html)
112+
- [Vue Checkbox](https://coreui.io/vue/docs/forms/checkbox.html)
113+
- [Vue Close Button](https://coreui.io/vue/docs/components/close-button.html)
114+
- [Vue Collapse](https://coreui.io/vue/docs/components/collapse.html)
115+
- [Vue Date Picker](https://coreui.io/vue/docs/forms/date-picker.html) **PRO**
116+
- [Vue Date Range Picker](https://coreui.io/vue/docs/forms/date-range-picker.html) **PRO**
117+
- [Vue Dropdown](https://coreui.io/vue/docs/components/dropdown.html)
118+
- [Vue Floating Labels](https://coreui.io/vue/docs/forms/floating-labels.html)
119+
- [Vue Footer](https://coreui.io/vue/docs/components/footer.html)
120+
- [Vue Header](https://coreui.io/vue/docs/components/header.html)
121+
- [Vue Image](https://coreui.io/vue/docs/components/image.html)
122+
- [Vue Input](https://coreui.io/vue/docs/forms/input.html)
123+
- [Vue Input Group](https://coreui.io/vue/docs/forms/input-group.html)
124+
- [Vue List Group](https://coreui.io/vue/docs/components/list-group.html)
125+
- [Vue Loading Button](https://coreui.io/vue/docs/components/loading-button.html) **PRO**
126+
- [Vue Modal](https://coreui.io/vue/docs/components/modal.html)
127+
- [Vue Multi Select](https://coreui.io/vue/docs/forms/multi-select.html) **PRO**
128+
- [Vue Navs & Tabs](https://coreui.io/vue/docs/components/navs-tabs.html)
129+
- [Vue Navbar](https://coreui.io/vue/docs/components/navbar.html)
130+
- [Vue Offcanvas](https://coreui.io/vue/docs/components/offcanvas.html)
131+
- [Vue Pagination](https://coreui.io/vue/docs/components/pagination.html)
132+
- [Vue Placeholder](https://coreui.io/vue/docs/components/placeholder.html)
133+
- [Vue Popover](https://coreui.io/vue/docs/components/popover.html)
134+
- [Vue Progress](https://coreui.io/vue/docs/components/progress.html)
135+
- [Vue Radio](https://coreui.io/vue/docs/forms/radio.html)
136+
- [Vue Range](https://coreui.io/vue/docs/forms/range.html)
137+
- [Vue Select](https://coreui.io/vue/docs/forms/select.html)
138+
- [Vue Sidebar](https://coreui.io/vue/docs/components/sidebar.html)
139+
- [Vue Smart Pagination](https://coreui.io/vue/docs/components/smart-pagination.html) **PRO**
140+
- [Vue Smart Table](https://coreui.io/vue/docs/components/smart-table.html) **PRO**
141+
- [Vue Spinner](https://coreui.io/vue/docs/components/spinner.html)
142+
- [Vue Switch](https://coreui.io/vue/docs/forms/switch.html)
143+
- [Vue Table](https://coreui.io/vue/docs/components/table.html)
144+
- [Vue Textarea](https://coreui.io/vue/docs/forms/textarea.html)
145+
- [Vue Time Picker](https://coreui.io/vue/docs/forms/time-picker.html) **PRO**
146+
- [Vue Toast](https://coreui.io/vue/docs/components/toast.html)
147+
- [Vue Tooltip](https://coreui.io/vue/docs/components/tooltip.html)
148+
97149
## Status
98150

99151
[![Build Status](https://github.com/coreui/coreui-vue/workflows/JS%20Tests/badge.svg?branch=main)](https://github.com/coreui/coreui-vue/actions?query=workflow%3AJS+Tests+branch%3Amain)
@@ -117,6 +169,24 @@ The documentation for the CoreUI & CoreUI PRO is hosted at our website [CoreUI f
117169
3. From the root directory, run `yarn docs:dev` or `npm run docs:dev` (or a specific npm script) to rebuild distributed CSS and JavaScript files, as well as our docs assets.
118170
4. Open `http://localhost:8000/` in your browser, and voilà.
119171

172+
## Frameworks
173+
174+
CoreUI supports most popular frameworks.
175+
176+
- [CoreUI for Angular](https://github.com/coreui/coreui-angular)
177+
- [CoreUI for Bootstrap (Vanilla JS)](https://github.com/coreui/coreui)
178+
- [CoreUI for React](https://github.com/coreui/coreui-react)
179+
- [CoreUI for Vue](https://github.com/coreui/coreui-vue)
180+
181+
## Templates
182+
183+
Fully featured, out-of-the-box, templates for your application based on CoreUI.
184+
185+
- [Angular Admin Template](https://coreui.io/angular)
186+
- [Bootstrap Admin Template](https://coreui.io/)
187+
- [React Admin Template](https://coreui.io/react)
188+
- [Vue Admin Template](https://coreui.io/vue)
189+
120190
## Contributing
121191

122192
Please read through our [contributing guidelines](https://github.com/coreui/coreui-vue/blob/main/.github/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
@@ -127,7 +197,7 @@ Editor preferences are available in the [editor config](https://github.com/coreu
127197

128198
Stay up to date on the development of CoreUI and reach out to the community with these helpful resources.
129199

130-
- Read and subscribe to [The Official CoreUI Blog](https://blog.coreui.io/).
200+
- Read and subscribe to [The Official CoreUI Blog](https://coreui.io/blog/).
131201

132202
You can also follow [@core_ui on Twitter](https://twitter.com/core_ui).
133203

@@ -152,6 +222,44 @@ See [the Releases section of our project](https://github.com/coreui/coreui-vue/r
152222

153223
- <https://github.com/orgs/coreui/people>
154224

225+
## Support CoreUI Development
226+
227+
CoreUI is an MIT-licensed open source project and is completely free to use. However, the amount of effort needed to maintain and develop new features for the project is not sustainable without proper financial backing. You can support development by buying the [CoreUI PRO](https://coreui.io/pricing/) or by becoming a sponsor via [Open Collective](https://opencollective.com/coreui/).
228+
229+
<!--- StartOpenCollectiveBackers -->
230+
231+
### Platinum Sponsors
232+
233+
Support this project by [becoming a Platinum Sponsor](https://opencollective.com/coreui/contribute/platinum-sponsor-40959/). A large company logo will be added here with a link to your website.
234+
235+
<a href="https://opencollective.com/coreui/contribute/platinum-sponsor-40959/checkout"><img src="https://opencollective.com/coreui/tiers/platinum-sponsor/0/avatar.svg?avatarHeight=100"></a>
236+
237+
### Gold Sponsors
238+
239+
Support this project by [becoming a Gold Sponsor](https://opencollective.com/coreui/contribute/gold-sponsor-40960/). A big company logo will be added here with a link to your website.
240+
241+
<a href="https://opencollective.com/coreui/contribute/gold-sponsor-40960/checkout"><img src="https://opencollective.com/coreui/tiers/gold-sponsor/0/avatar.svg?avatarHeight=100"></a>
242+
243+
### Silver Sponsors
244+
245+
Support this project by [becoming a Silver Sponsor](https://opencollective.com/coreui/contribute/silver-sponsor-40967/). A medium company logo will be added here with a link to your website.
246+
247+
<a href="https://opencollective.com/coreui/contribute/silver-sponsor-40967/checkout"><img src="https://opencollective.com/coreui/tiers/gold-sponsor/0/avatar.svg?avatarHeight=100"></a>
248+
249+
### Bronze Sponsors
250+
251+
Support this project by [becoming a Bronze Sponsor](https://opencollective.com/coreui/contribute/bronze-sponsor-40966/). The company avatar will show up here with a link to your OpenCollective Profile.
252+
253+
<a href="https://opencollective.com/coreui/contribute/bronze-sponsor-40966/checkout"><img src="https://opencollective.com/coreui/tiers/bronze-sponsor/0/avatar.svg?avatarHeight=100"></a>
254+
255+
### Backers
256+
257+
Thanks to all the backers and sponsors! Support this project by [becoming a backer](https://opencollective.com/coreui/contribute/backer-40965/).
258+
259+
<a href="https://opencollective.com/coreui/contribute/backer-40965/checkout" target="_blank" rel="noopener"><img src="https://opencollective.com/coreui/backers.svg?width=890"></a>
260+
261+
<!--- EndOpenCollectiveBackers -->
262+
155263
## Copyright and license
156264

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

‎packages/coreui-vue/src/components/close-button/CCloseButton.ts

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export const CCloseButton = defineComponent({
3434
}
3535
return () =>
3636
h('button', {
37+
type: 'button',
3738
class: [
3839
'btn',
3940
'btn-close',

‎packages/coreui-vue/src/components/form/CFormControlWrapper.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const CFormControlWrapper = defineComponent({
4343
setup(props, { slots }) {
4444
return () =>
4545
props.floatingLabel
46-
? h(CFormFloating, [
46+
? h(CFormFloating, () => [
4747
slots.default && slots.default(),
4848
h(
4949
CFormLabel,

‎packages/coreui-vue/src/components/form/CFormInput.ts

+1
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ const CFormInput = defineComponent({
171171
h(
172172
'input',
173173
{
174+
id: props.id,
174175
...attrs,
175176
class: [
176177
props.plainText ? 'form-control-plaintext' : 'form-control',

‎packages/coreui-vue/src/components/form/CFormSelect.ts

+1
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ const CFormSelect = defineComponent({
165165
h(
166166
'select',
167167
{
168+
id: props.id,
168169
...attrs,
169170
class: [
170171
'form-select',

‎packages/coreui-vue/src/components/form/CFormTextarea.ts

+1
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ const CFormTextarea = defineComponent({
140140
h(
141141
'textarea',
142142
{
143+
id: props.id,
143144
...attrs,
144145
disabled: props.disabled,
145146
readonly: props.readonly,

‎packages/docs/getting-started/introduction.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ npm install @coreui/coreui
4040
###### Basic usage
4141

4242
```js
43-
import '@coreui/dist/css/coreui.min.css'
43+
import '@coreui/coreui/dist/css/coreui.min.css'
4444
```
4545

4646
### Bootstrap CSS files
@@ -55,4 +55,4 @@ npm install bootstrap
5555

5656
```js
5757
import 'bootstrap/dist/css/bootstrap.min.css'
58-
```
58+
```

0 commit comments

Comments
 (0)