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

Merge "Grid: Add table of contents to grid"

This commit is contained in:
jenkins-bot 2022-06-29 15:16:42 +00:00 committed by Gerrit Code Review
parent 17cf0d78df 11618b5d81
commit 80bcd7fef3
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
includes/templates/skin.mustache
View File

@ -44,18 +44,22 @@
{{>Header}}
<div class="mw-workspace-container vector-sidebar-container {{^data-toc}}vector-sidebar-container-no-toc{{/data-toc}}">
{{#data-toc}}
{{#data-toc}}{{^is-vector-grid}}
<input type="checkbox" id="vector-toc-collapsed-checkbox" class="mw-checkbox-hack-checkbox">
{{/data-toc}}
{{/is-vector-grid}}{{/data-toc}}
<div id="mw-navigation">
{{^is-title-above-tabs}}
{{>ArticleToolbar}}
{{/is-title-above-tabs}}
{{#data-portlets-sidebar}}{{>Sidebar}}{{/data-portlets-sidebar}}
</div>
{{^is-vector-grid}}
{{>TableOfContentsContainer}}
{{#is-vector-grid}}</div>{{/is-vector-grid}} <!-- close .vector-sidebar-container -->
{{/is-vector-grid}}
{{#is-vector-grid}}</div>
<input type="checkbox" id="vector-toc-collapsed-checkbox" class="mw-checkbox-hack-checkbox">
{{>TableOfContentsContainer}}
{{/is-vector-grid}} <!-- close .vector-sidebar-container -->
<div class="mw-content-container">
{{! `role` is unnecessary but kept to support selectors in any gadgets or user styles. }}
<main id="content" class="mw-body" role="main">

7
resources/skins.vector.styles/layouts/grid.less
View File

@ -32,9 +32,10 @@
.mw-page-container-inner {
display: grid;
width: 100%;
grid-template: ~'66px auto 1fr / 232px 20px minmax(0, 1fr)';
grid-template: ~'66px min-content 1fr 1fr / 232px 20px minmax(0, 1fr)';
grid-template-areas: 'header header header'
'sidebar gutter content'
'toc gutter content'
'footer footer footer';
row-gap: 24px;
}
@ -43,6 +44,10 @@
padding-left: 0;
}
.mw-table-of-contents-container {
grid-area: toc;
}
.mw-header {
grid-area: header;
}