diff --git a/resources/skins.vector.styles.legacy/components/MenuTabs.less b/resources/skins.vector.styles.legacy/components/MenuTabs.less index 71f5ccf0..3d20d353 100644 --- a/resources/skins.vector.styles.legacy/components/MenuTabs.less +++ b/resources/skins.vector.styles.legacy/components/MenuTabs.less @@ -6,8 +6,6 @@ */ /* Namespaces and Views */ -// FIXME: Remove vector-menu-tabs when vector-menu-tabs-legacy is present everywhere -.vector-menu-tabs, .vector-menu-tabs-legacy { // Tab separator: Outer start border (left in LTR) of tab row. background-position: left bottom; diff --git a/resources/skins.vector.styles/components/LanguageButton.less b/resources/skins.vector.styles/components/LanguageButton.less index 9a39bcd2..ef95ad82 100644 --- a/resources/skins.vector.styles/components/LanguageButton.less +++ b/resources/skins.vector.styles/components/LanguageButton.less @@ -2,10 +2,11 @@ @import '../../common/variables.less'; @import 'mediawiki.mixins.less'; -// TODO: `#p-lang-btn` Can be removed after Iebacb6a7bf3412a6ee76eb5c9fdb9471c02dd16c -// has been in prod for 5 days. -#p-lang-btn, -.vector-language-in-header-enabled .mw-portlet-lang { +// Note vector-language-in-header-enabled class is not used here as that class +// only applies to main page. +// This must be limited to mw-body-header as the mw-portlet-lang class is shared with +// the language portlet that can display in the sidebar. +.mw-body-header .mw-portlet-lang { // FIXME [review whether margin-top is needed] center vertically in heading. margin-top: 2px; box-sizing: border-box; diff --git a/resources/skins.vector.styles/components/Sidebar.less b/resources/skins.vector.styles/components/Sidebar.less index 06ee001d..4aaa7ee5 100644 --- a/resources/skins.vector.styles/components/Sidebar.less +++ b/resources/skins.vector.styles/components/Sidebar.less @@ -31,11 +31,6 @@ body:not( .vector-toc-enabled ) .mw-sidebar { background-image: linear-gradient( to bottom, @background-color-base 0%, @background-color-secondary--modern 10%, @background-color-secondary--modern 90%, @background-color-base 100% ); } -// FIXME: Can be removed when "VectorTitleAboveTabs" is enabled and old layout is removed. -.vector-article-toolbar + .mw-sidebar { - margin-top: @top-margin-sidebar-content; -} - // Update styling when TOC is enabled .vector-toc-enabled { .mw-sidebar, @@ -72,15 +67,6 @@ body:not( .vector-toc-enabled ) .mw-sidebar { margin-top: @top-margin-sidebar-toc; } } - - /* FIXME: The following selector can be removed when the option to disable `VectorTitleAboveTabs` is removed. */ - @{selector-workspace-container-sidebar-open} { - @media ( max-width: @max-width-tablet ) { - .mw-sidebar { - margin-top: 0; - } - } - } } // FIXME: Merge margin-top styles with above when .vector-toc-enabled is removed (T310527) diff --git a/resources/skins.vector.styles/layouts/screen.less b/resources/skins.vector.styles/layouts/screen.less index a4c9c42a..39e49c8c 100644 --- a/resources/skins.vector.styles/layouts/screen.less +++ b/resources/skins.vector.styles/layouts/screen.less @@ -339,8 +339,6 @@ body { } // Adjusts the content when sidebar is open regardless of the viewport width. -/* FIXME: The following selector can be removed when the option to disable `VectorTitleAboveTabs` is removed. */ -.vector-layout-legacy @{selector-workspace-container-sidebar-open} #mw-navigation .mw-article-toolbar-container, .vector-layout-legacy @{selector-workspace-container-sidebar-open} .mw-content-container { // For container logic specific to special pages and history pages. .skin-vector-disable-max-width & { @@ -350,16 +348,12 @@ body { @media ( max-width: @max-width-margin-start-content ) { // Adjusts the content and mw-article-toolbar-container. - .vector-layout-legacy @{selector-workspace-container-sidebar-open} .mw-content-container, - /* FIXME: The following selector can be removed when the option to disable `VectorTitleAboveTabs` is removed. */ - .vector-layout-legacy @{selector-workspace-container-sidebar-open} #mw-navigation .mw-article-toolbar-container { + .vector-layout-legacy @{selector-workspace-container-sidebar-open} .mw-content-container { margin-left: @margin-start-content; } // Increase margin when TOC is enabled - .vector-toc-enabled .vector-layout-legacy @{selector-workspace-container-sidebar-open} .mw-content-container, - /* FIXME: The following selector can be removed when the option to disable `VectorTitleAboveTabs` is removed. */ - .vector-toc-enabled .vector-layout-legacy @{selector-workspace-container-sidebar-open} #mw-navigation .mw-article-toolbar-container { + .vector-toc-enabled .vector-layout-legacy @{selector-workspace-container-sidebar-open} .mw-content-container { margin-left: @margin-toc-start-content; } @@ -397,11 +391,7 @@ body { // the new TOC. .skin-vector-disable-max-width .vector-toc-enabled .vector-layout-legacy @{selector-workspace-container-sidebar-open} .mw-content-container, body:not( .skin-vector-toc-experiment-control ):not( .skin-vector-toc-experiment-unsampled ) .vector-layout-legacy .vector-toc-visible .mw-workspace-container .mw-content-container, -/* FIXME: The following selector can be removed when the option to disable `VectorTitleAboveTabs` is removed. */ -body:not( .skin-vector-toc-experiment-control ):not( .skin-vector-toc-experiment-unsampled ) .vector-layout-legacy .vector-toc-visible #mw-navigation .mw-article-toolbar-container, -.vector-toc-enabled .vector-layout-legacy @{selector-workspace-container-sidebar-open} .mw-content-container, -/* FIXME: The following selector can be removed when the option to disable `VectorTitleAboveTabs` is removed. */ -.vector-toc-enabled .vector-layout-legacy @{selector-workspace-container-sidebar-open} #mw-navigation .mw-article-toolbar-container { +.vector-toc-enabled .vector-layout-legacy @{selector-workspace-container-sidebar-open} .mw-content-container { @media ( min-width: @min-width-desktop ) { margin-left: @margin-toc-start-content; } @@ -422,9 +412,7 @@ body:not( .skin-vector-toc-experiment-control ):not( .skin-vector-toc-experiment // !important as we always want to disable the margin-left on these elements // Using !important is cleaner than having to rely on specificity involved :checked elements - .mw-content-container, - /* FIXME: The following selector can be removed when the option to disable `VectorTitleAboveTabs` is removed. */ - #mw-navigation .mw-article-toolbar-container { + .mw-content-container { // stylelint-disable-next-line declaration-no-important margin-left: 0 !important; }