From 7002451bb5658b6933986c301245ca1788594e3b Mon Sep 17 00:00:00 2001 From: Thomas Phinney Date: Tue, 14 Mar 2023 23:34:48 -0700 Subject: [PATCH 1/9] Rename font/MaterialIcons-Regular.codepoints to font/material-icons/MaterialIcons-Regular.codepoints --- font/{ => material-icons}/MaterialIcons-Regular.codepoints | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename font/{ => material-icons}/MaterialIcons-Regular.codepoints (100%) diff --git a/font/MaterialIcons-Regular.codepoints b/font/material-icons/MaterialIcons-Regular.codepoints similarity index 100% rename from font/MaterialIcons-Regular.codepoints rename to font/material-icons/MaterialIcons-Regular.codepoints From ca724a19e081bdd64d57f5c3aee5b53a88062019 Mon Sep 17 00:00:00 2001 From: Thomas Phinney Date: Wed, 15 Mar 2023 00:22:54 -0700 Subject: [PATCH 2/9] Create README.md Explain where the files formerly here have been moved to. --- variablefont/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 variablefont/README.md diff --git a/variablefont/README.md b/variablefont/README.md new file mode 100644 index 000000000000..be3763615ae9 --- /dev/null +++ b/variablefont/README.md @@ -0,0 +1 @@ +The variable fonts that were formerly in this directory are now in the “font” directory instead. From 8afaaa43e96b98dd9563f24b90f3edf3cee8e6b0 Mon Sep 17 00:00:00 2001 From: Thomas Phinney Date: Wed, 15 Mar 2023 01:10:14 -0700 Subject: [PATCH 3/9] Move font files --- ...lSymbolsOutlined[FILL,GRAD,opsz,wght].codepoints | 0 ...MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].ttf | Bin ...terialSymbolsOutlined[FILL,GRAD,opsz,wght].woff2 | Bin ...alSymbolsRounded[FILL,GRAD,opsz,wght].codepoints | 0 .../MaterialSymbolsRounded[FILL,GRAD,opsz,wght].ttf | Bin ...aterialSymbolsRounded[FILL,GRAD,opsz,wght].woff2 | Bin ...rialSymbolsSharp[FILL,GRAD,opsz,wght].codepoints | 0 .../MaterialSymbolsSharp[FILL,GRAD,opsz,wght].ttf | Bin .../MaterialSymbolsSharp[FILL,GRAD,opsz,wght].woff2 | Bin .../MaterialIconsOutlined-Regular.codepoints | 0 .../MaterialIconsOutlined-Regular.otf | Bin .../MaterialIconsRound-Regular.codepoints | 0 .../MaterialIconsRound-Regular.otf | Bin .../MaterialIconsSharp-Regular.codepoints | 0 .../MaterialIconsSharp-Regular.otf | Bin .../MaterialIconsTwoTone-Regular.codepoints | 0 .../MaterialIconsTwoTone-Regular.otf | Bin 17 files changed, 0 insertions(+), 0 deletions(-) rename {variablefont => font}/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].codepoints (100%) rename {variablefont => font}/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].ttf (100%) rename {variablefont => font}/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].woff2 (100%) rename {variablefont => font}/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].codepoints (100%) rename {variablefont => font}/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].ttf (100%) rename {variablefont => font}/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].woff2 (100%) rename {variablefont => font}/MaterialSymbolsSharp[FILL,GRAD,opsz,wght].codepoints (100%) rename {variablefont => font}/MaterialSymbolsSharp[FILL,GRAD,opsz,wght].ttf (100%) rename {variablefont => font}/MaterialSymbolsSharp[FILL,GRAD,opsz,wght].woff2 (100%) rename font/{ => material-icons}/MaterialIconsOutlined-Regular.codepoints (100%) rename font/{ => material-icons}/MaterialIconsOutlined-Regular.otf (100%) rename font/{ => material-icons}/MaterialIconsRound-Regular.codepoints (100%) rename font/{ => material-icons}/MaterialIconsRound-Regular.otf (100%) rename font/{ => material-icons}/MaterialIconsSharp-Regular.codepoints (100%) rename font/{ => material-icons}/MaterialIconsSharp-Regular.otf (100%) rename font/{ => material-icons}/MaterialIconsTwoTone-Regular.codepoints (100%) rename font/{ => material-icons}/MaterialIconsTwoTone-Regular.otf (100%) diff --git a/variablefont/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].codepoints b/font/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].codepoints similarity index 100% rename from variablefont/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].codepoints rename to font/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].codepoints diff --git a/variablefont/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].ttf b/font/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].ttf similarity index 100% rename from variablefont/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].ttf rename to font/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].ttf diff --git a/variablefont/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].woff2 b/font/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].woff2 similarity index 100% rename from variablefont/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].woff2 rename to font/MaterialSymbolsOutlined[FILL,GRAD,opsz,wght].woff2 diff --git a/variablefont/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].codepoints b/font/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].codepoints similarity index 100% rename from variablefont/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].codepoints rename to font/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].codepoints diff --git a/variablefont/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].ttf b/font/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].ttf similarity index 100% rename from variablefont/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].ttf rename to font/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].ttf diff --git a/variablefont/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].woff2 b/font/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].woff2 similarity index 100% rename from variablefont/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].woff2 rename to font/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].woff2 diff --git a/variablefont/MaterialSymbolsSharp[FILL,GRAD,opsz,wght].codepoints b/font/MaterialSymbolsSharp[FILL,GRAD,opsz,wght].codepoints similarity index 100% rename from variablefont/MaterialSymbolsSharp[FILL,GRAD,opsz,wght].codepoints rename to font/MaterialSymbolsSharp[FILL,GRAD,opsz,wght].codepoints diff --git a/variablefont/MaterialSymbolsSharp[FILL,GRAD,opsz,wght].ttf b/font/MaterialSymbolsSharp[FILL,GRAD,opsz,wght].ttf similarity index 100% rename from variablefont/MaterialSymbolsSharp[FILL,GRAD,opsz,wght].ttf rename to font/MaterialSymbolsSharp[FILL,GRAD,opsz,wght].ttf diff --git a/variablefont/MaterialSymbolsSharp[FILL,GRAD,opsz,wght].woff2 b/font/MaterialSymbolsSharp[FILL,GRAD,opsz,wght].woff2 similarity index 100% rename from variablefont/MaterialSymbolsSharp[FILL,GRAD,opsz,wght].woff2 rename to font/MaterialSymbolsSharp[FILL,GRAD,opsz,wght].woff2 diff --git a/font/MaterialIconsOutlined-Regular.codepoints b/font/material-icons/MaterialIconsOutlined-Regular.codepoints similarity index 100% rename from font/MaterialIconsOutlined-Regular.codepoints rename to font/material-icons/MaterialIconsOutlined-Regular.codepoints diff --git a/font/MaterialIconsOutlined-Regular.otf b/font/material-icons/MaterialIconsOutlined-Regular.otf similarity index 100% rename from font/MaterialIconsOutlined-Regular.otf rename to font/material-icons/MaterialIconsOutlined-Regular.otf diff --git a/font/MaterialIconsRound-Regular.codepoints b/font/material-icons/MaterialIconsRound-Regular.codepoints similarity index 100% rename from font/MaterialIconsRound-Regular.codepoints rename to font/material-icons/MaterialIconsRound-Regular.codepoints diff --git a/font/MaterialIconsRound-Regular.otf b/font/material-icons/MaterialIconsRound-Regular.otf similarity index 100% rename from font/MaterialIconsRound-Regular.otf rename to font/material-icons/MaterialIconsRound-Regular.otf diff --git a/font/MaterialIconsSharp-Regular.codepoints b/font/material-icons/MaterialIconsSharp-Regular.codepoints similarity index 100% rename from font/MaterialIconsSharp-Regular.codepoints rename to font/material-icons/MaterialIconsSharp-Regular.codepoints diff --git a/font/MaterialIconsSharp-Regular.otf b/font/material-icons/MaterialIconsSharp-Regular.otf similarity index 100% rename from font/MaterialIconsSharp-Regular.otf rename to font/material-icons/MaterialIconsSharp-Regular.otf diff --git a/font/MaterialIconsTwoTone-Regular.codepoints b/font/material-icons/MaterialIconsTwoTone-Regular.codepoints similarity index 100% rename from font/MaterialIconsTwoTone-Regular.codepoints rename to font/material-icons/MaterialIconsTwoTone-Regular.codepoints diff --git a/font/MaterialIconsTwoTone-Regular.otf b/font/material-icons/MaterialIconsTwoTone-Regular.otf similarity index 100% rename from font/MaterialIconsTwoTone-Regular.otf rename to font/material-icons/MaterialIconsTwoTone-Regular.otf From 6b2c9e7ac9075128f822533be692dad3fa244c52 Mon Sep 17 00:00:00 2001 From: Thomas Phinney Date: Wed, 15 Mar 2023 01:14:23 -0700 Subject: [PATCH 4/9] update README.md to reflect moved files --- font/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/font/README.md b/font/README.md index 7cf174350593..0183ef7e957b 100644 --- a/font/README.md +++ b/font/README.md @@ -1,6 +1,6 @@ -This is the directory for Material Icons; the newer Material Symbols are at [../variablefont](https://github.com/google/material-design-icons/tree/master/variablefont). +This directory contains the Material Symbols font files; the older Material Icons (non-variable) fonts are at [/material-icons](https://github.com/google/material-design-icons/tree/master/font/material-icons). -Material Icons are the non-variable classic icon fonts, while the Material Symbols variable fonts offer weight, optical size, grade and fill variations (with grade and Fill being intended also for animated effects). +The Material Symbols variable fonts offer weight, optical size, grade and fill variations (with grade and Fill being intended also for animated effects). Material Symbols are the non-variable classic icon fonts, while The recommended way to use the Material Icons font is by linking to the web font hosted on Google Fonts: From 9973483db9f771a6ac5fc06094eec80d930571a2 Mon Sep 17 00:00:00 2001 From: Thomas Phinney Date: Wed, 15 Mar 2023 01:16:51 -0700 Subject: [PATCH 5/9] Create README.md --- font/material-icons/README.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 font/material-icons/README.md diff --git a/font/material-icons/README.md b/font/material-icons/README.md new file mode 100644 index 000000000000..e4ff94e072af --- /dev/null +++ b/font/material-icons/README.md @@ -0,0 +1,28 @@ +This directory contains the older Material Icons (non-variable) fonts. + +The newer Material Symbols are one level up in the "font" directory. The Material Symbols variable fonts offer weight, optical size, grade and fill variations (with grade and Fill being intended also for animated effects). Material Symbols are the non-variable classic icon fonts, while + +The recommended way to use the Material Icons font is by linking to the web font hosted on Google Fonts: + +```html + + + + + + + + + + + + + + +``` + From a0014be71cea65c58bf781dd3156ccd901553e53 Mon Sep 17 00:00:00 2001 From: Thomas Phinney Date: Wed, 15 Mar 2023 01:18:02 -0700 Subject: [PATCH 6/9] Update README.md --- font/README.md | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/font/README.md b/font/README.md index 0183ef7e957b..f145455bff64 100644 --- a/font/README.md +++ b/font/README.md @@ -2,27 +2,12 @@ This directory contains the Material Symbols font files; the older Material Icon The Material Symbols variable fonts offer weight, optical size, grade and fill variations (with grade and Fill being intended also for animated effects). Material Symbols are the non-variable classic icon fonts, while -The recommended way to use the Material Icons font is by linking to the web font hosted on Google Fonts: +The recommended way to use the Material Symbols font is by linking to the web font hosted on Google Fonts: ```html - - - - - - - - - - - - ``` From bfed7d76e30eaf2562954c622d3c93b5f3a2a66a Mon Sep 17 00:00:00 2001 From: Thomas Phinney Date: Wed, 15 Mar 2023 09:46:36 -0700 Subject: [PATCH 7/9] move MaterialIcons-Regular.ttf with its mates --- font/{ => material-icons}/MaterialIcons-Regular.ttf | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename font/{ => material-icons}/MaterialIcons-Regular.ttf (100%) diff --git a/font/MaterialIcons-Regular.ttf b/font/material-icons/MaterialIcons-Regular.ttf similarity index 100% rename from font/MaterialIcons-Regular.ttf rename to font/material-icons/MaterialIcons-Regular.ttf From aca47b2938d02cab1b2805fa0a9b794739b92295 Mon Sep 17 00:00:00 2001 From: Thomas Phinney Date: Thu, 16 Mar 2023 19:53:05 -0700 Subject: [PATCH 8/9] Update README.md --- font/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/font/README.md b/font/README.md index f145455bff64..d27f1b0d5b26 100644 --- a/font/README.md +++ b/font/README.md @@ -1,6 +1,6 @@ This directory contains the Material Symbols font files; the older Material Icons (non-variable) fonts are at [/material-icons](https://github.com/google/material-design-icons/tree/master/font/material-icons). -The Material Symbols variable fonts offer weight, optical size, grade and fill variations (with grade and Fill being intended also for animated effects). Material Symbols are the non-variable classic icon fonts, while +The Material Symbols variable fonts offer weight, optical size, grade and fill variations (with grade and Fill being intended also for animated effects). Material Icons are the non-variable classic icon fonts. The recommended way to use the Material Symbols font is by linking to the web font hosted on Google Fonts: From 5a05523c3defe7e71378e32891b63ce3b5ff4390 Mon Sep 17 00:00:00 2001 From: Thomas Phinney Date: Thu, 16 Mar 2023 19:57:07 -0700 Subject: [PATCH 9/9] Update README.md --- font/README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/font/README.md b/font/README.md index d27f1b0d5b26..e0b811df2c0a 100644 --- a/font/README.md +++ b/font/README.md @@ -6,8 +6,7 @@ The recommended way to use the Material Symbols font is by linking to the web fo ```html - + ```