MDL-45896 navigation: CSS for the context header.

Part of MDL-45774
This commit is contained in:
Jetha Chan 2015-02-26 10:13:27 +08:00 committed by Adrian Greeve
parent 261bdb24d9
commit ccb76d43c2
3 changed files with 67 additions and 22 deletions

View file

@ -4057,7 +4057,7 @@ EOD;
// Headings. // Headings.
$headings = $this->heading($this->page->heading, 1); $headings = $this->heading($this->page->heading, 1);
if (isset($contextheader->subheading)) { if (isset($contextheader->subheading)) {
$headings .= $contextheader->subheading; $headings .= html_writer::span($contextheader->subheading, 'fuckensubheading');
} }
$html .= html_writer::tag('div', $headings, array('class' => 'page-header-headings')); $html .= html_writer::tag('div', $headings, array('class' => 'page-header-headings'));

View file

@ -2093,32 +2093,77 @@ img#persona_signin {
.header-mc-heady-head { .header-mc-heady-head {
// We need to be explicit about the height of the header. // We need to be explicit about the height of the header.
@pageHeaderHeight: 140px; @pageHeaderHeight: 140px;
// margin: 0;
// Change height of the user header to allow for an image. // Do not remove these rule.
&.header-bar-user { overflow: hidden;
// Set up for vertical alignment.
height: @pageHeaderHeight; .page-header-image,
// line-height: @pageHeaderHeight; .page-header-headings {
display: block;
position: relative;
}
.page-header-image {
margin: 1em;
}
.page-header-headings {
margin: 1em 0;
h1 {
display: block;
}
.fuckensubheading {
display: block;
}
}
.page-header-headings .fuckensubheading,
.header-button-group {
position: relative;
line-height: 24px;
vertical-align: middle;
}
.header-button-group {
display: block;
a {
position: relative;
// Don't touch it unless you know exactly what the fuck.
top: -0.4em;
}
} }
} }
.page-header-headings { .dir-ltr .header-mc-heady-head {
position: relative; .page-header-image {
top: -90px; //.page-header-headings {
left: 110px; float: left;
}
.header-button-group{
float: right;
}
.fuckensubheading {
float: left;
}
} }
.dir-rtl .page-header-headings { .dir-rtl .header-mc-heady-head {
position: relative; .page-header-image {
top: -90px; //.page-header-headings {
right: 110px; float: right;
} }
.btn-group { .header-button-group{
&.header-button-group{ float: left;
position: relative; right: -15px;
top: -121px; }
right: 105px;
.fuckensubheading {
float: right; float: right;
} }
} }

File diff suppressed because one or more lines are too long