From e89aab6b439395dd0be44ba5d84ecde91ccc2b89 Mon Sep 17 00:00:00 2001 From: Jon Robson Date: Fri, 6 Sep 2024 09:30:00 -0700 Subject: [PATCH] Cleanup: Remove dark mode banner code this is not being utilized any more, tested or maintained so should be removed. Change-Id: Ib51bc5cb829f25b8a2ab864f7b9266578a4b1232 --- bundlesize.config.json | 8 -- i18n/en.json | 6 -- i18n/qqq.json | 6 -- .../DarkModeLaunchBanner.js | 81 ------------------- .../DarkModeLaunchBanner.less | 9 --- skin.json | 26 ------ 6 files changed, 136 deletions(-) delete mode 100644 resources/skins.minerva.DarkModeLaunchBanner/DarkModeLaunchBanner.js delete mode 100644 resources/skins.minerva.DarkModeLaunchBanner/DarkModeLaunchBanner.less diff --git a/bundlesize.config.json b/bundlesize.config.json index cbfbec7c7..0fd3168ea 100644 --- a/bundlesize.config.json +++ b/bundlesize.config.json @@ -26,13 +26,5 @@ { "resourceModule": "skins.minerva.scripts", "maxSize": "14.5KB" - }, - { - "resourceModule": "skins.minerva.DarkModeLaunchBanner", - "maxSize": "3.3KB" - }, - { - "resourceModule": "skins.minerva.DarkModeLaunchBanner.codexModules", - "maxSize": "3.3KB" } ] diff --git a/i18n/en.json b/i18n/en.json index 690322dbe..0b982fa72 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -60,12 +60,6 @@ "skin-minerva-mobile-option-MinervaPageIssuesNewTreatment-description": "Page issues (Template:ambox) will be inlined in the article.", "skin-minerva-recentchanges-warning-enhanced-not-supported": "Unfortunately, grouping results by page is not available on mobile. If you would like to use the group by page feature please visit the desktop site.", "skin-minerva-night-mode-unavailable": "Page only available in \"Light\" color theme.", - "skin-minerva-night-mode-launch-title": "Wikipedia's new colors", - "skin-minerva-night-mode-launch-subtitle": "Try dark mode today", - "skin-minerva-night-mode-launch-description-night": "Wikipedia is now available in dark mode. Try it out by tapping on \"Settings\" in the main menu.", - "skin-minerva-night-mode-launch-description-day": "Wikipedia is now available in dark mode. Try it out by tapping on \"Settings\" in the main menu.", - "skin-minerva-night-mode-launch-settings-label": "Go to Settings", - "skin-minerva-night-mode-launch-close-label": "Close", "minerva.css": "/* All CSS here will be loaded for users of the MinervaNeue skin */", "minerva.js": "/* All JavaScript here will be loaded for users of the MinervaNeue skin */" } diff --git a/i18n/qqq.json b/i18n/qqq.json index 07fad41e5..c55146079 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -75,12 +75,6 @@ "skin-minerva-mobile-option-MinervaPageIssuesNewTreatment-description": "Description shown on Special:MobileOptions for page issues beta feature.", "skin-minerva-recentchanges-warning-enhanced-not-supported": "Warning message when informing about the lack of the '''group results by page''' feature availability on the mobile site. Message should recommend visiting desktop site to access grouping results by page.", "skin-minerva-night-mode-unavailable": "Informs reader if page could not be rendered in preferred dark mode theme.", - "skin-minerva-night-mode-launch-title": "Title of a modal that appears informing users of the new dark mode feature", - "skin-minerva-night-mode-launch-subtitle": "Subtitle of a modal that appears informing users of the new dark mode feature. \"Dark\" should be translated consistently with {{msg-mw|Skin-theme-night-label}}.", - "skin-minerva-night-mode-launch-description-night": "Text in the dark mode launch modal describing the dark mode feature, when dark mode is enabled. \"Settings\" is {{msg-mw|Mobile-frontend-main-menu-settings-heading}}.", - "skin-minerva-night-mode-launch-description-day": "Text in the dark mode launch modal describing the dark mode feature, when dark mode is disabled. \"Settings\" is {{msg-mw|Mobile-frontend-main-menu-settings-heading}}.", - "skin-minerva-night-mode-launch-settings-label": "Label of a button that directs to the Special:MobileOptions page", - "skin-minerva-night-mode-launch-close-label": "Label for button to close the dark-mode launch modal", "minerva.css": "{{optional}}\n{{related/css}}", "minerva.js": "{{optional}}\n{{related/js}}" } diff --git a/resources/skins.minerva.DarkModeLaunchBanner/DarkModeLaunchBanner.js b/resources/skins.minerva.DarkModeLaunchBanner/DarkModeLaunchBanner.js deleted file mode 100644 index 1f254f55d..000000000 --- a/resources/skins.minerva.DarkModeLaunchBanner/DarkModeLaunchBanner.js +++ /dev/null @@ -1,81 +0,0 @@ -const makeTemplate = function ( description ) { - const templateString = `
-
- -
-
`; - - const templateElement = document.createElement( 'div' ); - templateElement.id = 'minerva-dark-mode-launch-banner'; - templateElement.innerHTML = templateString; - return templateElement; -}; - -function closeModal() { - document.getElementById( 'minerva-dark-mode-launch-banner' ).remove(); -} - -function primaryActionHandler() { - closeModal(); - const url = mw.util.getUrl( 'Special:MobileOptions', { returnto: mw.config.get( 'wgPageName' ) } ); - window.location.href = url; -} - -function init() { - const mountElement = document.getElementById( 'mw-teleport-target' ), - matchMediaDark = window.matchMedia( '(prefers-color-scheme: dark)' ), - colorMode = mw.user.clientPrefs.get( 'skin-theme' ), - description = ( - colorMode === 'night' || - ( colorMode === 'auto' && matchMediaDark ) - ) ? - mw.message( 'skin-minerva-night-mode-launch-description-night' ).escaped() : - mw.message( 'skin-minerva-night-mode-launch-description-day' ).escaped(), - templateElement = makeTemplate( description ), - dialogOverlay = templateElement.querySelector( '.cdx-dialog-backdrop' ), - dialogCloseButton = templateElement.querySelector( '.cdx-dialog__header__close-button' ), - primaryActionButton = templateElement.querySelector( '.cdx-dialog__footer__primary-action' ); - - dialogOverlay.addEventListener( 'click', ( e ) => { - if ( e.target === dialogOverlay ) { - closeModal(); - } - } ); - - dialogCloseButton.addEventListener( 'click', closeModal ); - primaryActionButton.addEventListener( 'click', primaryActionHandler ); - - mountElement.appendChild( templateElement ); -} - -module.exports = init; diff --git a/resources/skins.minerva.DarkModeLaunchBanner/DarkModeLaunchBanner.less b/resources/skins.minerva.DarkModeLaunchBanner/DarkModeLaunchBanner.less deleted file mode 100644 index 3dfc46e82..000000000 --- a/resources/skins.minerva.DarkModeLaunchBanner/DarkModeLaunchBanner.less +++ /dev/null @@ -1,9 +0,0 @@ -@import 'mediawiki.skin.variables.less'; - -.skin-minerva-launch-image { - background: url( dark-mode-banner.svg ) no-repeat 0 0; - background-size: 100%; - width: ~'calc(100% + @{spacing-300})'; - margin: -@spacing-100 -@spacing-150 0 -@spacing-150; - aspect-ratio: ( 2 / 1 ); -} diff --git a/skin.json b/skin.json index c1439059d..6bf8ca19d 100644 --- a/skin.json +++ b/skin.json @@ -444,32 +444,6 @@ "resources/skins.minerva.userpage.styles/userpage.less" ] }, - "skins.minerva.DarkModeLaunchBanner": { - "packageFiles": [ - "resources/skins.minerva.DarkModeLaunchBanner/DarkModeLaunchBanner.js" - ], - "styles": [ - "resources/skins.minerva.DarkModeLaunchBanner/DarkModeLaunchBanner.less" - ], - "dependencies": [ - "skins.minerva.DarkModeLaunchBanner.codexModules" - ], - "messages": [ - "skin-minerva-night-mode-launch-title", - "skin-minerva-night-mode-launch-subtitle", - "skin-minerva-night-mode-launch-description-night", - "skin-minerva-night-mode-launch-description-day", - "skin-minerva-night-mode-launch-settings-label", - "skin-minerva-night-mode-launch-close-label" - ] - }, - "skins.minerva.DarkModeLaunchBanner.codexModules": { - "class": "MediaWiki\\ResourceLoader\\CodexModule", - "codexStyleOnly": true, - "codexComponents": [ - "CdxDialog" - ] - }, "skins.minerva.personalMenu.icons": { "class": "MediaWiki\\ResourceLoader\\OOUIIconPackModule", "selectorWithoutVariant": ".minerva-icon--{name}",