Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

- feat: update google fonts to material symbols #4085

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

- feat: update google fonts to material symbols #4085

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1ab9158
- feat: update google fonts to material symbols
VasylHryha Dec 12, 2023
00c7eb6
- feat: update google fonts to material symbols
VasylHryha Dec 12, 2023
1f7c2cc
- fix: delete `Material Icons`
VasylHryha Dec 15, 2023
0a02071
- fix: delete `Material Icons`
VasylHryha Dec 16, 2023
4b0566b
Merge branch 'develop' into feat/update-google-fonts
VasylHryha Dec 22, 2023
7bce0d0
Merge branch 'develop' into feat/update-google-fonts
VasylHryha Dec 27, 2023
f18c09e
- fix: move to Material+Symbols+Outlined everywhere
VasylHryha Dec 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/create-vuestic/src/steps/2.addVuestic/vue-app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ export const addVuesticToVue3App = async () => {
let htmlSource = await readFile(htmlPath, 'utf-8')
htmlSource = insertHead(htmlSource, [
`<link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro&family=Source+Sans+Pro:wght@400;700&display=swap" rel="stylesheet">`,
`<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">`
`<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">`,
VasylHryha marked this conversation as resolved.
Show resolved Hide resolved
`<link href="https://fonts.googleapis.com/icon?family=Material+Symbols+Outlined" rel="stylesheet">`
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to update IconsConfig to use material-symbols but default, instead of material icons.
I expect updating nuxt module in my project and all icons still work, even if the're symbols now.

Right now, creating new vuestic project will install Material Symbols, but we use material-icons in IconsConfig...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should release both projects simultaneously then.

])
await writeFile(htmlPath, htmlSource)
}
1 change: 1 addition & 0 deletions packages/docs/nuxt.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ export default defineNuxtConfig({
},
'Material+Icons': true,
'Material+Icons+Outlined': true,
VasylHryha marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did a quick check with docs, look fine

'Material+Symbols+Outlined': true,
},
},

Expand Down
3 changes: 2 additions & 1 deletion packages/nuxt/src/composables/use-css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import type { VuesticOptions } from "../types";

const VUESTIC_DEFAULT_FONTS = [
{ rel: 'stylesheet', href: 'https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,400;1,700&display=swap' },
{ rel: 'stylesheet', href: 'https://fonts.googleapis.com/icon?family=Material+Icons&display=swap' }
{ rel: 'stylesheet', href: 'https://fonts.googleapis.com/icon?family=Material+Icons&display=swap' },
{rel: 'stylesheet', href: '(https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined' }
]

const registerDefaultFonts = (nuxt: Nuxt) => {
Expand Down
Loading