Skip to content

Commit 4d0ced9

Browse files
committed
Merge branch 'next' of https://github.com/coreui/coreui into dev
# Conflicts: # CHANGELOG.md # 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 # docs/assets/js/application.js # docs/content/4.1/components/loading-buttons.md # docs/content/4.1/forms/multi-select.md # docs/data/sidebar.yml # 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/_card.scss # scss/_variables.scss # 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 # scss/mixins/_grid.scss # scss/mixins/_utilities.scss
2 parents d45541b + a565e47 commit 4d0ced9

File tree

443 files changed

+11783
-10199
lines changed

Some content is hidden

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

443 files changed

+11783
-10199
lines changed

.bundlewatch.config.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,39 @@
1010
},
1111
{
1212
"path": "./dist/css/coreui-reboot.css",
13-
"maxSize": "2 kB"
13+
"maxSize": "2.5 kB"
1414
},
1515
{
1616
"path": "./dist/css/coreui-reboot.min.css",
17-
"maxSize": "2 kB"
17+
"maxSize": "2.35 kB"
1818
},
1919
{
2020
"path": "./dist/css/coreui-utilities.css",
21-
"maxSize": "7.25 kB"
21+
"maxSize": "7.75 kB"
2222
},
2323
{
2424
"path": "./dist/css/coreui-utilities.min.css",
25-
"maxSize": "6.6 kB"
25+
"maxSize": "6.85 kB"
2626
},
2727
{
2828
"path": "./dist/css/coreui.css",
29-
"maxSize": "25 kB"
29+
"maxSize": "25.5 kB"
3030
},
3131
{
3232
"path": "./dist/css/coreui.min.css",
33-
"maxSize": "22.75 kB"
33+
"maxSize": "23.25 kB"
3434
},
3535
{
3636
"path": "./dist/js/coreui.bundle.js",
37-
"maxSize": "43 kB"
37+
"maxSize": "42.5 kB"
3838
},
3939
{
4040
"path": "./dist/js/coreui.bundle.min.js",
41-
"maxSize": "22.5 kB"
41+
"maxSize": "22.75 kB"
4242
},
4343
{
4444
"path": "./dist/js/coreui.esm.js",
45-
"maxSize": "28.5 kB"
45+
"maxSize": "27.5 kB"
4646
},
4747
{
4848
"path": "./dist/js/coreui.esm.min.js",

.cspell.json

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
{
2+
"version": "0.2",
3+
"words": [
4+
"affordance",
5+
"allowfullscreen",
6+
"autohide",
7+
"autohiding",
8+
"autoplay",
9+
"autoplays",
10+
"blazingly",
11+
"Blockquotes",
12+
"Bootstrappers",
13+
"borderless",
14+
"browserslist",
15+
"browserslistrc",
16+
"btncheck",
17+
"btnradio",
18+
"callout",
19+
"callouts",
20+
"clearfix",
21+
"Codesniffer",
22+
"colorspace",
23+
"combinator",
24+
"Contentful",
25+
"Cpath",
26+
"Crossfade",
27+
"cssgrid",
28+
"Csvg",
29+
"Datalists",
30+
"Deque",
31+
"discoverability",
32+
"docsearch",
33+
"docsref",
34+
"dropend",
35+
"dropleft",
36+
"dropright",
37+
"dropstart",
38+
"dropup",
39+
"errorf",
40+
"favicon",
41+
"favicons",
42+
"fieldsets",
43+
"flexbox",
44+
"fullscreen",
45+
"fusv",
46+
"getbootstrap",
47+
"globby",
48+
"Grayscale",
49+
"Hoverable",
50+
"hreflang",
51+
"hstack",
52+
"jsdelivr",
53+
"Jumpstart",
54+
"keyframes",
55+
"libera",
56+
"Libsass",
57+
"lightboxes",
58+
"Lowercased",
59+
"markdownify",
60+
"mediaqueries",
61+
"minifiers",
62+
"monospace",
63+
"mouseleave",
64+
"navbars",
65+
"navs",
66+
"Neue",
67+
"noindex",
68+
"Noto",
69+
"offcanvas",
70+
"offcanvases",
71+
"popperjs",
72+
"prebuild",
73+
"precompiled",
74+
"prefersreducedmotion",
75+
"prepended",
76+
"printf",
77+
"rects",
78+
"relref",
79+
"rgba",
80+
"roboto",
81+
"RTLCSS",
82+
"ruleset",
83+
"screenreaders",
84+
"scrollbars",
85+
"scrollspy",
86+
"Segoe",
87+
"sirv",
88+
"srcset",
89+
"stickied",
90+
"Stylelint",
91+
"subnav",
92+
"svgo",
93+
"tabbable",
94+
"textareas",
95+
"toggleable",
96+
"topbar",
97+
"touchend",
98+
"twbs",
99+
"unitless",
100+
"Unported",
101+
"unstylable",
102+
"unstyled",
103+
"Uppercased",
104+
"urlize",
105+
"vbtn",
106+
"viewports",
107+
"vstack",
108+
"walkthroughs",
109+
"WCAG",
110+
"webfont",
111+
"Woohoo",
112+
"zindex",
113+
"بالعالم",
114+
"مرحبا"
115+
],
116+
"language": "en,en-US",
117+
"ignorePaths": [
118+
".cspell.json",
119+
".min."
120+
]
121+
}

.eslintrc.json

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@
88
"xo/browser"
99
],
1010
"rules": {
11+
"arrow-body-style": "off",
1112
"capitalized-comments": "off",
13+
"comma-dangle": [
14+
"error",
15+
"never"
16+
],
1217
"indent": [
1318
"error",
1419
2,
@@ -36,22 +41,26 @@
3641
"error",
3742
"always"
3843
],
44+
"operator-linebreak": [
45+
"error",
46+
"after"
47+
],
3948
"semi": [
4049
"error",
4150
"never"
4251
],
43-
"unicorn/consistent-function-scoping": "off",
4452
"unicorn/explicit-length-check": "off",
4553
"unicorn/no-array-callback-reference": "off",
4654
"unicorn/no-array-for-each": "off",
55+
"unicorn/no-array-method-this-argument": "off",
4756
"unicorn/no-for-loop": "off",
4857
"unicorn/no-null": "off",
4958
"unicorn/no-unused-properties": "error",
50-
"unicorn/no-useless-undefined": "off",
51-
"unicorn/prefer-dom-node-append": "off",
59+
"unicorn/numeric-separators-style": "off",
60+
"unicorn/prefer-array-flat": "off",
5261
"unicorn/prefer-dom-node-dataset": "off",
53-
"unicorn/prefer-dom-node-remove": "off",
5462
"unicorn/prefer-module": "off",
63+
"unicorn/prefer-prototype-methods": "off",
5564
"unicorn/prefer-query-selector": "off",
5665
"unicorn/prefer-spread": "off",
5766
"unicorn/prevent-abbreviations": "off"

.github/CONTRIBUTING.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@ the preferred channel for [bug reports](#bug-reports), [features requests](#feat
1414
and [submitting pull requests](#pull-requests), but please respect the following
1515
restrictions:
1616

17-
* Please **do not** use the issue tracker for personal support requests.
17+
* Please **do not** use the issue tracker for personal support requests. [GitHub Discussions](https://github.com/coreui/coreui/discussions) is better place to get help
1818

1919
* Please **do not** post comments consisting solely of "+1" or ":thumbsup:".
2020
Use [GitHub's "reactions" feature](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments)
2121
instead.
2222

23+
* Please **do not** derail or troll issues. Keep the discussion on topic and
24+
respect the opinions of others.
25+
2326
## Bug reports
2427

2528
A bug is a _demonstrable problem_ that is caused by the code in the repository.

.github/stale.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 360
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 7
5+
# Issues with these labels will never be considered stale
6+
exemptLabels:
7+
- pinned
8+
- security
9+
# Label to use when marking an issue as stale
10+
staleLabel: wontfix
11+
# Comment to post when marking an issue as stale. Set to `false` to disable
12+
markComment: >
13+
This issue has been automatically marked as stale because it has not had
14+
recent activity. It will be closed if no further activity occurs. Thank you
15+
for your contributions.
16+
# Comment to post when closing a stale issue. Set to `false` to disable
17+
closeComment: false

.github/workflows-turnoff/bundlewatch.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Bundlewatch
22

33
on:
44
push:
5+
branches-ignore:
6+
- "dependabot/**"
57
pull_request:
68

79
env:
@@ -20,14 +22,7 @@ jobs:
2022
uses: actions/setup-node@v2
2123
with:
2224
node-version: "${{ env.NODE }}"
23-
24-
- name: Set up npm cache
25-
uses: actions/cache@v2
26-
with:
27-
path: ~/.npm
28-
key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
29-
restore-keys: |
30-
${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
25+
cache: npm
3126

3227
- name: Install npm dependencies
3328
run: npm ci

.github/workflows-turnoff/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@ jobs:
1919
analyze:
2020
name: Analyze
2121
runs-on: ubuntu-latest
22+
permissions:
23+
actions: read
24+
contents: read
25+
security-events: write
2226

2327
steps:
2428
- name: Checkout repository
2529
uses: actions/checkout@v2
2630

27-
# Initializes the CodeQL tools for scanning.
2831
- name: Initialize CodeQL
2932
uses: github/codeql-action/init@v1
3033
with:
3134
languages: "javascript"
3235

33-
- name: Autobuild
34-
uses: github/codeql-action/autobuild@v1
35-
3636
- name: Perform CodeQL Analysis
3737
uses: github/codeql-action/analyze@v1

.github/workflows-turnoff/css.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,7 @@ jobs:
2222
uses: actions/setup-node@v2
2323
with:
2424
node-version: "${{ env.NODE }}"
25-
26-
- name: Set up npm cache
27-
uses: actions/cache@v2
28-
with:
29-
path: ~/.npm
30-
key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
31-
restore-keys: |
32-
${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
25+
cache: npm
3326

3427
- name: Install npm dependencies
3528
run: npm ci

.github/workflows-turnoff/docs.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,10 @@ jobs:
2222
uses: actions/setup-node@v2
2323
with:
2424
node-version: "${{ env.NODE }}"
25+
cache: npm
2526

2627
- run: java -version
2728

28-
- name: Set up npm cache
29-
uses: actions/cache@v2
30-
with:
31-
path: ~/.npm
32-
key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
33-
restore-keys: |
34-
${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
35-
3629
- name: Install npm dependencies
3730
run: npm ci
3831

.github/workflows-turnoff/js.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,7 @@ jobs:
2727
uses: actions/setup-node@v2
2828
with:
2929
node-version: ${{ matrix.node }}
30-
31-
- name: Set up npm cache
32-
uses: actions/cache@v2
33-
with:
34-
path: ~/.npm
35-
key: ${{ runner.os }}-node-${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
36-
restore-keys: |
37-
${{ runner.os }}-node-${{ matrix.node }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
30+
cache: npm
3831

3932
- name: Install npm dependencies
4033
run: npm ci
@@ -46,7 +39,7 @@ jobs:
4639
run: npm run js-test
4740

4841
- name: Run Coveralls
49-
uses: coverallsapp/github-action@v1.1.2
42+
uses: coverallsapp/github-action@1.1.3
5043
if: matrix.node == 14
5144
with:
5245
github-token: "${{ secrets.GITHUB_TOKEN }}"

0 commit comments

Comments
 (0)