mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

MDL-56587 theme_boost: Align header items

Browse Source 
Remove chunks of conflicting CSS added in various places and add navbar-nav -> nav-link to header items.
This commit is contained in:
Damyon Wiese 2016-10-31 10:34:12 +08:00 committed by Cameron Ball
parent a1f6a27c80
commit 757f42cb15
No known key found for this signature in database
GPG Key ID: 305B7F70214D810C
6 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/outputrenderers.php
View File

@ -3195,7 +3195,7 @@ EOD;
array('for' => 'id_q_' . $id, 'class' => 'accesshide')) . html_writer::tag('input', '', $inputattrs);
$searchinput = html_writer::tag('form', $contents, $formattrs);
return html_writer::tag('div', $searchicon . $searchinput, array('class' => 'search-input-wrapper', 'id' => $id));
return html_writer::tag('div', $searchicon . $searchinput, array('class' => 'search-input-wrapper nav-link', 'id' => $id));
}
/**

2
lib/templates/popover_region.mustache
View File

@ -36,7 +36,7 @@
<div class="popover-region collapsed {{$classes}}{{/classes}}"
{{$attributes}}{{/attributes}}
data-region="popover-region">
<div class="popover-region-toggle"
<div class="popover-region-toggle nav-link"
data-region="popover-region-toggle"
aria-role="button"
aria-controls="popover-region-container-{{uniqid}}"

4
theme/boost/scss/moodle/bootswatch.scss
View File

@ -4,7 +4,3 @@ $navbar-height: 60px !default;
.navbar {
max-height: $navbar-height;
}
.navbar-brand {
margin-top: (($font-size-base * $line-height-base) - ($font-size-lg * $line-height-base)) / 2;
}

12
theme/boost/scss/moodle/popover-region.scss
View File

@ -1,4 +1,3 @@
$toggle-height: 35px;
$toggle-width: 25px;
$standard-border: 1px solid #ddd;
$region-container-height: 500px;
@ -178,15 +177,7 @@ $content-item-unread-colour: #f4f4f4;
}
.popover-region-toggle {
height: $toggle-height;
width: $toggle-width;
line-height: $toggle-height;
img {
height: 16px;
width: 16px;
margin: 0;
}
}
.count-container {
@ -202,8 +193,9 @@ $content-item-unread-colour: #f4f4f4;
}
.popover-region-container {
top: $toggle-height;
top: $line-height-base * 1.4 * $font-size-base;
}
}
.content-item-container {

3
theme/boost/scss/moodle/search.scss
View File

@ -15,11 +15,8 @@
margin: 0 $spacer 0 0;
overflow: hidden;
float: right;
height: 100%;
width: 16px;
transition: width 0.5s ease, left 0.5s ease;
padding-top: $navbar-brand-padding-y;
padding-bottom: $navbar-brand-padding-y;
}
.search-input-wrapper > div {

2
theme/boost/templates/header.mustache
View File

@ -19,7 +19,7 @@
}}
<header role="banner" class="pos-f-t navbar navbar-full navbar-light bg-faded navbar-static-top moodle-has-zindex">
<div class="container-fluid">
<div class="container-fluid navbar-nav">
<div data-region="drawer-toggle">
<button aria-expanded="{{#navdraweropen}}true{{/navdraweropen}}{{^navdraweropen}}false{{/navdraweropen}}" aria-controls="nav-drawer" type="button" class="btn pull-xs-left m-r-1 btn-secondary" data-action="toggle-drawer" data-side="left" data-preference="drawer-open-nav">&#9776;<span class="sr-only">{{#str}}expand, core{{/str}}</span></button>