Merge "Remove margin from tagline and add .page-heading element"
This commit is contained in:
commit
f6acb0deb7
|
@ -29,8 +29,10 @@
|
|||
{{#hasheadingholder}}
|
||||
{{{prebodyhtml}}}
|
||||
<div class="pre-content heading-holder">
|
||||
<div class="page-heading">
|
||||
{{{headinghtml}}}
|
||||
{{{taglinehtml}}}
|
||||
</div>
|
||||
{{#tabs}}
|
||||
{{#items}}
|
||||
<a href="{{href}}" rel="{{rel}}" class="minerva__tab {{class}}">{{text}}</a>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
.minerva__tab {
|
||||
font-size: @taglineFontSize;
|
||||
margin: 18px 10px 1px 0;
|
||||
margin: 0 10px 1px 0;
|
||||
color: @colorGray5;
|
||||
font-weight: bold;
|
||||
padding-bottom: 6px;
|
||||
|
|
|
@ -8,14 +8,11 @@
|
|||
.tagline {
|
||||
color: @colorGray5;
|
||||
font-size: @taglineFontSize;
|
||||
margin: 2px 0 12px;
|
||||
}
|
||||
}
|
||||
|
||||
#section_0 {
|
||||
padding-top: 0;
|
||||
padding-bottom: 0;
|
||||
border-bottom: 0;
|
||||
.page-heading {
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
#page-actions {
|
||||
|
|
|
@ -24,8 +24,10 @@
|
|||
}
|
||||
|
||||
.heading-holder {
|
||||
padding-bottom: 15px;
|
||||
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,
|
||||
|
|
Loading…
Reference in New Issue