golem
/
MinervaNeue
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "page actions is no longer position absolute"

This commit is contained in:
jenkins-bot 2019-02-08 19:22:42 +00:00 committed by Gerrit Code Review
parent 4bf79bd6df 95b139d756
commit cbd624d6ab
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/skins/minerva.mustache
View File

@ -28,12 +28,12 @@
<main id="content" class="mw-body"> <main id="content" class="mw-body">
{{#hasheadingholder}} {{#hasheadingholder}}
{{{prebodyhtml}}} {{{prebodyhtml}}}
<div class="pre-content heading-holder {{^haspageactions}}heading-holder--no-page-actions{{/haspageactions}}"> <div class="pre-content heading-holder heading-holder--new">
{{{pageactionshtml}}}
{{{headinghtml}}} {{{headinghtml}}}
{{{taglinehtml}}} {{{taglinehtml}}}
{{{postheadinghtml}}} {{{postheadinghtml}}}
{{{subtitle}}} {{{subtitle}}}
{{{pageactionshtml}}}
{{{internalBanner}}} {{{internalBanner}}}
</div> </div>
{{/hasheadingholder}} {{/hasheadingholder}}

25
resources/skins.minerva.base.styles/pageactions.less
View File

@ -4,17 +4,30 @@
.heading-holder { .heading-holder {
@pageActionsGutter: 0.5em; @pageActionsGutter: 0.5em;
@pageActionsHeight: @pageActionFontSize + (2 * @iconGutterWidth); @pageActionsHeight: @pageActionFontSize + (2 * @iconGutterWidth);
// FIXME: padding-bottom can be removed when work on T212216
// has been deployed and varnish cache cleared.
padding: @titleSectionSpacingTop 0 (@pageActionsHeight + @pageActionsGutter); padding: @titleSectionSpacingTop 0 (@pageActionsHeight + @pageActionsGutter);
position: relative; position: relative;
// FIXME: Can be made default when work on T212216
// has been deployed and varnish cache cleared.
&--new {
padding-bottom: 0;
}
// FIXME: Can be removed when work on T212216
// has been deployed and varnish cache cleared.
&--no-page-actions { &--no-page-actions {
padding-bottom: @pageActionsGutter; padding-bottom: @pageActionsGutter;
&--new {
padding-bottom: 0;
}
} }
.tagline { .tagline {
color: @colorGray5; color: @colorGray5;
font-size: 0.85em; font-size: 0.85em;
margin: 2px 0 0; margin: 2px 0 12px;
} }
} }
@ -29,9 +42,8 @@
float: none; float: none;
border: 0; border: 0;
overflow: hidden; overflow: hidden;
position: absolute;
bottom: 0;
width: 100%; width: 100%;
margin-top: -2px;
border-top: 1px solid @colorGray14; border-top: 1px solid @colorGray14;
border-bottom: 1px solid @colorGray12; border-bottom: 1px solid @colorGray12;
padding: 0.5em 0; padding: 0.5em 0;
@ -78,6 +90,13 @@
} }
} }
// FIXME: cached HTML. Can be removed when work on T212216
// has been deployed and varnish cache cleared.
.heading-holder #page-actions:first-child {
position: absolute;
bottom: 0;
}
// Watchstar is hidden for anonymous no-js users // Watchstar is hidden for anonymous no-js users
// While we could link the icon to the login/signup form, this is not // While we could link the icon to the login/signup form, this is not
// a perfect experience and could be confusing. // a perfect experience and could be confusing.