MDL-71293 theme_boost: improve navbar for new navigation

This commit is contained in:
Bas Brands 2021-05-31 13:03:19 +02:00
parent 338b60f43b
commit c36972b2c0
17 changed files with 238 additions and 178 deletions

View file

@ -3330,7 +3330,7 @@ EOD;
return html_writer::div(
html_writer::span(
$returnstr,
'login'
'login nav-link'
),
$usermenuclasses
);
@ -3347,7 +3347,7 @@ EOD;
return html_writer::div(
html_writer::span(
$returnstr,
'login'
'login nav-link'
),
$usermenuclasses
);
@ -3419,7 +3419,8 @@ EOD;
$am = new action_menu();
$am->set_menu_trigger(
$returnstr
$returnstr,
'nav-link'
);
$am->set_action_label(get_string('usermenu'));
$am->set_alignment(action_menu::TR, action_menu::BR);

View file

@ -30,7 +30,7 @@
}
}
}}
<div class="action-menu {{classes}} d-inline"{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
<div class="action-menu {{classes}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
{{#primary}}
<div class="{{classes}} d-flex "{{#attributes}} {{name}}="{{value}}"{{/attributes}}>

View file

@ -78,7 +78,7 @@
}
}}
<div class="dropdown{{^secondary.items}} hidden{{/secondary.items}}">
<a href="#" tabindex="0" class="d-inline-block {{triggerextraclasses}} dropdown-toggle icon-no-margin" id="action-menu-toggle-{{instance}}" aria-label="{{title}}" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" aria-controls="action-menu-{{instance}}-menu">
<a href="#" tabindex="0" class="{{triggerextraclasses}} dropdown-toggle icon-no-margin" id="action-menu-toggle-{{instance}}" aria-label="{{title}}" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" aria-controls="action-menu-{{instance}}-menu">
{{{actiontext}}}
{{{menutrigger}}}
{{#icon}}

View file

@ -50,7 +50,7 @@
{{/haschildren}}
{{^haschildren}}
<li class="nav-item">
<a class="nav-item nav-link" href="{{{url}}}" {{#title}}title="{{{title}}}"{{/title}}>{{{text}}}</a>
<a class="nav-link" href="{{{url}}}" {{#title}}title="{{{title}}}"{{/title}}>{{{text}}}</a>
</li>
{{/haschildren}}
{{/divider}}

View file

@ -70,7 +70,7 @@
</form>
</div>
<a
class="btn btn-open"
class="btn btn-open nav-link"
data-toggle="collapse"
data-action="opensearch"
href="#searchform-navbar"