Merge "Remove margin from tagline and add .page-heading element"

This commit is contained in:
jenkins-bot 2019-02-20 00:19:13 +00:00 committed by Gerrit Code Review
commit f6acb0deb7
4 changed files with 10 additions and 9 deletions

View File

@ -29,8 +29,10 @@
{{#hasheadingholder}} {{#hasheadingholder}}
{{{prebodyhtml}}} {{{prebodyhtml}}}
<div class="pre-content heading-holder"> <div class="pre-content heading-holder">
{{{headinghtml}}} <div class="page-heading">
{{{taglinehtml}}} {{{headinghtml}}}
{{{taglinehtml}}}
</div>
{{#tabs}} {{#tabs}}
{{#items}} {{#items}}
<a href="{{href}}" rel="{{rel}}" class="minerva__tab {{class}}">{{text}}</a> <a href="{{href}}" rel="{{rel}}" class="minerva__tab {{class}}">{{text}}</a>

View File

@ -1,6 +1,6 @@
.minerva__tab { .minerva__tab {
font-size: @taglineFontSize; font-size: @taglineFontSize;
margin: 18px 10px 1px 0; margin: 0 10px 1px 0;
color: @colorGray5; color: @colorGray5;
font-weight: bold; font-weight: bold;
padding-bottom: 6px; padding-bottom: 6px;

View File

@ -8,14 +8,11 @@
.tagline { .tagline {
color: @colorGray5; color: @colorGray5;
font-size: @taglineFontSize; font-size: @taglineFontSize;
margin: 2px 0 12px;
} }
} }
#section_0 { .page-heading {
padding-top: 0; margin-bottom: 12px;
padding-bottom: 0;
border-bottom: 0;
} }
#page-actions { #page-actions {

View File

@ -24,8 +24,10 @@
} }
.heading-holder { .heading-holder {
padding-bottom: 15px;
padding-top: 26px; padding-top: 26px;
// prevents margin collapsing. i.e. makes .heading-holder height match
// the bottom margin on .page-header, a child element.
overflow: auto;
} }
h1, h1,