mirror of
https://gerrit.wikimedia.org/r/mediawiki/skins/Vector.git
synced 2024-11-17 20:52:14 +00:00
dc0b679bfa
Pull personal menu items except for user page link into a consolidated dropdown menu based on feature flag using Vector hooks. Add consolidate user links feature flag for logged in/out users. Update styles for personal toolbar. Add logic to template to show legacy toolbar or consolidated toolbar based on feature flag variables. Bug: T276561 Depends-On: If4e143aada711d210ae45d33b97a6be0685b6a41 Change-Id: I1c305d89bece147a6f1b478441119c3169abfbdd
496 lines
15 KiB
Plaintext
496 lines
15 KiB
Plaintext
/**
|
|
* Vector modern layout styles for screen
|
|
*
|
|
* Layout rules divide the page into sections and how VectorComponents should be arranged in the skin.
|
|
* The rules here should only define the layout, not color or typography.
|
|
*/
|
|
|
|
@import '../../common/variables.less';
|
|
@import 'mediawiki.mixins.less';
|
|
|
|
// Header
|
|
|
|
// Header sizes defined in the description of T246170 and comment T246170#5957100
|
|
@width-grid-column-one: 11em;
|
|
@padding-vertical-header: 0.125em;
|
|
@margin-top-header: 0.625em;
|
|
@margin-bottom-header: 0.3125em;
|
|
@height-header:
|
|
@height-logo-icon +
|
|
@margin-top-header +
|
|
@margin-bottom-header +
|
|
2 * @padding-vertical-header;
|
|
// 3.125em + 0.625em + 0.3125em + 0.25em = 4.3125em
|
|
|
|
// Menu button
|
|
@margin-horizontal-sidebar-button-icon: unit( 12px / @font-size-browser, em); // 0.75em @ 16
|
|
|
|
// Logo
|
|
|
|
// Logo sizes per specification in T245190.
|
|
@height-logo-icon: 3.125em;
|
|
|
|
// The logo is variable width but typically consists of:
|
|
// - a icon (50x50)
|
|
// - a wordmark (approx 120px)
|
|
@min-width-logo: unit( 180px / @font-size-browser, em ); // 11.25em @ 16
|
|
|
|
// Search
|
|
|
|
// Canonical version of spec: T270202
|
|
// This assumes the presence of variables inside screen.less. DO NOT import it separately.
|
|
// Assumes various variables defined there.
|
|
@min-width-search: unit( 150px / @font-size-browser / @font-size-base, em ); // 10.71428571em @ 16 & 0.875em
|
|
@min-width-search-tablet: unit( 350px / @font-size-browser / @font-size-base, em ); // 25em @ 16 & 0.875em
|
|
@max-width-search: unit( 500px / @font-size-browser / @font-size-base, em ); // 35.71428571em @ 16 & 0.875em
|
|
@margin-horizontal-search: unit( 40px / @font-size-browser / @font-size-base, em ); // 2.85714286em @ 16 & 0.875em
|
|
|
|
// Personal menu
|
|
|
|
@min-width-personal-tools: unit( 300px / @font-size-browser, em ); // 18.75 @ 16
|
|
|
|
// Sidebar
|
|
|
|
@margin-top-sidebar: 0.5em;
|
|
|
|
// Adjust the left position of the sidebar to align it with the sidebar menu button,
|
|
// in the header, while ensuring the background gradient still extends to the edge of the screen.
|
|
// note: the 1px comes from the transparent border of the sidebar button.
|
|
@padding-left-sidebar:
|
|
@margin-horizontal-sidebar-button-icon +
|
|
unit( @border-width-base / @font-size-browser, em );
|
|
|
|
// Layout containers
|
|
|
|
// Page container
|
|
|
|
@max-width-page-container: unit( 1650px / @font-size-browser, em ); // 103.125em @ 16
|
|
@min-width-page-container--padded: @max-width-page-container + ( 2 * @padding-horizontal-page-container ); // 106.875em
|
|
@padding-horizontal-page-container: unit( 30px / @font-size-browser, em ); // 1.875em @ 16
|
|
|
|
// Content containers
|
|
|
|
@max-width-workspace-container: unit( 1440px / @font-size-browser, em ); // 90em @ 16
|
|
@max-width-content-container: unit( 960px / @font-size-browser, em ); // 60em @ 16
|
|
|
|
// Note this uses variables defined in mediawiki.skin.variables so that VisualEditor can read them
|
|
// see T259331.
|
|
@padding-content: @padding-top-content @padding-horizontal-content 1.5em;
|
|
// We want ~60px of space between the end of the sidebar and the start of the
|
|
// content container for aesthetic reasons. The sidebar is already displaced
|
|
// -30px so we simply add 30px of space to the width of the sidebar.
|
|
@margin-start-content: @width-grid-column-one + unit( 8px / @font-size-browser, em ); // 11.5em @ 16
|
|
|
|
// Tabs
|
|
|
|
@height-tabs: 2.5em; // Keep in sync with .vector-menu-tabs height.
|
|
|
|
// Breakpoints
|
|
|
|
// This determines the maximum width breakpoint at which
|
|
// the content will have a fixed start margin applied to it when the sidebar
|
|
// is open. The content can shift its position when the sidebar is open/closed
|
|
// at or below this breakpoint and will maintain its position above this breakpoint.
|
|
@max-width-margin-start-content:
|
|
(2 * @margin-start-content ) +
|
|
( 2 * @padding-horizontal-page-container ) +
|
|
@max-width-content-container;
|
|
// 23em + 3.75em + 60em = 86.75em @ 16
|
|
|
|
// Defines the minimum viewport width, at which point the layout will not get any
|
|
// smaller and will start horizontal scrolling instead.
|
|
@min-width-supported:
|
|
unit( 500px / @font-size-browser, em ) -
|
|
( 2 * @padding-horizontal-page-container );
|
|
// 31.25em - 3.75em = 27.5em @ 16
|
|
|
|
// Width used to determine when to break the personal tools onto a separate line
|
|
// below the search box.
|
|
@width-comfortable:
|
|
( 2 * @padding-horizontal-page-container ) +
|
|
@size-sidebar-button +
|
|
@margin-horizontal-sidebar-button-icon +
|
|
@min-width-logo +
|
|
( 2 * @margin-horizontal-search ) +
|
|
@max-width-search +
|
|
@min-width-personal-tools;
|
|
// 3.75em + 2.75em + 0.75em + 11.25em + 5.71428571em + 35.71428571em + 18.75em = 78.67857142em @ 16
|
|
|
|
@border-color-sidebar: @background-color-secondary--modern;
|
|
@background-color-secondary--modern: #f8f9fa;
|
|
@background-color-page-container: @background-color-base;
|
|
|
|
body {
|
|
background-color: @background-color-secondary--modern;
|
|
color: @color-base;
|
|
// Vertical scrollbar always visible.
|
|
overflow-y: scroll;
|
|
}
|
|
|
|
.mw-body,
|
|
.parsoid-body {
|
|
direction: ltr;
|
|
padding: @padding-content;
|
|
}
|
|
|
|
.mw-body {
|
|
border-top: @border-width-base @border-style-base @border-color-content;
|
|
/* Merge the border with tabs' one (in their background image) */
|
|
margin-top: -@border-width-base;
|
|
padding: @padding-content;
|
|
|
|
.firstHeading {
|
|
/* Change the default from mediawiki.skinning CSS to let indicators float into heading area */
|
|
overflow: visible;
|
|
}
|
|
}
|
|
|
|
.mw-header {
|
|
// A min-height is set to account for projects where no icon is set.
|
|
min-height: @height-logo-icon;
|
|
margin: @margin-top-header 0 @margin-bottom-header;
|
|
padding: @padding-vertical-header 0;
|
|
// Vertical centering of header elements (IE>=11), requires flex.
|
|
// Non-flex fallback for IE<=9: float rule on the child elements.
|
|
.flex-display();
|
|
flex-wrap: wrap;
|
|
// https://caniuse.com/#search=align-items
|
|
align-items: center;
|
|
// allow z-index to apply so search results overlay article
|
|
position: relative;
|
|
z-index: @z-index-header;
|
|
}
|
|
|
|
/* Searchbox */
|
|
#p-search {
|
|
float: left;
|
|
margin: 0 0 0 @margin-horizontal-search;
|
|
flex-grow: 1;
|
|
z-index: @z-index-menu;
|
|
flex-basis: @min-width-search;
|
|
|
|
// #searchform is only a direct child of #p-search before wvui-loads. After
|
|
// wvui loads, `.wvui-typeahead-search` becomes the direct child and is the
|
|
// element where these styles should apply.
|
|
> #searchform,
|
|
.wvui-typeahead-search {
|
|
// Border-box sizing is used for a smooth transition from legacy to Vue
|
|
// search. The width of the container should stay the same before/after the
|
|
// transition.
|
|
.box-sizing( border-box );
|
|
margin-left: 0;
|
|
max-width: @max-width-search;
|
|
}
|
|
}
|
|
|
|
/* Main column */
|
|
.mw-body,
|
|
#mw-data-after-content,
|
|
#left-navigation,
|
|
.mw-footer {
|
|
margin-left: 0;
|
|
}
|
|
|
|
/* Content */
|
|
.mw-indicators {
|
|
z-index: @z-index-indicators;
|
|
}
|
|
|
|
.mw-body-header {
|
|
.mixin-clearfix();
|
|
|
|
// TODO: Can be changed to `.mw-portlet-lang` when langauge-in-header feature is default.
|
|
#p-lang-btn {
|
|
// should be vertically aligned with heading.
|
|
margin-top: ( ( @font-size-heading-1 * @line-height-heading ) - @height-lang-button ) / 2;
|
|
}
|
|
}
|
|
|
|
// TODO: Can be changed to `.mw-body .mw-portlet-lang` when langauge-in-header feature is default.
|
|
.mw-body #p-lang-btn {
|
|
float: right;
|
|
}
|
|
|
|
.mw-body-content {
|
|
position: relative;
|
|
z-index: @z-index-base;
|
|
}
|
|
|
|
/* Hide, but keep accessible for screen-readers */
|
|
#mw-navigation h2 {
|
|
position: absolute;
|
|
top: -9999px;
|
|
}
|
|
|
|
/* Navigation Containers */
|
|
.mw-article-toolbar-container {
|
|
// Clear the floats on #left-navigation and #right-navigation.
|
|
.mixin-clearfix();
|
|
// We want to keep the max-width of the article-toolbar-container the
|
|
// same max-width as the article page's content container in order to
|
|
// prevent it from moving when going from an article page to a
|
|
// history/special page.
|
|
max-width: @max-width-content-container;
|
|
margin-left: auto;
|
|
margin-right: auto;
|
|
}
|
|
|
|
#left-navigation {
|
|
float: left;
|
|
}
|
|
|
|
#right-navigation {
|
|
float: right;
|
|
|
|
// Any dropdowns inside the right navigation in modern Vector (e.g. "more" menu).
|
|
// should be right-aligned to prevent horizontal scrolling.
|
|
.vector-menu-content {
|
|
left: auto;
|
|
right: -@border-width-base;
|
|
}
|
|
}
|
|
|
|
#p-personal,
|
|
.mw-portlet-notifications {
|
|
li {
|
|
float: left;
|
|
margin-left: 0.75em;
|
|
}
|
|
}
|
|
|
|
.mw-portlet-personal.vector-menu-dropdown {
|
|
h3 {
|
|
margin: 0 0 0 12px;
|
|
padding: 0 12px 0 0;
|
|
}
|
|
|
|
.vector-menu-content {
|
|
border-top-width: 1px;
|
|
}
|
|
}
|
|
|
|
#p-personal {
|
|
flex-grow: 1;
|
|
flex-basis: @min-width-personal-tools;
|
|
margin-left: @margin-horizontal-search;
|
|
// Support IE9: This is reset in @support query below if Flexbox is available.
|
|
float: right;
|
|
}
|
|
|
|
#p-personal.vector-menu-dropdown {
|
|
flex-grow: inherit;
|
|
flex-basis: inherit;
|
|
margin-left: inherit;
|
|
float: inherit;
|
|
|
|
li {
|
|
margin-left: 0;
|
|
}
|
|
}
|
|
|
|
#p-user-page li {
|
|
margin-left: 1em;
|
|
}
|
|
|
|
#mw-sidebar-button {
|
|
float: left; // Browser: IE9 support - button as flex-child fallback.
|
|
margin-left: -@margin-horizontal-sidebar-button-icon;
|
|
margin-right: @margin-horizontal-sidebar-button-icon; // Accidentally the same.
|
|
}
|
|
|
|
#mw-panel {
|
|
background-image: linear-gradient( to bottom, @background-color-base 0%, @background-color-secondary--modern 10%, @background-color-secondary--modern 90%, @background-color-base 100% );
|
|
position: absolute;
|
|
// Sidebar is displaced from the workspace container so that the
|
|
// sidebar is flush with the edge of the screen at small widths.
|
|
left: -@padding-horizontal-page-container;
|
|
width: @width-grid-column-one;
|
|
.box-sizing( border-box );
|
|
// To avoid the white part of the gradient colliding with the sidebar links
|
|
// we apply top and bottom padding.
|
|
padding: 8px 0 40px @padding-left-sidebar;
|
|
z-index: @z-index-sidebar;
|
|
}
|
|
|
|
.parsoid-body {
|
|
padding: @padding-content;
|
|
}
|
|
|
|
#p-namespaces {
|
|
background-image: none;
|
|
padding-left: 0;
|
|
}
|
|
|
|
.mw-footer {
|
|
border-top: @border-base;
|
|
padding: 0.75em;
|
|
}
|
|
|
|
// Container logic.
|
|
.mw-page-container {
|
|
// Set a min-width to make explicit we do not support anything below this threshold.
|
|
// For devices too small, they should be more useable with horizontal scrolling.
|
|
// e.g. Portrait on an iPad
|
|
min-width: @min-width-supported;
|
|
max-width: @max-width-page-container;
|
|
// Fill the viewport even if the content height is small. This also helps
|
|
// mitigate a long sidebar overflowing the page container (T257518).
|
|
min-height: 100%;
|
|
margin-left: auto;
|
|
margin-right: auto;
|
|
// Use non-zero padding to disable margin collapse.
|
|
// Be careful not to use overflow-y: scroll here (see T270146 and T271868)
|
|
padding: 0.05px ( @padding-horizontal-page-container / 2 );
|
|
background-color: @background-color-page-container;
|
|
}
|
|
|
|
.skin--responsive .mw-page-container {
|
|
min-width: auto;
|
|
}
|
|
|
|
// Used as a container for absolutely positioned elements.
|
|
.mw-page-container-inner {
|
|
position: relative;
|
|
}
|
|
|
|
.mw-workspace-container {
|
|
max-width: @max-width-workspace-container;
|
|
margin-left: auto;
|
|
margin-right: auto;
|
|
// The sidebar is absolutely positioned relative to the
|
|
// mw-workspace-container.
|
|
position: relative;
|
|
|
|
&.mw-footer-container {
|
|
// T264679: There are elements (e.g. discussion tool popovers) in the main
|
|
// content container that we want to appear on top of the footer. We set the
|
|
// footer container to have static positioning instead of relative
|
|
// positioning (applied by .mw-workspace-container) to enable this.
|
|
position: static;
|
|
}
|
|
}
|
|
|
|
.mw-content-container {
|
|
max-width: @max-width-content-container;
|
|
margin-left: auto;
|
|
margin-right: auto;
|
|
|
|
// For container logic specific to special pages and history pages.
|
|
.skin-vector-disable-max-width & {
|
|
// Allow the max-width of content on history/special pages to be wider than
|
|
// the max-width of content on article pages.
|
|
max-width: none;
|
|
}
|
|
}
|
|
|
|
.mw-sidebar-container {
|
|
position: absolute;
|
|
top: 0;
|
|
left: 0;
|
|
right: 0;
|
|
}
|
|
|
|
.mw-footer-container {
|
|
padding-top: 50px;
|
|
padding-bottom: 82px;
|
|
}
|
|
|
|
// We want it to appear like the sidebar is going into/coming out of
|
|
// `.mw-page-container`, but we can't use `overflow: hidden` on
|
|
// `.mw-page-container` because that will cut off the sidebar. Therefore, we
|
|
// calculate the maximum distance from the start of `mw-page-container` to the
|
|
// start of the sidebar.
|
|
#mw-sidebar-checkbox:not( :checked ) ~ .mw-workspace-container .mw-sidebar {
|
|
.transform( translateX( -( @max-width-page-container - @max-width-workspace-container ) / 2 ) );
|
|
}
|
|
|
|
// Responsive overrides.
|
|
@media ( min-width: @min-width-page-container--padded ) {
|
|
.mw-page-container {
|
|
border-left: 1px solid @border-color-sidebar;
|
|
border-right: 1px solid @border-color-sidebar;
|
|
}
|
|
}
|
|
|
|
// Adjusts the content when sidebar is open regardless of the viewport width.
|
|
.mw-checkbox-hack-checkbox:checked ~ .mw-workspace-container .mw-content-container {
|
|
// For container logic specific to special pages and history pages.
|
|
.skin-vector-disable-max-width & {
|
|
margin-left: @margin-start-content;
|
|
}
|
|
}
|
|
|
|
@media ( max-width: @max-width-margin-start-content ) {
|
|
#p-search {
|
|
// Support: IE 8, Firefox 18-, Chrome 19-, Safari 5.1-, Opera 19-, Android 4.4.4-.
|
|
width: 13.2em;
|
|
// Support: Modern browsers, responsive width.
|
|
width: 20vw;
|
|
max-width: 100%;
|
|
}
|
|
|
|
// Adjusts the content and mw-article-toolbar-container.
|
|
.mw-checkbox-hack-checkbox:checked ~ .mw-workspace-container .mw-content-container,
|
|
.mw-checkbox-hack-checkbox:checked ~ .mw-workspace-container .mw-article-toolbar-container {
|
|
margin-left: @margin-start-content;
|
|
}
|
|
|
|
// Specificity needed to disable the default animations at lower resolutions.
|
|
.vector-animations-ready .mw-sidebar {
|
|
// Remove sidebar transition at smaller widths.
|
|
.transition( none );
|
|
}
|
|
}
|
|
|
|
@media ( min-width: ( @max-width-workspace-container + ( 2 * @padding-horizontal-page-container ) ) ) {
|
|
#mw-panel {
|
|
background: @background-color-page-container;
|
|
border-right: 1px solid @border-color-sidebar;
|
|
}
|
|
}
|
|
|
|
// At low resolutions the search must be pushed to the right of the screen
|
|
// We use @width-comfortable to determine this threshold as we know it's not possible for
|
|
// personal tools to be on the same line at this resolution.
|
|
@media ( max-width: @width-comfortable ) {
|
|
// #searchform is only a direct child of #p-search before wvui-loads. After
|
|
// wvui loads, `.wvui-typeahead-search` becomes the direct child and is the
|
|
// element where these styles should apply.
|
|
#p-search > #searchform,
|
|
#p-search .wvui-typeahead-search {
|
|
margin-left: auto;
|
|
}
|
|
}
|
|
|
|
@media ( min-width: @width-breakpoint-tablet ) {
|
|
#p-search {
|
|
min-width: @min-width-search-tablet;
|
|
}
|
|
|
|
.mw-page-container {
|
|
padding-left: @padding-horizontal-page-container;
|
|
padding-right: @padding-horizontal-page-container;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Makes the sidebar full screen at lower resolutions.
|
|
*/
|
|
@media ( max-width: @width-breakpoint-tablet ) {
|
|
.mw-checkbox-hack-checkbox:checked ~ .mw-workspace-container {
|
|
#mw-panel {
|
|
width: 100%;
|
|
position: relative;
|
|
left: 0;
|
|
}
|
|
|
|
// !important as we always want to disable the margin-left on these elements
|
|
// Using !important is cleaner than having to rely on specificity involved :checked elements
|
|
.mw-content-container,
|
|
.mw-article-toolbar-container {
|
|
// stylelint-disable-next-line declaration-no-important
|
|
margin-left: 0 !important;
|
|
}
|
|
}
|
|
}
|