golem
/
VectorGOLEM
9
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Refactor: Create UserLinks component 

Have a single template for the UserLinks component, with a single
element wrapping all its subcomponents as discussed.

Change-Id: I35936a6fa1ba335639ca3f47fd439a3662268fca
This commit is contained in:
jdlrobson 2021-05-24 15:02:26 -07:00 committed by Jdlrobson
parent 3306124038
commit 96bf1e8276
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
includes/templates/Header.mustache
View File

@ -11,20 +11,12 @@
</label> </label>
{{>Logo}} {{>Logo}}
{{#data-search-box}}{{>SearchBox}}{{/data-search-box}} {{#data-search-box}}{{>SearchBox}}{{/data-search-box}}
{{#data-portlets}}
{{^is-consolidated-user-links}} {{^is-consolidated-user-links}}
{{#data-portlets}} {{#data-personal}}{{>Menu}}{{/data-personal}}
{{#data-personal}}{{>Menu}}{{/data-personal}}
{{/data-portlets}}
{{/is-consolidated-user-links}} {{/is-consolidated-user-links}}
{{#is-consolidated-user-links}} {{#is-consolidated-user-links}}
{{#data-portlets}} {{>UserLinks}}
{{#data-notifications}}{{>Menu}}{{/data-notifications}}
{{/data-portlets}}
{{#data-portlets}}
{{#data-user-page}}{{>Menu}}{{/data-user-page}}
{{/data-portlets}}
{{#data-portlets}}
{{#data-user-menu}}{{>Menu}}{{/data-user-menu}}
{{/data-portlets}}
{{/is-consolidated-user-links}} {{/is-consolidated-user-links}}
{{/data-portlets}}
</header> </header>

5
includes/templates/UserLinks.mustache Normal file
View File

@ -0,0 +1,5 @@
<div class="vector-user-links">
{{#data-notifications}}{{>Menu}}{{/data-notifications}}
{{#data-user-page}}{{>Menu}}{{/data-user-page}}
{{#data-user-menu}}{{>Menu}}{{/data-user-menu}}
</div>

5
resources/skins.vector.styles/components/UserLinks.less Normal file
View File

@ -0,0 +1,5 @@
// This import can be removed when $wgVectorConsolidateUserLinks feature flag is removed.
.vector-user-links {
display: flex;
}

1
resources/skins.vector.styles/skin.less
View File

@ -18,6 +18,7 @@
// This import can be removed when $wgVectorConsolidateUserLinks feature flag is removed. // This import can be removed when $wgVectorConsolidateUserLinks feature flag is removed.
@import '../skins.vector.styles.legacy/components/UserMenu.less'; @import '../skins.vector.styles.legacy/components/UserMenu.less';
@import './components/UserMenu.less'; @import './components/UserMenu.less';
@import './components/UserLinks.less';
} }
@media all { @media all {