Skip to content

Commit

Permalink
Merge branch 'main' into font-layout
Browse files Browse the repository at this point in the history
  • Loading branch information
XhmikosR authored Jul 19, 2021
2 parents 47a9a11 + c0f5f1e commit d23d475
Show file tree
Hide file tree
Showing 8 changed files with 593 additions and 610 deletions.
6 changes: 2 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: weekly
day: tuesday
interval: monthly
time: "12:00"
timezone: Europe/Athens
open-pull-requests-limit: 10
Expand All @@ -16,7 +15,6 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: weekly
day: tuesday
interval: monthly
time: "12:00"
timezone: Europe/Athens
9 changes: 1 addition & 8 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,7 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: "${{ env.NODE }}"

- name: Set up npm cache
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
cache: npm

- name: Install npm dependencies
run: npm ci
Expand Down
9 changes: 1 addition & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,10 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: "${{ env.NODE }}"
cache: npm

- run: java -version

- name: Set up npm cache
uses: actions/cache@v2
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-${{ env.NODE }}-${{ hashFiles('package.json') }}-${{ hashFiles('package-lock.json') }}
- name: Install npm dependencies
run: npm ci

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Bootstrap Icons are packaged up and published to npm. We only include the proces
npm i bootstrap-icons
```

[Also available in Figma.](https://www.figma.com/file/YjjMzXhECL1MIb6Qlm7VJO/Bootstrap-Icons-v1.4.1)
[Also available in Figma.](https://www.figma.com/community/file/972989644486753519/Bootstrap-Icons-v1.5.0)

## Usage

Expand Down
2 changes: 1 addition & 1 deletion config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ params:
description: "Official open source SVG icon library for Bootstrap"
social_image_path: /assets/img/bootstrap-icons-social.png

version: "1.4.1"
version: "1.5.0"
bs_docs_version: "5.0"

main: "https://getbootstrap.com"
Expand Down
3 changes: 2 additions & 1 deletion docs/content/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,8 @@ If the icons are not purely decorative, make sure you provide an appropriate tex
<button ... aria-label="Mute">
<svg class="bi bi-volume-mute-fill" ...>
...
</svg>
</svg>
</button>
{{< /highlight >}}
</div>
</div>
Expand Down
1,150 changes: 574 additions & 576 deletions package-lock.json

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap-icons",
"version": "1.4.1",
"version": "1.5.0",
"description": "Official open source SVG icon library for Bootstrap",
"author": "mdo",
"license": "MIT",
Expand Down Expand Up @@ -40,24 +40,24 @@
"dependencies": {},
"devDependencies": {
"@twbs/svg-sprite": "^1.6.2",
"autoprefixer": "^10.2.5",
"autoprefixer": "^10.3.1",
"chalk": "^4.1.1",
"cheerio": "^1.0.0-rc.6",
"cheerio": "^1.0.0-rc.10",
"cross-env": "^7.0.3",
"eslint": "^7.25.0",
"fantasticon": "^1.1.3",
"eslint": "^7.30.0",
"fantasticon": "^1.2.2",
"find-unused-sass-variables": "^3.1.0",
"hugo-bin": "^0.70.2",
"linkinator": "^2.13.6",
"hugo-bin": "^0.73.0",
"linkinator": "^2.14.0",
"lockfile-lint": "^4.6.2",
"npm-run-all": "^4.1.5",
"postcss": "^8.2.13",
"postcss": "^8.3.5",
"postcss-cli": "^8.3.1",
"purgecss": "^4.0.3",
"stylelint": "^13.13.1",
"stylelint-config-twbs-bootstrap": "^2.2.0",
"svgo": "^2.3.0",
"vnu-jar": "21.4.9"
"stylelint-config-twbs-bootstrap": "^2.2.1",
"svgo": "^2.3.1",
"vnu-jar": "21.6.11"
},
"engines": {
"node": ">=10"
Expand Down

0 comments on commit d23d475

Please sign in to comment.