From c238f3a4d040ad79324d13a61750dd777c64dced Mon Sep 17 00:00:00 2001 From: WaitSpring Date: Thu, 15 Feb 2024 16:33:49 +0800 Subject: [PATCH] update Signed-off-by: WaitSpring --- includes/Hooks.php | 3 --- resources/ext.CollapsibleSidebar.js | 13 ++++--------- resources/ext.CollapsibleSidebar.less | 4 ++-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/includes/Hooks.php b/includes/Hooks.php index f15813c..66758b2 100644 --- a/includes/Hooks.php +++ b/includes/Hooks.php @@ -30,9 +30,6 @@ class Hooks implements } if ($this->isSidebarCollapsed()) { $out->addHtmlClasses('client-collapsedsidebar'); - if ($skin->getSkinName() === 'vector-2022') { - $out->addHtmlClasses('skin-vector-disable-max-width'); - } } } } diff --git a/resources/ext.CollapsibleSidebar.js b/resources/ext.CollapsibleSidebar.js index 8516b58..6eb0a20 100644 --- a/resources/ext.CollapsibleSidebar.js +++ b/resources/ext.CollapsibleSidebar.js @@ -6,12 +6,13 @@ */ (function () { - if (mw.config.get('wgCanonicalSpecialPageName') === 'ApiHelp') { + var WG_SKIN = mw.config.get('skin'); + + if (mw.config.get('wgCanonicalSpecialPageName') === 'ApiHelp' || WG_SKIN === 'vector-2022') { return; } - var WG_SKIN = mw.config.get('skin'), - COOKIE_NAME = 'usecollapsedsidebar', + var COOKIE_NAME = 'usecollapsedsidebar', HIDE_ICON = "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='50' height='50' viewBox='0 0 13.229 13.229'%3E%3Ccircle cx='6.615' cy='6.615' fill='%23fff' stroke='%2336c' stroke-width='1.322' r='5.953'/%3E%3Cpath d='M3.307 3.307v2.205h.735v-1.47h1.47v-.735zm.735 4.41h-.735v2.205h2.205v-.735h-1.47zm5.145 1.47h-1.47v.735h2.205V7.717h-.735zm0-5.88h-1.47v.735h1.47v1.47h.735V3.307z' fill='%2336c'/%3E%3C/svg%3E", SHOW_ICON = "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='50' height='50' viewBox='0 0 13.229 13.229'%3E%3Ccircle cx='6.615' cy='6.615' fill='%23fff' stroke='%2336c' stroke-width='1.322' r='5.953'/%3E%3Cpath d='M5.512 5.512V3.307h-.735v1.47h-1.47v.735zm-.735 4.41h.735V7.717H3.307v.735h1.47zm3.675-1.47h1.47v-.735H7.717v2.205h.735zm0-2.94h1.47v-.735h-1.47v-1.47h-.735v2.205z' fill='%2336c'/%3E%3C/svg%3E", IS_COLLAPSED = document.documentElement.classList.contains('client-collapsedsidebar'), @@ -82,9 +83,6 @@ var switchMode = { hide: function () { document.documentElement.classList.add('client-collapsedsidebar'); - if (WG_SKIN === 'vector-2022') { - document.documentElement.classList.add('skin-vector-disable-max-width'); - } if (WG_SKIN === 'write') { document.getElementById('content').parentNode.classList.remove('col-xl-10'); document.getElementById('content').parentNode.classList.add('col-xl-12'); @@ -97,9 +95,6 @@ }, show: function () { document.documentElement.classList.remove('client-collapsedsidebar'); - if (WG_SKIN === 'vector-2022') { - document.documentElement.classList.remove('skin-vector-disable-max-width'); - } if (WG_SKIN === 'write') { document.getElementById('content').parentNode.classList.add('col-xl-10'); document.getElementById('content').parentNode.classList.remove('col-xl-12'); diff --git a/resources/ext.CollapsibleSidebar.less b/resources/ext.CollapsibleSidebar.less index a43299d..4f3fc54 100644 --- a/resources/ext.CollapsibleSidebar.less +++ b/resources/ext.CollapsibleSidebar.less @@ -30,7 +30,7 @@ } /* Rules for Vector Legacy */ -.skin-vector:not( .skin-vector-2022 ) { +.skin-vector { #sliderCollapseLogo { position: absolute; top: 3em; @@ -41,7 +41,7 @@ } .client-collapsedsidebar { - .skin-vector:not( .skin-vector-2022 ) { + .skin-vector { #mw-panel { display: none; }