diff --git a/package.json b/package.json index f8439500c..c593049df 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "eslint-plugin-import": "^2.22.1", "file-loader": "^6.2.0", "lato-font": "^3.0.0", - "mini-css-extract-plugin": "^1.3.0", + "mini-css-extract-plugin": "^1.3.2", "node-sass": "^5.0.0", "postcss": "^8.1.14", "postcss-loader": "^4.0.4", diff --git a/web/wallassets/manifest.json b/web/wallassets/manifest.json index 4c2a345e0..a16a2235b 100644 --- a/web/wallassets/manifest.json +++ b/web/wallassets/manifest.json @@ -1,12 +1,21 @@ { "material.css": "material.css", "material.js": "material.js", - "material.png": "img/annotator-glyph-sprite.png", + "material.png": "themes/_global/img/icons/scuttle.png", + "material.eot": "fonts/MaterialIcons-Regular.eot", + "material.woff2": "fonts/lato-black-italic.woff2", + "material.woff": "fonts/lato-black-italic.woff", + "material.ttf": "fonts/IcoMoon-Free.ttf", "material.css.map": "material.css.map", "material.js.map": "material.js.map", "baggy.css": "baggy.css", "baggy.js": "baggy.js", - "baggy.png": "img/annotator-glyph-sprite.png", + "baggy.png": "themes/_global/img/list.png", + "baggy.eot": "fonts/MaterialIcons-Regular.eot", + "baggy.woff2": "fonts/lato-black-italic.woff2", + "baggy.woff": "fonts/lato-black-italic.woff", + "baggy.ttf": "fonts/IcoMoon-Free.ttf", + "baggy.svg": "themes/_global/img/icons/Diaspora-asterisk.svg", "baggy.css.map": "baggy.css.map", "baggy.js.map": "baggy.js.map", "public.css": "public.css", diff --git a/yarn.lock b/yarn.lock index 06679ef1b..af00b6797 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4432,10 +4432,10 @@ min-indent@^1.0.0: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -mini-css-extract-plugin@^1.3.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.1.tgz#1375c88b2bc2a9d197670a55761edcd1b5d72f21" - integrity sha512-jIOheqh9EU98rqj6ZaFTYNNDSFqdakNqaUZfkYwaXPjI9batmXVXX+K71NrqRAgtoGefELBMld1EQ7dqSAD5SQ== +mini-css-extract-plugin@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.2.tgz#e2c9c0ef3f7c1a516916a3ab7b073a761e5b1d26" + integrity sha512-ofYJgCZNm1TToSv02pGANe1lfb31g7ULwNV5Nt31d2dAnVLxFHoguDUAj6U0BLEO7Nrztq4mdtL1yFDaeW7J+A== dependencies: loader-utils "^2.0.0" schema-utils "^3.0.0"