From f234defa2a162080955de0834c9dd449e3102e9a Mon Sep 17 00:00:00 2001 From: nobody Date: Thu, 9 Mar 2023 17:40:36 +0100 Subject: [PATCH] Google Material Icons (#1365) --- THIRD_PARTY.txt | 8 ++--- modules/internal/targets.js | 8 ++--- pages/updates/updates.html | 1 + .../google-material-design-icons.css | 28 +++++++++--------- .../{v139 => v140}/MaterialIcons.woff2 | Bin .../MaterialIconsOutlined.woff2 | Bin .../{v108 => v109}/MaterialIconsSharp.woff2 | Bin .../{v111 => v112}/MaterialIconsTwoTone.woff2 | Bin 8 files changed, 23 insertions(+), 22 deletions(-) rename resources/google-material-design-icons/materialicons/{v139 => v140}/MaterialIcons.woff2 (100%) rename resources/google-material-design-icons/materialiconsoutlined/{v108 => v109}/MaterialIconsOutlined.woff2 (100%) rename resources/google-material-design-icons/materialiconssharp/{v108 => v109}/MaterialIconsSharp.woff2 (100%) rename resources/google-material-design-icons/materialiconstwotone/{v111 => v112}/MaterialIconsTwoTone.woff2 (100%) diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt index 533d652e..ab15d4bc 100644 --- a/THIRD_PARTY.txt +++ b/THIRD_PARTY.txt @@ -1898,11 +1898,11 @@ https://cdn.jsdelivr.net/npm/vue@1.0.28/dist/vue.min.js https://cdn.jsdelivr.net/npm/vue@2.6.14/dist/vue.min.js https://cdn.jsdelivr.net/npm/vue-match-media@1.0.3/dist/index.min.js https://code.createjs.com/1.0.0/createjs.min.js -https://fonts.gstatic.com/s/materialiconsoutlined/v108/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2 +https://fonts.gstatic.com/s/materialiconsoutlined/v109/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2 https://fonts.gstatic.com/s/materialiconsround/v107/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2 -https://fonts.gstatic.com/s/materialiconssharp/v108/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2 -https://fonts.gstatic.com/s/materialiconstwotone/v111/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2 -https://fonts.gstatic.com/s/materialicons/v139/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2 +https://fonts.gstatic.com/s/materialiconssharp/v109/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2 +https://fonts.gstatic.com/s/materialiconstwotone/v112/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2 +https://fonts.gstatic.com/s/materialicons/v140/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2 https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js https://raw.githubusercontent.com/jquery-validation/jquery-validation/1.19.5/dist/jquery.validate.min.js diff --git a/modules/internal/targets.js b/modules/internal/targets.js index 59250f83..624a3e4f 100644 --- a/modules/internal/targets.js +++ b/modules/internal/targets.js @@ -218,11 +218,11 @@ targets.setLastVersion = function (type, version) { if (type.startsWith('/gsap/1.')) return '1.20.5'; if (type.startsWith('/gsap/2.')) return '2.1.3'; if (type.startsWith('/gsap/3.')) return '3.11.4'; - if (type.startsWith('/materialicons/')) return 'v139'; - if (type.startsWith('/materialiconsoutlined/')) return 'v108'; + if (type.startsWith('/materialicons/')) return 'v140'; + if (type.startsWith('/materialiconsoutlined/')) return 'v109'; if (type.startsWith('/materialiconsround/')) return 'v107'; - if (type.startsWith('/materialiconssharp/')) return 'v108'; - if (type.startsWith('/materialiconstwotone/')) return 'v111'; + if (type.startsWith('/materialiconssharp/')) return 'v109'; + if (type.startsWith('/materialiconstwotone/')) return 'v112'; if (type.startsWith('/highlight.js/7.')) return '9.18.5'; if (type.startsWith('/highlight.js/8.')) return '9.18.5'; if (type.startsWith('/highlight.js/9.')) return '9.18.5'; diff --git a/pages/updates/updates.html b/pages/updates/updates.html index 498dd934..f08b73bc 100644 --- a/pages/updates/updates.html +++ b/pages/updates/updates.html @@ -45,6 +45,7 @@
  • bootstrap-table v1.21.2 -> v1.21.3 (#1361)
  • libphonenumber-js v1.10.20 -> v1.10.21 (#1362)
  • algoliasearch v4.14.3 -> v4.15.0 (#1363)
    • +
  • Google Material Icons (#1365)
    • diff --git a/resources/google-material-design-icons/google-material-design-icons.css b/resources/google-material-design-icons/google-material-design-icons.css index 172a4c86..258c8d83 100644 --- a/resources/google-material-design-icons/google-material-design-icons.css +++ b/resources/google-material-design-icons/google-material-design-icons.css @@ -9,32 +9,32 @@ font-family: 'Material Icons'; font-style: normal; font-weight: 400; - src: url('./materialicons/v139/MaterialIcons.woff2') format('woff2'); - /* src: url(https://fonts.gstatic.com/s/materialicons/v139/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2'); */ + src: url('./materialicons/v140/MaterialIcons.woff2') format('woff2'); + /* src: url(https://fonts.gstatic.com/s/materialicons/v140/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2'); */ } @font-face { font-family: 'Google Material Icons'; font-style: normal; font-weight: 400; - src: url('./materialicons/v139/MaterialIcons.woff2') format('woff2'); - /* src: url(https://fonts.gstatic.com/s/materialicons/v139/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2'); */ + src: url('./materialicons/v140/MaterialIcons.woff2') format('woff2'); + /* src: url(https://fonts.gstatic.com/s/materialicons/v140/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2'); */ } @font-face { font-family: 'Material Icons Outlined'; font-style: normal; font-weight: 400; - src: url('./materialiconsoutlined/v108/MaterialIconsOutlined.woff2') format('woff2'); - /* src: url(https://fonts.gstatic.com/s/materialiconsoutlined/v108/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2) format('woff2'); */ + src: url('./materialiconsoutlined/v109/MaterialIconsOutlined.woff2') format('woff2'); + /* src: url(https://fonts.gstatic.com/s/materialiconsoutlined/v109/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2) format('woff2'); */ } @font-face { font-family: 'Google Material Icons Outlined'; font-style: normal; font-weight: 400; - src: url('./materialiconsoutlined/v108/MaterialIconsOutlined.woff2') format('woff2'); - /* src: url(https://fonts.gstatic.com/s/materialiconsoutlined/v108/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2) format('woff2'); */ + src: url('./materialiconsoutlined/v109/MaterialIconsOutlined.woff2') format('woff2'); + /* src: url(https://fonts.gstatic.com/s/materialiconsoutlined/v109/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2) format('woff2'); */ } @font-face { @@ -57,24 +57,24 @@ font-family: 'Material Icons Sharp'; font-style: normal; font-weight: 400; - src: url('./materialiconssharp/v108/MaterialIconsSharp.woff2') format('woff2'); - /* src: url(https://fonts.gstatic.com/s/materialiconssharp/v108/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2) format('woff2'); */ + src: url('./materialiconssharp/v109/MaterialIconsSharp.woff2') format('woff2'); + /* src: url(https://fonts.gstatic.com/s/materialiconssharp/v109/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2) format('woff2'); */ } @font-face { font-family: 'Google Material Icons Sharp'; font-style: normal; font-weight: 400; - src: url('./materialiconssharp/v108/MaterialIconsSharp.woff2') format('woff2'); - /* src: url(https://fonts.gstatic.com/s/materialiconssharp/v108/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2) format('woff2'); */ + src: url('./materialiconssharp/v109/MaterialIconsSharp.woff2') format('woff2'); + /* src: url(https://fonts.gstatic.com/s/materialiconssharp/v109/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2) format('woff2'); */ } @font-face { font-family: 'Material Icons Two Tone'; font-style: normal; font-weight: 400; - src: url('./materialiconstwotone/v111/MaterialIconsTwoTone.woff2') format('woff2'); - /* src: url(https://fonts.gstatic.com/s/materialiconstwotone/v111/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2) format('woff2'); */ + src: url('./materialiconstwotone/v112/MaterialIconsTwoTone.woff2') format('woff2'); + /* src: url(https://fonts.gstatic.com/s/materialiconstwotone/v112/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2) format('woff2'); */ } .material-icons { diff --git a/resources/google-material-design-icons/materialicons/v139/MaterialIcons.woff2 b/resources/google-material-design-icons/materialicons/v140/MaterialIcons.woff2 similarity index 100% rename from resources/google-material-design-icons/materialicons/v139/MaterialIcons.woff2 rename to resources/google-material-design-icons/materialicons/v140/MaterialIcons.woff2 diff --git a/resources/google-material-design-icons/materialiconsoutlined/v108/MaterialIconsOutlined.woff2 b/resources/google-material-design-icons/materialiconsoutlined/v109/MaterialIconsOutlined.woff2 similarity index 100% rename from resources/google-material-design-icons/materialiconsoutlined/v108/MaterialIconsOutlined.woff2 rename to resources/google-material-design-icons/materialiconsoutlined/v109/MaterialIconsOutlined.woff2 diff --git a/resources/google-material-design-icons/materialiconssharp/v108/MaterialIconsSharp.woff2 b/resources/google-material-design-icons/materialiconssharp/v109/MaterialIconsSharp.woff2 similarity index 100% rename from resources/google-material-design-icons/materialiconssharp/v108/MaterialIconsSharp.woff2 rename to resources/google-material-design-icons/materialiconssharp/v109/MaterialIconsSharp.woff2 diff --git a/resources/google-material-design-icons/materialiconstwotone/v111/MaterialIconsTwoTone.woff2 b/resources/google-material-design-icons/materialiconstwotone/v112/MaterialIconsTwoTone.woff2 similarity index 100% rename from resources/google-material-design-icons/materialiconstwotone/v111/MaterialIconsTwoTone.woff2 rename to resources/google-material-design-icons/materialiconstwotone/v112/MaterialIconsTwoTone.woff2