mirror of
https://gerrit.wikimedia.org/r/mediawiki/skins/Vector.git
synced 2024-11-14 11:15:33 +00:00
Merge "Move pinnable element spacing from the pinnable element to the container"
This commit is contained in:
commit
f10d65e067
|
@ -10,7 +10,8 @@
|
|||
|
||||
.vector-pinned-container {
|
||||
.mixin-vector-content-box();
|
||||
padding: @padding-vertical-dropdown-menu @padding-horizontal-dropdown-menu;
|
||||
padding: 0 @padding-horizontal-dropdown-menu;
|
||||
margin-bottom: 2rem;
|
||||
display: none;
|
||||
|
||||
// If there is no display grid support we remove pinnable elements
|
||||
|
@ -50,7 +51,7 @@
|
|||
* be empty. We need to set the container to display: none to prevent the psuedo-element
|
||||
* height from affecting the layout
|
||||
*/
|
||||
.vector-sticky-pinned-container {
|
||||
.client-js .vector-sticky-pinned-container {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -143,7 +143,7 @@
|
|||
}
|
||||
|
||||
.vector-sticky-pinned-container {
|
||||
top: @height-header;
|
||||
top: ~'calc( @{height-header} + @{grid-row-gap} )';
|
||||
max-height: ~'calc( 100vh - @{height-header} - (@{grid-row-gap} * 2) )';
|
||||
}
|
||||
|
||||
|
|
|
@ -36,14 +36,11 @@
|
|||
width: @width-column-desktop;
|
||||
}
|
||||
|
||||
// Align the sidebar menus with the bottom-border of the
|
||||
// Align the pinnable header bottom border with the bottom-border of the
|
||||
// toolbar (below the page title) by pushing down the sidebar content
|
||||
// by the hieght of the page title.
|
||||
// NOTE: This alignment happens to work when the title is on a single line
|
||||
// but can be affected by H1 line-height.
|
||||
.vector-column-start,
|
||||
.vector-column-end {
|
||||
margin-top: @font-size-heading-1;
|
||||
margin-top: 2.8rem;
|
||||
border-top: 1px solid transparent;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue