Skip to content

Commit

Permalink
Fix conflicting peer dependencies (#193)
Browse files Browse the repository at this point in the history
Co-authored-by: GitHub Action <action@github.com>
  • Loading branch information
github-actions[bot] and actions-user authored Dec 5, 2023
1 parent 28970dd commit 856e669
Show file tree
Hide file tree
Showing 6 changed files with 1,310 additions and 1,083 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"eslint-plugin-jsx-a11y": "^6.6.1",
"limax": "^4.1.0",
"mdast-util-to-string": "^4.0.0",
"prettier": "^2.8.1",
"prettier": "^3.1.0",
"prettier-plugin-astro": "^0.12.1",
"reading-time": "^1.5.0",
"sharp": "^0.32.6",
Expand Down
3 changes: 2 additions & 1 deletion public/font-awesome-4.7.0/css/font-awesome.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
@font-face {
font-family: 'FontAwesome';
src: url('../fonts/fontawesome-webfont.eot?v=4.7.0');
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),
src:
url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),
url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'),
url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'),
url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'),
Expand Down
3 changes: 2 additions & 1 deletion public/font-awesome-4.7.0/css/font-awesome.min.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
@font-face {
font-family: 'FontAwesome';
src: url('../fonts/fontawesome-webfont.eot?v=4.7.0');
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),
src:
url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),
url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'),
url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'),
url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'),
Expand Down
3 changes: 2 additions & 1 deletion public/font-awesome-4.7.0/less/path.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
@font-face {
font-family: 'FontAwesome';
src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
src:
url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
url('@{fa-font-path}/fontawesome-webfont.woff2?v=@{fa-version}') format('woff2'),
url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
Expand Down
3 changes: 2 additions & 1 deletion public/font-awesome-4.7.0/scss/_path.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
@font-face {
font-family: 'FontAwesome';
src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}');
src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'),
src:
url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'),
url('#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}') format('woff2'),
url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'),
url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'),
Expand Down
Loading

0 comments on commit 856e669

Please sign in to comment.