From 1ab91589f8ce532645084479a5d6bf73587ce92a Mon Sep 17 00:00:00 2001 From: Vasyl Date: Tue, 12 Dec 2023 17:56:21 +0200 Subject: [PATCH 1/5] - feat: update google fonts to material symbols --- packages/docs/nuxt.config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/docs/nuxt.config.ts b/packages/docs/nuxt.config.ts index b9036e0405..8310fab361 100644 --- a/packages/docs/nuxt.config.ts +++ b/packages/docs/nuxt.config.ts @@ -107,6 +107,7 @@ export default defineNuxtConfig({ }, 'Material+Icons': true, 'Material+Icons+Outlined': true, + 'Material+Symbols+Outlined': true, }, }, From 00c7eb6cd8618b8e8738a3ee9d7ae54a2fabd16a Mon Sep 17 00:00:00 2001 From: Vasyl Date: Tue, 12 Dec 2023 18:08:46 +0200 Subject: [PATCH 2/5] - feat: update google fonts to material symbols --- packages/create-vuestic/src/steps/2.addVuestic/vue-app.ts | 3 ++- packages/nuxt/src/composables/use-css.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/create-vuestic/src/steps/2.addVuestic/vue-app.ts b/packages/create-vuestic/src/steps/2.addVuestic/vue-app.ts index 2a3e51d510..2d68dc2333 100644 --- a/packages/create-vuestic/src/steps/2.addVuestic/vue-app.ts +++ b/packages/create-vuestic/src/steps/2.addVuestic/vue-app.ts @@ -41,7 +41,8 @@ export const addVuesticToVue3App = async () => { let htmlSource = await readFile(htmlPath, 'utf-8') htmlSource = insertHead(htmlSource, [ ``, - `` + ``, + `` ]) await writeFile(htmlPath, htmlSource) } diff --git a/packages/nuxt/src/composables/use-css.ts b/packages/nuxt/src/composables/use-css.ts index 3be135517f..a4012f2e1d 100644 --- a/packages/nuxt/src/composables/use-css.ts +++ b/packages/nuxt/src/composables/use-css.ts @@ -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) => { From 1f7c2ccce8be886ed8ad7a511f7292fd558ab186 Mon Sep 17 00:00:00 2001 From: Vasyl Date: Fri, 15 Dec 2023 17:03:23 +0200 Subject: [PATCH 3/5] - fix: delete `Material Icons` --- packages/docs/nuxt.config.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/docs/nuxt.config.ts b/packages/docs/nuxt.config.ts index 8310fab361..428fd98b03 100644 --- a/packages/docs/nuxt.config.ts +++ b/packages/docs/nuxt.config.ts @@ -105,8 +105,6 @@ export default defineNuxtConfig({ 'Source+Code+Pro': { wght: [400], }, - 'Material+Icons': true, - 'Material+Icons+Outlined': true, 'Material+Symbols+Outlined': true, }, }, From 0a020716d4e25d47680a34b96ce1506f4fc248d5 Mon Sep 17 00:00:00 2001 From: Vasyl Date: Sat, 16 Dec 2023 14:47:11 +0200 Subject: [PATCH 4/5] - fix: delete `Material Icons` --- packages/create-vuestic/src/steps/2.addVuestic/vue-app.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/create-vuestic/src/steps/2.addVuestic/vue-app.ts b/packages/create-vuestic/src/steps/2.addVuestic/vue-app.ts index 2d68dc2333..737ccc327a 100644 --- a/packages/create-vuestic/src/steps/2.addVuestic/vue-app.ts +++ b/packages/create-vuestic/src/steps/2.addVuestic/vue-app.ts @@ -41,7 +41,6 @@ export const addVuesticToVue3App = async () => { let htmlSource = await readFile(htmlPath, 'utf-8') htmlSource = insertHead(htmlSource, [ ``, - ``, `` ]) await writeFile(htmlPath, htmlSource) From f18c09e7fa146bebd02721d3981c3edd4ed7407f Mon Sep 17 00:00:00 2001 From: Vasyl Date: Wed, 27 Dec 2023 13:16:16 +0200 Subject: [PATCH 5/5] - fix: move to Material+Symbols+Outlined everywhere - delete: Material+Icons --- packages/docs/assets/icon-fonts/icon-fonts.scss | 3 +-- packages/docs/components/Play.client.vue | 2 +- packages/docs/composables/code-sandbox/generators.ts | 2 +- packages/docs/conventions.md | 2 +- .../installation/code/font-installation.html | 2 +- .../installation/code/font-installation.scss | 2 +- packages/docs/page-config/services/icons-config/index.ts | 2 +- .../docs/page-config/ui-elements/icon/examples/Default.vue | 2 +- packages/docs/page-config/ui-elements/icon/index.ts | 2 +- packages/nuxt/src/composables/use-css.ts | 3 +-- packages/nuxt/src/types.ts | 4 ++-- packages/sandbox/web-components/index.html | 6 +----- packages/ui/.storybook/assets/fonts.scss | 1 - packages/ui/.storybook/assets/icons/icons.scss | 2 -- packages/ui/src/components/va-icon/VaIcon.demo.vue | 2 +- packages/ui/src/services/icon/presets/fonts.ts | 4 ++-- packages/vue-cli-plugin/generator/templates/vite/index.html | 2 +- .../generator/templates/vue-cli-webpack/public/index.html | 2 +- 18 files changed, 18 insertions(+), 27 deletions(-) diff --git a/packages/docs/assets/icon-fonts/icon-fonts.scss b/packages/docs/assets/icon-fonts/icon-fonts.scss index a2c9804c46..1c8453a26e 100644 --- a/packages/docs/assets/icon-fonts/icon-fonts.scss +++ b/packages/docs/assets/icon-fonts/icon-fonts.scss @@ -4,5 +4,4 @@ @import "ionicons/dist/scss/ionicons.scss"; // Material Icons -@import url(https://fonts.googleapis.com/icon?family=Material+Icons); -@import url(https://fonts.googleapis.com/icon?family=Material+Icons+Outlined); +@import url(https://fonts.googleapis.com/icon?family=Material+Symbols+Outlined); diff --git a/packages/docs/components/Play.client.vue b/packages/docs/components/Play.client.vue index 7b36cb244f..1f7b74b574 100644 --- a/packages/docs/components/Play.client.vue +++ b/packages/docs/components/Play.client.vue @@ -86,7 +86,7 @@ const TAILWIND_CDN = '