Skip to content

Commit 162d0fb

Browse files
committed
Merge branch 'v4-next' of https://github.com/coreui/coreui into v4-next
2 parents 66f744b + 954d4b2 commit 162d0fb

File tree

83 files changed

+1100
-1375
lines changed

Some content is hidden

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

83 files changed

+1100
-1375
lines changed

.bundlewatch.config.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,27 @@
1010
},
1111
{
1212
"path": "./dist/css/coreui-reboot.css",
13-
"maxSize": "2.75 kB"
13+
"maxSize": "3.5 kB"
1414
},
1515
{
1616
"path": "./dist/css/coreui-reboot.min.css",
1717
"maxSize": "2.5 kB"
1818
},
1919
{
2020
"path": "./dist/css/coreui-utilities.css",
21-
"maxSize": "9.25 kB"
21+
"maxSize": "11.75 kB"
2222
},
2323
{
2424
"path": "./dist/css/coreui-utilities.min.css",
25-
"maxSize": "8.5 kB"
25+
"maxSize": "10.75 kB"
2626
},
2727
{
2828
"path": "./dist/css/coreui.css",
29-
"maxSize": "28.75 kB"
29+
"maxSize": "32.5 kB"
3030
},
3131
{
3232
"path": "./dist/css/coreui.min.css",
33-
"maxSize": "26.5 kB"
33+
"maxSize": "30.25 kB"
3434
},
3535
{
3636
"path": "./dist/js/coreui.bundle.js",

.eslintrc.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,14 @@
8888
"unicorn/no-null": "off",
8989
"unicorn/no-typeof-undefined": "off",
9090
"unicorn/no-unused-properties": "error",
91+
"unicorn/numeric-separators-style": "off",
9192
"unicorn/prefer-array-flat": "off",
93+
"unicorn/prefer-at": "off",
9294
"unicorn/prefer-dom-node-dataset": "off",
9395
"unicorn/prefer-module": "off",
9496
"unicorn/prefer-query-selector": "off",
9597
"unicorn/prefer-spread": "off",
98+
"unicorn/prefer-string-replace-all": "off",
9699
"unicorn/prevent-abbreviations": "off"
97100
},
98101
"overrides": [
@@ -189,8 +192,7 @@
189192
},
190193
"rules": {
191194
"no-new": "off",
192-
"unicorn/no-array-for-each": "off",
193-
"unicorn/numeric-separators-style": "off"
195+
"unicorn/no-array-for-each": "off"
194196
}
195197
},
196198
{

.github/workflows/node-sass.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@ name: CSS (node-sass)
22

33
on:
44
push:
5-
branches-ignore:
6-
- "dependabot/**"
5+
branches:
6+
- main
77
pull_request:
88
workflow_dispatch:
99

1010
env:
1111
FORCE_COLOR: 2
12-
NODE: 16
12+
NODE: 18
13+
14+
permissions:
15+
contents: read
1316

1417
jobs:
1518
css:
@@ -18,6 +21,8 @@ jobs:
1821
steps:
1922
- name: Clone repository
2023
uses: actions/checkout@v3
24+
with:
25+
persist-credentials: false
2126

2227
- name: Set up Node.js
2328
uses: actions/setup-node@v3
@@ -29,3 +34,16 @@ jobs:
2934
npx --package node-sass@latest node-sass --version
3035
npx --package node-sass@latest node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/ -o dist-sass/css/
3136
ls -Al dist-sass/css
37+
38+
- name: Check built CSS files for Sass variables
39+
shell: bash
40+
run: |
41+
SASS_VARS_FOUND=$(find "dist-sass/css/" -type f -name "*.css" -print0 | xargs -0 --no-run-if-empty grep -F "\$" || true)
42+
if [[ -z "$SASS_VARS_FOUND" ]]; then
43+
echo "All good, no Sass variables found!"
44+
exit 0
45+
else
46+
echo "Found $(echo "$SASS_VARS_FOUND" | wc -l | bc) Sass variables:"
47+
echo "$SASS_VARS_FOUND"
48+
exit 1
49+
fi

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,6 @@ Thumbs.db
3838
*.komodoproject
3939

4040
# Folders to ignore
41+
/dist-sass/
4142
/js/coverage/
4243
/node_modules/

build/generate-sri.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ const sh = require('shelljs')
1818

1919
sh.config.fatal = true
2020

21-
const configFile = path.join(__dirname, '../config.yml')
21+
const configFile = path.join(__dirname, '../hugo.yml')
2222

2323
// Array of objects which holds the files to generate SRI hashes for.
2424
// `file` is the path from the root folder
25-
// `configPropertyName` is the config.yml variable's name of the file
25+
// `configPropertyName` is the hugo.yml variable's name of the file
2626
const files = [
2727
{
2828
file: 'dist/css/coreui.min.css',

dist/css/coreui-grid.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/coreui-grid.rtl.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/coreui-grid.rtl.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/coreui-reboot.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/coreui-reboot.rtl.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)