2020-04-28 01:44:16 +00:00
|
|
|
// 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 '../../variables.less';
|
|
|
|
|
@import 'mediawiki.mixins.less';
|
|
|
|
|
|
|
|
|
|
// Modern layout variables
|
2020-06-11 21:02:04 +00:00
|
|
|
@height-tabs: 2.5em; // Keep in sync with .vector-menu-tabs height.
|
[modern] A new version of Vector with a new logo
Changes to support feature:
* ResourceLoaderSkinModule logo features are dropped
* New layout provided given the fork in layout between legacy and new.
* Legacy sidebar styles now pulled out
* breakpoint styles are not carried over from legacy Vector
The new Vector layout for now has one breakpoint.
Changes to storybook:
* The storybook script now pulls down image assets so that the logos can
be shown in storybook. The script is adjusted to make use of a static folder to
serve these images.
Note:
* The legacy mode is not touched as part of this patchset.
* The personal menu is unaffected by this patch and is out of scope.
* The alignment issue is noted, but will be solved at a later date.
* Changes to portal are out of scope.
* Adding storybook for modern descoped, given its not possible to load
both legacy layout and modern layout inside a storybook at current time.
Sample config:
$wgLogos = [
'icon' => 'https://di-logo-sandbox.firebaseapp.com/img/globe.png',
'tagline' => [
'src' => 'https://di-logo-sandbox.firebaseapp.com/img/tagline/en-tagline-117-13.svg',
'width' => 117,
'height' => 13,
],
'1x' => 'https://en.wikipedia.org/static/images/project-logos/enwiki.png',
'wordmark' => [
'src' => 'https://en.wikipedia.org/static/images/mobile/copyright/wikipedia-wordmark-en.svg',
'width' => 116,
'height' => 18,
],
];
Coauthor: Aron Manning
Bug: T246170
Change-Id: Ibc4b055150761388a6b78f9127da342c451ce0e7
2020-03-09 05:51:00 +00:00
|
|
|
@margin-top-sidebar: 0.5em;
|
2020-04-28 01:44:16 +00:00
|
|
|
|
2020-10-30 16:57:38 +00:00
|
|
|
@margin-horizontal-sidebar-button-icon: unit( 12 / @font-size-browser, em);
|
|
|
|
|
// 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 );
|
|
|
|
|
@border-color-sidebar: @background-color-secondary--modern;
|
|
|
|
|
|
2020-04-28 01:44:16 +00:00
|
|
|
// Header sizes defined in the description of T246170 and comment T246170#5957100
|
[modern] A new version of Vector with a new logo
Changes to support feature:
* ResourceLoaderSkinModule logo features are dropped
* New layout provided given the fork in layout between legacy and new.
* Legacy sidebar styles now pulled out
* breakpoint styles are not carried over from legacy Vector
The new Vector layout for now has one breakpoint.
Changes to storybook:
* The storybook script now pulls down image assets so that the logos can
be shown in storybook. The script is adjusted to make use of a static folder to
serve these images.
Note:
* The legacy mode is not touched as part of this patchset.
* The personal menu is unaffected by this patch and is out of scope.
* The alignment issue is noted, but will be solved at a later date.
* Changes to portal are out of scope.
* Adding storybook for modern descoped, given its not possible to load
both legacy layout and modern layout inside a storybook at current time.
Sample config:
$wgLogos = [
'icon' => 'https://di-logo-sandbox.firebaseapp.com/img/globe.png',
'tagline' => [
'src' => 'https://di-logo-sandbox.firebaseapp.com/img/tagline/en-tagline-117-13.svg',
'width' => 117,
'height' => 13,
],
'1x' => 'https://en.wikipedia.org/static/images/project-logos/enwiki.png',
'wordmark' => [
'src' => 'https://en.wikipedia.org/static/images/mobile/copyright/wikipedia-wordmark-en.svg',
'width' => 116,
'height' => 18,
],
];
Coauthor: Aron Manning
Bug: T246170
Change-Id: Ibc4b055150761388a6b78f9127da342c451ce0e7
2020-03-09 05:51:00 +00:00
|
|
|
@padding-vertical-header: 0.125em;
|
|
|
|
|
@margin-top-header: 0.625em;
|
|
|
|
|
@margin-bottom-header: 0.3125em;
|
|
|
|
|
@height-logo-icon: 3.125em; // Logo sizes per specification in T245190.
|
|
|
|
|
@height-header: @height-logo-icon +
|
|
|
|
|
@margin-top-header + @margin-bottom-header +
|
|
|
|
|
2 * @padding-vertical-header;
|
2020-04-28 01:44:16 +00:00
|
|
|
@width-grid-column-one: 11em;
|
2020-08-26 21:31:08 +00:00
|
|
|
@padding-horizontal-page-container: 30px;
|
2020-10-02 17:43:21 +00:00
|
|
|
// This assumes the presence of variables inside layout.less. DO NOT import it separately.
|
|
|
|
|
// Assumes various variables defined there.
|
|
|
|
|
|
2020-12-18 19:42:04 +00:00
|
|
|
// canonical version of spec: T270202
|
|
|
|
|
@min-width-search: unit( 150px / @font-size-browser / @font-size-base, em );
|
|
|
|
|
@min-width-search-tablet: unit( 350px / @font-size-browser / @font-size-base, em );
|
|
|
|
|
@max-width-search: unit( 500px / @font-size-browser / @font-size-base, em );
|
|
|
|
|
@margin-horizontal-search: unit( 40px / @font-size-browser / @font-size-base, em );
|
2020-10-02 17:43:21 +00:00
|
|
|
|
|
|
|
|
// 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 );
|
|
|
|
|
|
|
|
|
|
@min-width-personal-tools: unit( 300px / @font-size-browser, em );
|
|
|
|
|
|
|
|
|
|
@padding-horizontal-page-container: 30px;
|
|
|
|
|
@padding-horizontal-page-container-ems: unit( @padding-horizontal-page-container / @font-size-browser, em );
|
|
|
|
|
@margin-horizontal-sidebar-button-icon-ems: unit( @margin-horizontal-sidebar-button-icon / @font-size-browser, em );
|
|
|
|
|
@padding-horizontal-page-container-ems: unit( @padding-horizontal-page-container / @font-size-browser, em );
|
|
|
|
|
|
|
|
|
|
// the width of the container if you exclude consideration for search
|
|
|
|
|
@min-width-container-base: @padding-horizontal-page-container-ems + @size-sidebar-button + @margin-horizontal-sidebar-button-icon-ems + @min-width-logo + @padding-horizontal-page-container-ems;
|
|
|
|
|
|
2020-10-01 22:55:52 +00:00
|
|
|
@min-width-supported: 500px - ( 2 * @padding-horizontal-page-container );
|
2020-10-02 17:43:21 +00:00
|
|
|
@width-comfortable: @min-width-container-base + @margin-horizontal-search + @max-width-search + @margin-horizontal-search + @min-width-personal-tools;
|
|
|
|
|
|
2020-10-30 16:57:38 +00:00
|
|
|
@background-color-secondary--modern: #f8f9fa;
|
|
|
|
|
@max-width-page-container: 1650px;
|
|
|
|
|
@min-width-page-container--padded: @max-width-page-container + ( 2 * @padding-horizontal-page-container );
|
|
|
|
|
@background-color-page-container: @background-color-base;
|
|
|
|
|
@max-width-workspace-container: 1440px;
|
|
|
|
|
@max-width-content-container: 960px;
|
|
|
|
|
// 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 );
|
|
|
|
|
// Page container's total horizontal padding in em units.
|
|
|
|
|
@padding-horizontal-page-container-total: 2 * unit( @padding-horizontal-page-container / @font-size-browser, em );
|
|
|
|
|
// Equivalent to 1432px. 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 ) + @padding-horizontal-page-container-total + ( unit( @max-width-content-container / @font-size-browser, em ) );
|
2020-04-28 01:44:16 +00:00
|
|
|
|
2020-08-10 21:40:06 +00:00
|
|
|
// Default layout.
|
|
|
|
|
@import 'layout-default.less';
|
[modern] A new version of Vector with a new logo
Changes to support feature:
* ResourceLoaderSkinModule logo features are dropped
* New layout provided given the fork in layout between legacy and new.
* Legacy sidebar styles now pulled out
* breakpoint styles are not carried over from legacy Vector
The new Vector layout for now has one breakpoint.
Changes to storybook:
* The storybook script now pulls down image assets so that the logos can
be shown in storybook. The script is adjusted to make use of a static folder to
serve these images.
Note:
* The legacy mode is not touched as part of this patchset.
* The personal menu is unaffected by this patch and is out of scope.
* The alignment issue is noted, but will be solved at a later date.
* Changes to portal are out of scope.
* Adding storybook for modern descoped, given its not possible to load
both legacy layout and modern layout inside a storybook at current time.
Sample config:
$wgLogos = [
'icon' => 'https://di-logo-sandbox.firebaseapp.com/img/globe.png',
'tagline' => [
'src' => 'https://di-logo-sandbox.firebaseapp.com/img/tagline/en-tagline-117-13.svg',
'width' => 117,
'height' => 13,
],
'1x' => 'https://en.wikipedia.org/static/images/project-logos/enwiki.png',
'wordmark' => [
'src' => 'https://en.wikipedia.org/static/images/mobile/copyright/wikipedia-wordmark-en.svg',
'width' => 116,
'height' => 18,
],
];
Coauthor: Aron Manning
Bug: T246170
Change-Id: Ibc4b055150761388a6b78f9127da342c451ce0e7
2020-03-09 05:51:00 +00:00
|
|
|
|
2020-08-10 21:40:06 +00:00
|
|
|
//
|
2020-10-30 16:57:38 +00:00
|
|
|
// Feature flag modifications to layout in new files (these should be additive)
|
2020-08-10 21:40:06 +00:00
|
|
|
//
|