jonny
/
Vector-Local
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix border when title is hidden and when toolbar is empty"

This commit is contained in:
jenkins-bot 2022-09-19 22:20:31 +00:00 committed by Gerrit Code Review
parent 8f097163c2 c4ec68b13c
commit e9b79ee39f
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/templates/ArticleToolbar.mustache
View File

@ -6,7 +6,7 @@
{{#data-associated-pages}}{{>Menu}}{{/data-associated-pages}} {{#data-associated-pages}}{{>Menu}}{{/data-associated-pages}}
{{#data-variants}}{{>Menu}}{{/data-variants}} {{#data-variants}}{{>Menu}}{{/data-variants}}
</div> </div>
<div id="right-navigation" class="vector-collapsible {{#data-views.is-empty}}{{#data-actions.is-empty}}right-navigation-empty{{/data-actions.is-empty}}{{/data-views.is-empty}}"> <div id="right-navigation" class="vector-collapsible">
{{#data-views}}{{>Menu}}{{/data-views}} {{#data-views}}{{>Menu}}{{/data-views}}
{{#data-actions}}{{>Menu}}{{/data-actions}} {{#data-actions}}{{>Menu}}{{/data-actions}}
</div> </div>

2
includes/templates/ContentHeader.mustache
View File

@ -2,7 +2,7 @@
Content Header - Main <H1> title for all pages, with either the indicators or language selector. Content Header - Main <H1> title for all pages, with either the indicators or language selector.
When language button is visible, indicators are placed in the ContentSubheader.mustache template instead. When language button is visible, indicators are placed in the ContentSubheader.mustache template instead.
}} }}
<header class="mw-body-header vector-page-titlebar"> <header class="mw-body-header vector-page-titlebar{{#is-title-blank}} vector-page-titlebar-blank{{/is-title-blank}}">
{{#data-toc}} {{#data-toc}}
<label <label
id="vector-toc-collapsed-button" id="vector-toc-collapsed-button"

3
resources/skins.vector.styles/components/ArticleToolbar.less
View File

@ -5,7 +5,8 @@
.mw-article-toolbar-container { .mw-article-toolbar-container {
// clearfix for #left-navigation and #right-navigation // clearfix for #left-navigation and #right-navigation
display: flow-root; display: flow-root;
border-bottom: @border-bottom-tabs; // Use box-shadow instead of border to allow border collapsing between titlebar and toolbar
box-shadow: 0 1px @border-color-base;
/* Targets #left-navigation and #right-navigation */ /* Targets #left-navigation and #right-navigation */
& > div { & > div {

9
resources/skins.vector.styles/components/ContentHeader.less
View File

@ -1,6 +1,13 @@
.vector-page-titlebar { .vector-page-titlebar {
display: flex; display: flex;
border-bottom: 1px solid @border-color-base; // Ensure language button or indicators are positioned to the right even when the title is hidden
justify-content: flex-end;
// Use box-shadow instead of border to allow border collapsing between titlebar and toolbar
box-shadow: 0 1px @border-color-base;
&-blank {
box-shadow: none;
}
.firstHeading { .firstHeading {
flex-grow: 1; flex-grow: 1;