diff --git a/THIRD_PARTY.txt b/THIRD_PARTY.txt index 2f441dc1..d3deb17c 100644 --- a/THIRD_PARTY.txt +++ b/THIRD_PARTY.txt @@ -1797,6 +1797,10 @@ 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/materialicons/v127/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2 +https://fonts.gstatic.com/s/materialiconsoutlined/v102/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2 +https://fonts.gstatic.com/s/materialiconsround/v101/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2 +https://fonts.gstatic.com/s/materialiconssharp/v102/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2 +https://fonts.gstatic.com/s/materialiconstwotone/v105/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.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.3/dist/jquery.validate.min.js diff --git a/audit/audit.sh b/audit/audit.sh index e1ddbe16..f72ce83c 100755 --- a/audit/audit.sh +++ b/audit/audit.sh @@ -438,7 +438,17 @@ function create_url() { elif [ "$folder" = "rocket-loader" ]; then url="$CLOUDFLARE_AJAX/7089c43e/cloudflare-static/rocket-loader.min.js" elif [ "$folder" = "google-material-design-icons" ]; then - url="$FONTSGSTATIC/s/materialicons/$version/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2" + if [[ $file = "MaterialIcons.woff2" ]]; then + url="$FONTSGSTATIC/s/materialicons/$version/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2" + elif [[ $file = "MaterialIconsOutlined.woff2" ]]; then + url="$FONTSGSTATIC/s/materialiconsoutlined/$version/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2" + elif [[ $file = "MaterialIconsRound.woff2" ]]; then + url="$FONTSGSTATIC/s/materialiconsround/$version/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2" + elif [[ $file = "MaterialIconsSharp.woff2" ]]; then + url="$FONTSGSTATIC/s/materialiconssharp/$version/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2" + elif [[ $file = "MaterialIconsTwoTone.woff2" ]]; then + url="$FONTSGSTATIC/s/materialiconstwotone/$version/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2" + fi elif [ "$folder" = "object-assign" ]; then url="$JSDELIVR/npm/object-assign@4.1.1/index.js" elif [ "$folder" = "mirage2" ]; then 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 5c1e3a97..f6bc0b15 100644 --- a/resources/google-material-design-icons/google-material-design-icons.css +++ b/resources/google-material-design-icons/google-material-design-icons.css @@ -21,6 +21,62 @@ /* src: url(https://fonts.gstatic.com/s/materialicons/v127/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2) format('woff2'); */ } +@font-face { + font-family: 'Material Icons Outlined'; + font-style: normal; + font-weight: 400; + src: url('./v102/MaterialIconsOutlined.woff2') format('woff2'); + /* src: url(https://fonts.gstatic.com/s/materialiconsoutlined/v102/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2) format('woff2'); */ +} + +@font-face { + font-family: 'Google Material Icons Outlined'; + font-style: normal; + font-weight: 400; + src: url('./v102/MaterialIconsOutlined.woff2') format('woff2'); + /* src: url(https://fonts.gstatic.com/s/materialiconsoutlined/v102/gok-H7zzDkdnRel8-DQ6KAXJ69wP1tGnf4ZGhUce.woff2) format('woff2'); */ +} + +@font-face { + font-family: 'Material Icons Round'; + font-style: normal; + font-weight: 400; + src: url('./v101/MaterialIconsRound.ttf') format('woff2'); + /* src: url(https://fonts.gstatic.com/s/materialiconsround/v101/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2) format('woff2'); */ +} + +@font-face { + font-family: 'Google Material Icons Round'; + font-style: normal; + font-weight: 400; + src: url('./v101/MaterialIconsRound.ttf') format('woff2'); + /* src: url(https://fonts.gstatic.com/s/materialiconsround/v101/LDItaoyNOAY6Uewc665JcIzCKsKc_M9flwmP.woff2) format('woff2'); */ +} + +@font-face { + font-family: 'Material Icons Sharp'; + font-style: normal; + font-weight: 400; + src: url('./v102/MaterialIconsSharp.woff2') format('woff2'); + /* src: url(https://fonts.gstatic.com/s/materialiconssharp/v102/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2) format('woff2'); */ +} + +@font-face { + font-family: 'Google Material Icons Sharp'; + font-style: normal; + font-weight: 400; + src: url('./v102/MaterialIconsSharp.woff2') format('woff2'); + /* src: url(https://fonts.gstatic.com/s/materialiconssharp/v102/oPWQ_lt5nv4pWNJpghLP75WiFR4kLh3kvmvR.woff2) format('woff2'); */ +} + +@font-face { + font-family: 'Material Icons Two Tone'; + font-style: normal; + font-weight: 400; + src: url('./v105/MaterialIconsTwoTone.woff2') format('woff2'); + /* src: url(https://fonts.gstatic.com/s/materialiconstwotone/v105/hESh6WRmNCxEqUmNyh3JDeGxjVVyMg4tHGctNCu0.woff2) format('woff2'); */ +} + .material-icons { font-family: 'Material Icons'; font-weight: normal; @@ -52,3 +108,131 @@ -moz-font-feature-settings: 'liga'; -moz-osx-font-smoothing: grayscale; } + +.material-icons-outlined { + font-family: 'Material Icons Outlined'; + font-weight: normal; + font-style: normal; + font-size: 24px; + line-height: 1; + letter-spacing: normal; + text-transform: none; + display: inline-block; + white-space: nowrap; + word-wrap: normal; + direction: ltr; + -webkit-font-feature-settings: 'liga'; + -webkit-font-smoothing: antialiased; +} + +.google-material-icons-outlined { + font-family: 'Material Icons Outlined'; + font-weight: normal; + font-style: normal; + font-size: 24px; + line-height: 1; + letter-spacing: normal; + text-transform: none; + display: inline-block; + white-space: nowrap; + word-wrap: normal; + direction: ltr; + -webkit-font-feature-settings: 'liga'; + -webkit-font-smoothing: antialiased; +} + +.material-icons-round { + font-family: 'Material Icons Round'; + font-weight: normal; + font-style: normal; + font-size: 24px; + line-height: 1; + letter-spacing: normal; + text-transform: none; + display: inline-block; + white-space: nowrap; + word-wrap: normal; + direction: ltr; + -webkit-font-feature-settings: 'liga'; + -webkit-font-smoothing: antialiased; +} + +.google-material-icons-round { + font-family: 'Material Icons Round'; + font-weight: normal; + font-style: normal; + font-size: 24px; + line-height: 1; + letter-spacing: normal; + text-transform: none; + display: inline-block; + white-space: nowrap; + word-wrap: normal; + direction: ltr; + -webkit-font-feature-settings: 'liga'; + -webkit-font-smoothing: antialiased; +} + +.material-icons-sharp { + font-family: 'Material Icons Sharp'; + font-weight: normal; + font-style: normal; + font-size: 24px; + line-height: 1; + letter-spacing: normal; + text-transform: none; + display: inline-block; + white-space: nowrap; + word-wrap: normal; + direction: ltr; + -webkit-font-feature-settings: 'liga'; + -webkit-font-smoothing: antialiased; +} + +.google-material-icons-sharp { + font-family: 'Material Icons Sharp'; + font-weight: normal; + font-style: normal; + font-size: 24px; + line-height: 1; + letter-spacing: normal; + text-transform: none; + display: inline-block; + white-space: nowrap; + word-wrap: normal; + direction: ltr; + -webkit-font-feature-settings: 'liga'; + -webkit-font-smoothing: antialiased; +} + +.material-icons-two-tone { + font-family: 'Material Icons Two Tone'; + font-weight: normal; + font-style: normal; + font-size: 24px; + line-height: 1; + letter-spacing: normal; + text-transform: none; + display: inline-block; + white-space: nowrap; + word-wrap: normal; + direction: ltr; + -webkit-font-feature-settings: 'liga'; + -webkit-font-smoothing: antialiased; +} + +.google-material-icons-two-tone { + font-family: 'Material Icons Two Tone'; + font-weight: normal; + font-style: normal; + font-size: 24px; + line-height: 1; + letter-spacing: normal; + text-transform: none; + display: inline-block; + white-space: nowrap; + word-wrap: normal; + direction: ltr; + -webkit-font-feature-settings: 'liga'; + -webkit-font-smoothing: antialiased; +} diff --git a/resources/google-material-design-icons/v101/MaterialIconsRound.woff2 b/resources/google-material-design-icons/v101/MaterialIconsRound.woff2 new file mode 100644 index 00000000..5fe14980 Binary files /dev/null and b/resources/google-material-design-icons/v101/MaterialIconsRound.woff2 differ diff --git a/resources/google-material-design-icons/v102/MaterialIconsOutlined.woff2 b/resources/google-material-design-icons/v102/MaterialIconsOutlined.woff2 new file mode 100644 index 00000000..0fdb217b Binary files /dev/null and b/resources/google-material-design-icons/v102/MaterialIconsOutlined.woff2 differ diff --git a/resources/google-material-design-icons/v102/MaterialIconsSharp.woff2 b/resources/google-material-design-icons/v102/MaterialIconsSharp.woff2 new file mode 100644 index 00000000..ac9940d3 Binary files /dev/null and b/resources/google-material-design-icons/v102/MaterialIconsSharp.woff2 differ diff --git a/resources/google-material-design-icons/v105/MaterialIconsTwoTone.woff2 b/resources/google-material-design-icons/v105/MaterialIconsTwoTone.woff2 new file mode 100644 index 00000000..809d3bc9 Binary files /dev/null and b/resources/google-material-design-icons/v105/MaterialIconsTwoTone.woff2 differ