wikimedia/mediawiki-skins-Vector
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/Vector.git synced 2024-09-23 10:21:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove -pinnable-element postfix from PinnableElement.mustache

Browse source 
This allows '.vector-main-menu' to correspond to MainMenu.mustache, and 'vector-page-tools' with PageTools.mustache

Bug: T317900
Change-Id: I65c0d7cffbdf1cf9e59cde0c0fc4dca788e799de
This commit is contained in:
bwang 2022-12-14 14:49:33 -06:00 committed by Jdlrobson
parent 3ad3d70745
commit 9abdaf54c3
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/Components/VectorComponentPinnableHeader.php
View file

@ -71,7 +71,7 @@ class VectorComponentPinnableHeader implements VectorComponent {
if ( $this->moveElement ) {
// Assumes consistent naming standard for pinnable elements and their containers
$data = array_merge( $data, [
'data-pinnable-element-id' => $this->name . '-pinnable-element',
'data-pinnable-element-id' => $this->name,
'data-unpinned-container-id' => $this->name . '-unpinned-container',
'data-pinned-container-id' => $this->name . '-pinned-container',
] );

2
includes/templates/PinnableElement/Open.mustache
View file

@ -1,2 +1,2 @@
<div id="{{id}}-pinnable-element" class="{{id}}-pinnable-element vector-pinnable-element">
<div id="{{id}}" class="{{id}} vector-pinnable-element">
{{#data-pinnable-header}}{{>PinnableHeader}}{{/data-pinnable-header}}

4
resources/skins.vector.styles/components/PageTools.less
View file

@ -6,7 +6,7 @@
}
}
.vector-page-tools-pinnable-element {
.vector-page-tools {
.vector-menu-heading {
.mixin-vector-dropdown-menu-item();
.mixin-vector-menu-heading();
@ -43,7 +43,7 @@
// FIXME: Remove the following selector when page tools feature is on by default, needed for LegacyMoreDropdown
.vector-feature-page-tools-disabled .vector-page-tools-landmark,
.vector-page-tools-pinnable-element {
.vector-page-tools {
// Ensure collapsible items are visible on lower resolutions
.vector-more-collapsible-item {
display: block;

2
tests/phpunit/unit/components/VectorComponentPageToolsTest.php
View file

@ -89,7 +89,7 @@ class VectorComponentPageToolsTest extends \MediaWikiUnitTestCase {
'unpin-label' => 'vector-unpin-element-label',
'data-name' => 'vector-page-tools',
'data-feature-name' => 'page-tools-pinned',
'data-pinnable-element-id' => 'vector-page-tools-pinnable-element',
'data-pinnable-element-id' => 'vector-page-tools',
'data-unpinned-container-id' => 'vector-page-tools-unpinned-container',
'data-pinned-container-id' => 'vector-page-tools-pinned-container',
],