From 6b7197cf95611b2ceb1a640408c15abcc46a4de1 Mon Sep 17 00:00:00 2001 From: bwang Date: Thu, 1 Sep 2022 13:15:40 -0500 Subject: [PATCH] Followup: Removed code for cached HTML from T313060 Bug: T313060 Depends-on: Ia263c606dce5a6060b6b29fbaedc49cef3e17a5c Change-Id: I0626f5c8d92836ecac961bbe213ffd8b0f0e2df5 --- resources/skins.vector.es6/stickyHeader.js | 5 +--- .../components/TableOfContents.less | 23 ------------------- .../components/TableOfContentsCollapsed.less | 2 -- 3 files changed, 1 insertion(+), 29 deletions(-) diff --git a/resources/skins.vector.es6/stickyHeader.js b/resources/skins.vector.es6/stickyHeader.js index 2f319b18..2460e41d 100644 --- a/resources/skins.vector.es6/stickyHeader.js +++ b/resources/skins.vector.es6/stickyHeader.js @@ -60,11 +60,8 @@ function moveToc( position ) { return; } - // FIXME: Remove after Ia263c606dce5a6060b6b29fbaedc49cef3e17a5c has been in prod for 5 days - const isCachedHtml = document.querySelector( '.mw-table-of-contents-container.mw-sticky-header-element' ); - let newTocContainer; - const sidebarTocContainerClass = isCachedHtml ? 'mw-table-of-contents-container' : 'vector-sticky-toc-container'; + const sidebarTocContainerClass = 'vector-sticky-toc-container'; const stickyHeaderTocContainerClass = 'vector-menu-content'; // Avoid moving TOC if unnecessary if ( !currTocContainer.classList.contains( sidebarTocContainerClass ) && position === 'sidebar' ) { diff --git a/resources/skins.vector.styles/components/TableOfContents.less b/resources/skins.vector.styles/components/TableOfContents.less index ede20bcf..d02013d6 100644 --- a/resources/skins.vector.styles/components/TableOfContents.less +++ b/resources/skins.vector.styles/components/TableOfContents.less @@ -15,24 +15,6 @@ height: 100%; } -// FIXME: Remove selector after Ia263c606dce5a6060b6b29fbaedc49cef3e17a5c has been in prod for 5 days -.mw-table-of-contents-container.mw-sticky-header-element { - // stylelint-disable-next-line plugin/no-unsupported-browser-features - position: sticky; - top: 0; - // Needed for Grid-based layout - align-self: start; - height: unset; - - // Needed to align TOC with bottom of title - // 1.5em from .mw-table-of-contents-container + 1.5em from .sidebar-toc = 3em - @media ( min-width: @min-width-desktop ) { - .vector-toc-not-collapsed @{selector-main-menu-closed} ~ & { - margin-top: 1.5em; - } - } -} - .vector-sticky-toc-container { // stylelint-disable-next-line plugin/no-unsupported-browser-features position: sticky; @@ -52,11 +34,6 @@ } } -// FIXME: Remove selector after Ia263c606dce5a6060b6b29fbaedc49cef3e17a5c has been in prod for 5 days -.mw-table-of-contents-container > .sidebar-toc { - margin-top: 1.5em; -} - .sidebar-toc { max-height: 75vh; padding: @sidebar-toc-vertical-padding @sidebar-toc-right-padding @sidebar-toc-vertical-padding @sidebar-toc-left-padding; diff --git a/resources/skins.vector.styles/components/TableOfContentsCollapsed.less b/resources/skins.vector.styles/components/TableOfContentsCollapsed.less index a3a6d122..655b52cb 100644 --- a/resources/skins.vector.styles/components/TableOfContentsCollapsed.less +++ b/resources/skins.vector.styles/components/TableOfContentsCollapsed.less @@ -64,8 +64,6 @@ display: block; } - // FIXME: Remove this selector after Ia263c606dce5a6060b6b29fbaedc49cef3e17a5c has been in prod for 5 days - .mw-table-of-contents-container.mw-sticky-header-element, .vector-sticky-toc-container { position: relative; }