From d6544e4c5cb1e6b540fc5a4c089e62e71c8f42e5 Mon Sep 17 00:00:00 2001 From: Jon Robson Date: Thu, 14 Sep 2023 12:56:06 -0700 Subject: [PATCH] Clean up FIXMES now the cache has cleared Follow up to Iad8523037ed364f09962b2d6ca0a3d50d7bd2266 Bug: T346401 Change-Id: Ifa4ab87e43cf28143dc7d753e264d4f0957dcbfa --- .../components/StickyHeader.less | 2 -- .../components/TableOfContents.less | 6 +----- .../skins.vector.styles/layouts/grid.less | 4 +--- .../layouts/toc/pinned.less | 8 ++------ .../layouts/toc/unpinned.less | 20 +++++-------------- 5 files changed, 9 insertions(+), 31 deletions(-) diff --git a/resources/skins.vector.styles/components/StickyHeader.less b/resources/skins.vector.styles/components/StickyHeader.less index 997553406..a035a770f 100644 --- a/resources/skins.vector.styles/components/StickyHeader.less +++ b/resources/skins.vector.styles/components/StickyHeader.less @@ -151,10 +151,8 @@ // to make their templates compatible with the Vector 2022 sticky header. // @stable See the Integration notes for developers section at // https://www.mediawiki.org/wiki/Reading/Web/Desktop_Improvements/Features/Sticky_Header - // FIXME: Remove vector-feature-toc-pinned-(enabled|disabled) when cache allows. // - `.charts-stickyhead th` makes chart and table headers appear below the sticky header. &.vector-feature-toc-pinned-clientpref-1 #vector-toc-pinned-container, - &.vector-feature-toc-pinned-enabled #vector-toc-pinned-container, &.vector-feature-page-tools-pinned-enabled .vector-page-tools-landmark, .mw-sticky-header-element, .charts-stickyhead th { diff --git a/resources/skins.vector.styles/components/TableOfContents.less b/resources/skins.vector.styles/components/TableOfContents.less index d0a69978a..0ac5804d2 100644 --- a/resources/skins.vector.styles/components/TableOfContents.less +++ b/resources/skins.vector.styles/components/TableOfContents.less @@ -136,13 +136,9 @@ display: none; } -// FIXME: Remove vector-feature-toc-pinned-(enabled|disabled) when cache allows. &.vector-feature-toc-pinned-clientpref-0 body:not( .vector-sticky-header-visible ) .vector-page-titlebar, &.vector-feature-toc-pinned-clientpref-0 .vector-sticky-header-visible .vector-sticky-header-context-bar, -&.vector-feature-toc-pinned-clientpref-1 .mw-page-container-inner, -&.vector-feature-toc-pinned-disabled body:not( .vector-sticky-header-visible ) .vector-page-titlebar, -&.vector-feature-toc-pinned-disabled .vector-sticky-header-visible .vector-sticky-header-context-bar, -&.vector-feature-toc-pinned-enabled .mw-page-container-inner { +&.vector-feature-toc-pinned-clientpref-1 .mw-page-container-inner { > .vector-toc-landmark { display: block; } diff --git a/resources/skins.vector.styles/layouts/grid.less b/resources/skins.vector.styles/layouts/grid.less index 5a9cca805..199c4dd55 100644 --- a/resources/skins.vector.styles/layouts/grid.less +++ b/resources/skins.vector.styles/layouts/grid.less @@ -81,10 +81,8 @@ } // Horizontally center content when column start is empty (i.e. no pinned ToC or pinned main menu) -// FIXME: Remove vector-feature-toc-pinned-(enabled|disabled) when cache allows. &.vector-feature-main-menu-pinned-disabled .vector-sidebar-container-no-toc ~ .mw-content-container, -&.vector-feature-main-menu-pinned-disabled.vector-feature-toc-pinned-clientpref-0 .mw-content-container, -&.vector-feature-main-menu-pinned-disabled.vector-feature-toc-pinned-disabled .mw-content-container { +&.vector-feature-main-menu-pinned-disabled.vector-feature-toc-pinned-clientpref-0 .mw-content-container { grid-column: mainMenu / pageContent; margin-left: auto; margin-right: auto; diff --git a/resources/skins.vector.styles/layouts/toc/pinned.less b/resources/skins.vector.styles/layouts/toc/pinned.less index e36aed909..c29e26b58 100644 --- a/resources/skins.vector.styles/layouts/toc/pinned.less +++ b/resources/skins.vector.styles/layouts/toc/pinned.less @@ -8,9 +8,7 @@ } @media ( min-width: @min-width-desktop ) { - // FIXME: Remove vector-feature-toc-pinned-(enabled|disabled) when cache allows. - &.vector-feature-toc-pinned-clientpref-1 #mw-panel-toc, - &.vector-feature-toc-pinned-enabled #mw-panel-toc { + &.vector-feature-toc-pinned-clientpref-1 #mw-panel-toc { // Support: Chrome // Work around sticky-positioned layers disabling subpixel text rendering (T327460). // NOTE: This property has an effect similar to 'overflow: hidden', and will prevent elements @@ -27,9 +25,7 @@ top: 0; } - // FIXME: Remove vector-feature-toc-pinned-(enabled|disabled) when cache allows. - &.vector-feature-toc-pinned-clientpref-1 #vector-toc-pinned-container, - &.vector-feature-toc-pinned-enabled #vector-toc-pinned-container { + &.vector-feature-toc-pinned-clientpref-1 #vector-toc-pinned-container { // Default spacing separating the sidebar TOC from the main menu. margin-top: 1.5em; } diff --git a/resources/skins.vector.styles/layouts/toc/unpinned.less b/resources/skins.vector.styles/layouts/toc/unpinned.less index 8ab809f9f..1d7316656 100644 --- a/resources/skins.vector.styles/layouts/toc/unpinned.less +++ b/resources/skins.vector.styles/layouts/toc/unpinned.less @@ -70,9 +70,7 @@ // // TOC in page titlebar // - // FIXME: Remove vector-feature-toc-pinned-(enabled|disabled) when cache allows. - &.vector-feature-toc-pinned-clientpref-0 body:not( .vector-sticky-header-visible ), - &.vector-feature-toc-pinned-disabled body:not( .vector-sticky-header-visible ) { + &.vector-feature-toc-pinned-clientpref-0 body:not( .vector-sticky-header-visible ) { .vector-page-titlebar-toc { .mixin-toc-unpinned(); } @@ -81,9 +79,7 @@ // // TOC in page titlebar below page title // - // FIXME: Remove vector-feature-toc-pinned-(enabled|disabled) when cache allows. - &.vector-feature-toc-pinned-clientpref-0 body:not( .vector-sticky-header-visible ).vector-below-page-title, - &.vector-feature-toc-pinned-disabled body:not( .vector-sticky-header-visible ).vector-below-page-title { + &.vector-feature-toc-pinned-clientpref-0 body:not( .vector-sticky-header-visible ).vector-below-page-title { .vector-page-titlebar-toc { .mixin-toc-below-page-title(); } @@ -92,9 +88,7 @@ // // TOC in sticky header // - // FIXME: Remove vector-feature-toc-pinned-(enabled|disabled) when cache allows. - &.vector-feature-toc-pinned-clientpref-0 .vector-sticky-header-visible, - &.vector-feature-toc-pinned-disabled .vector-sticky-header-visible { + &.vector-feature-toc-pinned-clientpref-0 .vector-sticky-header-visible { .vector-sticky-header-toc { .mixin-toc-unpinned(); } @@ -106,9 +100,7 @@ // // No-JS TOC in page titlebar // - // FIXME: Remove vector-feature-toc-pinned-(enabled|disabled) when cache allows. - &.vector-feature-toc-pinned-clientpref-0, - &.vector-feature-toc-pinned-disabled { + &.vector-feature-toc-pinned-clientpref-0 { .vector-page-titlebar-toc { .mixin-toc-unpinned(); } @@ -121,9 +113,7 @@ // Make the TOC appear in the page titlebar on small viewports // even when the TOC location in the DOM is actually in the sidebar // This case only happens for no-js anon users. - // FIXME: Remove vector-feature-toc-pinned-(enabled|disabled) when cache allows. - &.vector-feature-toc-pinned-clientpref-1, - &.vector-feature-toc-pinned-enabled { + &.vector-feature-toc-pinned-clientpref-1 { #vector-toc-collapsed-button { display: block; }