Merge branch 'MDL-58248-master-iconfix' of github.com:snake/moodle

This commit is contained in:
Jun Pataleta 2017-06-15 17:08:03 +08:00
commit 20456abffc
2 changed files with 2 additions and 1 deletions

View File

@ -243,6 +243,7 @@ class icon_system_fontawesome extends icon_system_font {
'core:i/marker' => 'fa-circle-o', 'core:i/marker' => 'fa-circle-o',
'core:i/mean' => 'fa-calculator', 'core:i/mean' => 'fa-calculator',
'core:i/menu' => 'fa-ellipsis-v', 'core:i/menu' => 'fa-ellipsis-v',
'core:i/menubars' => 'fa-bars',
'core:i/mnethost' => 'fa-external-link', 'core:i/mnethost' => 'fa-external-link',
'core:i/moodle_host' => 'fa-graduation-cap', 'core:i/moodle_host' => 'fa-graduation-cap',
'core:i/move_2d' => 'fa-arrows', 'core:i/move_2d' => 'fa-arrows',

View File

@ -22,7 +22,7 @@
<div class="container-fluid navbar-nav"> <div class="container-fluid navbar-nav">
<div data-region="drawer-toggle"> <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"><span aria-hidden="true">&#9776;</span><span class="sr-only">{{#str}}sidepanel, core{{/str}}</span></button> <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">{{#pix}}i/menubars{{/pix}}<span class="sr-only">{{#str}}sidepanel, core{{/str}}</span></button>
</div> </div>
<a href="{{{ config.wwwroot }}}" class="navbar-brand {{# output.should_display_navbar_logo }}has-logo{{/ output.should_display_navbar_logo }} <a href="{{{ config.wwwroot }}}" class="navbar-brand {{# output.should_display_navbar_logo }}has-logo{{/ output.should_display_navbar_logo }}