diff --git a/bundlesize.config.json b/bundlesize.config.json index 8d0accc7e..f9829ae06 100644 --- a/bundlesize.config.json +++ b/bundlesize.config.json @@ -1,8 +1,4 @@ [ - { - "resourceModule": "skins.minerva.base.styles", - "maxSize": "9.6KB" - }, { "resourceModule": "skins.minerva.styles", "maxSize": "10.1KB" @@ -15,22 +11,10 @@ "resourceModule": "mediawiki.hlist", "maxSize": "0.3KB" }, - { - "resourceModule": "skins.minerva.icons.wikimedia", - "maxSize": "0.5KB" - }, - { - "resourceModule": "skins.minerva.mainMenu.icons", - "maxSize": "0.4KB" - }, { "resourceModule": "skins.minerva.icons", "maxSize": "0.6KB" }, - { - "resourceModule": "skins.minerva.mainMenu.styles", - "maxSize": "1.1KB" - }, { "resourceModule": "skins.minerva.scripts", "maxSize": "14.5KB" diff --git a/resources/skins.minerva.base.styles/CSSCustomProperties.less b/resources/skins.minerva.styles/CSSCustomProperties.less similarity index 100% rename from resources/skins.minerva.base.styles/CSSCustomProperties.less rename to resources/skins.minerva.styles/CSSCustomProperties.less diff --git a/resources/skins.minerva.base.styles/LanguageSection.less b/resources/skins.minerva.styles/LanguageSection.less similarity index 100% rename from resources/skins.minerva.base.styles/LanguageSection.less rename to resources/skins.minerva.styles/LanguageSection.less diff --git a/resources/skins.minerva.base.styles/LastModifiedBar.less b/resources/skins.minerva.styles/LastModifiedBar.less similarity index 100% rename from resources/skins.minerva.base.styles/LastModifiedBar.less rename to resources/skins.minerva.styles/LastModifiedBar.less diff --git a/resources/skins.minerva.mainMenu.styles/MainMenu.less b/resources/skins.minerva.styles/MainMenu.less similarity index 100% rename from resources/skins.minerva.mainMenu.styles/MainMenu.less rename to resources/skins.minerva.styles/MainMenu.less diff --git a/resources/skins.minerva.mainMenu.styles/MainMenuFooter.less b/resources/skins.minerva.styles/MainMenuFooter.less similarity index 100% rename from resources/skins.minerva.mainMenu.styles/MainMenuFooter.less rename to resources/skins.minerva.styles/MainMenuFooter.less diff --git a/resources/skins.minerva.mainMenu.styles/MainMenuItem.less b/resources/skins.minerva.styles/MainMenuItem.less similarity index 100% rename from resources/skins.minerva.mainMenu.styles/MainMenuItem.less rename to resources/skins.minerva.styles/MainMenuItem.less diff --git a/resources/skins.minerva.mainMenu.styles/NotificationsOverlay.less b/resources/skins.minerva.styles/NotificationsOverlay.less similarity index 100% rename from resources/skins.minerva.mainMenu.styles/NotificationsOverlay.less rename to resources/skins.minerva.styles/NotificationsOverlay.less diff --git a/resources/skins.minerva.base.styles/anonTalkMessage.less b/resources/skins.minerva.styles/anonTalkMessage.less similarity index 100% rename from resources/skins.minerva.base.styles/anonTalkMessage.less rename to resources/skins.minerva.styles/anonTalkMessage.less diff --git a/resources/skins.minerva.base.styles/buttons.less b/resources/skins.minerva.styles/buttons.less similarity index 100% rename from resources/skins.minerva.base.styles/buttons.less rename to resources/skins.minerva.styles/buttons.less diff --git a/resources/skins.minerva.base.styles/common.less b/resources/skins.minerva.styles/common.less similarity index 100% rename from resources/skins.minerva.base.styles/common.less rename to resources/skins.minerva.styles/common.less diff --git a/resources/skins.minerva.base.styles/content/headings.less b/resources/skins.minerva.styles/content/headings.less similarity index 100% rename from resources/skins.minerva.base.styles/content/headings.less rename to resources/skins.minerva.styles/content/headings.less diff --git a/resources/skins.minerva.base.styles/content/images.less b/resources/skins.minerva.styles/content/images.less similarity index 100% rename from resources/skins.minerva.base.styles/content/images.less rename to resources/skins.minerva.styles/content/images.less diff --git a/resources/skins.minerva.base.styles/content/index.less b/resources/skins.minerva.styles/content/index.less similarity index 100% rename from resources/skins.minerva.base.styles/content/index.less rename to resources/skins.minerva.styles/content/index.less diff --git a/resources/skins.minerva.base.styles/content/links.less b/resources/skins.minerva.styles/content/links.less similarity index 100% rename from resources/skins.minerva.base.styles/content/links.less rename to resources/skins.minerva.styles/content/links.less diff --git a/resources/skins.minerva.base.styles/content/lists.less b/resources/skins.minerva.styles/content/lists.less similarity index 100% rename from resources/skins.minerva.base.styles/content/lists.less rename to resources/skins.minerva.styles/content/lists.less diff --git a/resources/skins.minerva.base.styles/content/main.less b/resources/skins.minerva.styles/content/main.less similarity index 100% rename from resources/skins.minerva.base.styles/content/main.less rename to resources/skins.minerva.styles/content/main.less diff --git a/resources/skins.minerva.base.styles/content/styles.less b/resources/skins.minerva.styles/content/styles.less similarity index 100% rename from resources/skins.minerva.base.styles/content/styles.less rename to resources/skins.minerva.styles/content/styles.less diff --git a/resources/skins.minerva.base.styles/content/tables.less b/resources/skins.minerva.styles/content/tables.less similarity index 100% rename from resources/skins.minerva.base.styles/content/tables.less rename to resources/skins.minerva.styles/content/tables.less diff --git a/resources/skins.minerva.base.styles/content/tablet/common.less b/resources/skins.minerva.styles/content/tablet/common.less similarity index 100% rename from resources/skins.minerva.base.styles/content/tablet/common.less rename to resources/skins.minerva.styles/content/tablet/common.less diff --git a/resources/skins.minerva.base.styles/content/tablet/styles.less b/resources/skins.minerva.styles/content/tablet/styles.less similarity index 100% rename from resources/skins.minerva.base.styles/content/tablet/styles.less rename to resources/skins.minerva.styles/content/tablet/styles.less diff --git a/resources/skins.minerva.base.styles/content/text.less b/resources/skins.minerva.styles/content/text.less similarity index 100% rename from resources/skins.minerva.base.styles/content/text.less rename to resources/skins.minerva.styles/content/text.less diff --git a/resources/skins.minerva.base.styles/content/thumbnails.less b/resources/skins.minerva.styles/content/thumbnails.less similarity index 100% rename from resources/skins.minerva.base.styles/content/thumbnails.less rename to resources/skins.minerva.styles/content/thumbnails.less diff --git a/resources/skins.minerva.base.styles/content/toc.less b/resources/skins.minerva.styles/content/toc.less similarity index 100% rename from resources/skins.minerva.base.styles/content/toc.less rename to resources/skins.minerva.styles/content/toc.less diff --git a/resources/skins.minerva.base.styles/diff.less b/resources/skins.minerva.styles/diff.less similarity index 100% rename from resources/skins.minerva.base.styles/diff.less rename to resources/skins.minerva.styles/diff.less diff --git a/resources/skins.minerva.base.styles/footer.less b/resources/skins.minerva.styles/footer.less similarity index 100% rename from resources/skins.minerva.base.styles/footer.less rename to resources/skins.minerva.styles/footer.less diff --git a/resources/skins.minerva.base.styles/header.less b/resources/skins.minerva.styles/header.less similarity index 100% rename from resources/skins.minerva.base.styles/header.less rename to resources/skins.minerva.styles/header.less diff --git a/resources/skins.minerva.base.styles/icons.less b/resources/skins.minerva.styles/icons.less similarity index 100% rename from resources/skins.minerva.base.styles/icons.less rename to resources/skins.minerva.styles/icons.less diff --git a/resources/skins.minerva.mainMenu.styles/index.less b/resources/skins.minerva.styles/index.less similarity index 100% rename from resources/skins.minerva.mainMenu.styles/index.less rename to resources/skins.minerva.styles/index.less diff --git a/resources/skins.minerva.base.styles/pageactions.less b/resources/skins.minerva.styles/pageactions.less similarity index 100% rename from resources/skins.minerva.base.styles/pageactions.less rename to resources/skins.minerva.styles/pageactions.less diff --git a/resources/skins.minerva.base.styles/print/article.less b/resources/skins.minerva.styles/print/article.less similarity index 100% rename from resources/skins.minerva.base.styles/print/article.less rename to resources/skins.minerva.styles/print/article.less diff --git a/resources/skins.minerva.base.styles/print/footer.less b/resources/skins.minerva.styles/print/footer.less similarity index 100% rename from resources/skins.minerva.base.styles/print/footer.less rename to resources/skins.minerva.styles/print/footer.less diff --git a/resources/skins.minerva.base.styles/print/header.less b/resources/skins.minerva.styles/print/header.less similarity index 100% rename from resources/skins.minerva.base.styles/print/header.less rename to resources/skins.minerva.styles/print/header.less diff --git a/resources/skins.minerva.base.styles/print/references.less b/resources/skins.minerva.styles/print/references.less similarity index 100% rename from resources/skins.minerva.base.styles/print/references.less rename to resources/skins.minerva.styles/print/references.less diff --git a/resources/skins.minerva.base.styles/print/styles.less b/resources/skins.minerva.styles/print/styles.less similarity index 100% rename from resources/skins.minerva.base.styles/print/styles.less rename to resources/skins.minerva.styles/print/styles.less diff --git a/resources/skins.minerva.base.styles/skin.less b/resources/skins.minerva.styles/skin.less similarity index 100% rename from resources/skins.minerva.base.styles/skin.less rename to resources/skins.minerva.styles/skin.less diff --git a/resources/skins.minerva.base.styles/ui.less b/resources/skins.minerva.styles/ui.less similarity index 100% rename from resources/skins.minerva.base.styles/ui.less rename to resources/skins.minerva.styles/ui.less diff --git a/resources/skins.minerva.base.styles/userMenu.less b/resources/skins.minerva.styles/userMenu.less similarity index 100% rename from resources/skins.minerva.base.styles/userMenu.less rename to resources/skins.minerva.styles/userMenu.less diff --git a/resources/skins.minerva.base.styles/watchStar.less b/resources/skins.minerva.styles/watchStar.less similarity index 100% rename from resources/skins.minerva.base.styles/watchStar.less rename to resources/skins.minerva.styles/watchStar.less diff --git a/skin.json b/skin.json index a4f4754fa..a45693e16 100644 --- a/skin.json +++ b/skin.json @@ -332,25 +332,9 @@ "interface-core" ], "styles": [ - "resources/skins.minerva.base.styles/CSSCustomProperties.less", - "resources/skins.minerva.base.styles/skin.less", - "resources/skins.minerva.mainMenu.styles/index.less" - ] - }, - "skins.minerva.base.styles": { - "deprecated": "Retained for caching reasons. Please use skins.minerva.styles instead.", - "class": "MediaWiki\\ResourceLoader\\SkinModule", - "features": [ - "normalize", - "accessibility", - "i18n-ordered-lists", - "content-body", - "content-tables", - "interface-core" - ], - "styles": [ - "resources/skins.minerva.base.styles/CSSCustomProperties.less", - "resources/skins.minerva.base.styles/skin.less" + "resources/skins.minerva.styles/CSSCustomProperties.less", + "resources/skins.minerva.styles/skin.less", + "resources/skins.minerva.styles/index.less" ] }, "skins.minerva.content.styles.images": { @@ -443,29 +427,6 @@ "watchlist" ] }, - "skins.minerva.icons.wikimedia": { - "deprecated": "Retained for caching reasons. Please use skins.minerva.icons instead.", - "selectorWithoutVariant": ".minerva-icon--{name}", - "useDataURI": false, - "defaultColor": "#54595d", - "class": "MediaWiki\\ResourceLoader\\OOUIIconPackModule", - "variants": [], - "useMaskImage": true, - "icons": [ - "edit", - "wikiText", - "editLock", - "history", - "language", - "menu", - "search", - "userAvatar", - "userTalk", - "star", - "halfStar", - "unStar" - ] - }, "skins.minerva.mainPage.styles": { "styles": [ "resources/skins.minerva.mainPage.styles/common.less" @@ -500,33 +461,6 @@ "variants": [], "useDataURI": false }, - "skins.minerva.mainMenu.icons": { - "deprecated": "Retained for caching reasons. Please use skins.minerva.icons instead.", - "class": "MediaWiki\\ResourceLoader\\OOUIIconPackModule", - "variants": [], - "useMaskImage": true, - "selectorWithoutVariant": ".minerva-icon--{name}", - "defaultColor": "#54595d", - "useDataURI": false, - "icons": [ - "die", - "heart", - "home", - "logIn", - "logOut", - "mapPin", - "settings", - "userContributions", - "unStar", - "watchlist" - ] - }, - "skins.minerva.mainMenu.styles": { - "deprecated": "Retained for caching reasons. Please use skins.minerva.styles instead.", - "styles": [ - "resources/skins.minerva.mainMenu.styles/index.less" - ] - }, "skins.minerva.loggedin.styles": { "styles": [ "resources/skins.minerva.loggedin.styles/styles.less"