Merge branch '28-update-bootstrap' into dev
This commit is contained in:
commit
638d318a17
42 changed files with 343 additions and 2653 deletions
|
|
@ -10,12 +10,9 @@
|
|||
{% for type, messages in flash.getMessages() %}
|
||||
{% for message in messages %}
|
||||
<div class="alert alert-{{ types[type] }} alert-dismissible" role="alert">
|
||||
<button type="button" class="close" data-dismiss="alert">×</button>
|
||||
|
||||
<strong>{{ type|capitalize }}</strong>
|
||||
<p>
|
||||
{{ message }}
|
||||
</p>
|
||||
<h5 class="alert-heading">{{ type|capitalize }}</h5>
|
||||
<p class="mb-0">{{ message }}</p>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
|
||||
</div>
|
||||
{% endfor%}
|
||||
{% endfor %}
|
||||
|
|
|
|||
|
|
@ -9,15 +9,15 @@
|
|||
{% if auth.hasIdentity() %}
|
||||
<div class="navigation-user-menu-dropdown">
|
||||
<a id="user-dropdown-button" class="navigation-user-menu-dropdown-button"
|
||||
data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
|
||||
data-bs-toggle="dropdown" role="button" aria-expanded="false">
|
||||
|
||||
{{ icon('solid/user') }} <strong>{{ auth.getUser().username }}</strong>
|
||||
</a>
|
||||
|
||||
<ul aria-labelledby="user-dropdown" class="navigation-user-menu-dropdown-list">
|
||||
<ul class="dropdown-menu navigation-user-menu-dropdown-list">
|
||||
<li>{{ link_to(['for': 'user-settings'], '<i class="icon fas fa-cog"></i> Settings') }}</li>
|
||||
<li>{{ link_to('/user/activity', '<i class="icon fas fa-list-alt"></i> Activity') }}</li>
|
||||
<li role="separator" class="divider"></li>
|
||||
<li><hr class="dropdown-divider"></li>
|
||||
<li>{{ link_to(['for': 'logout'], '<i class="icon far fa-times-circle"></i> Log out') }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
Reference in a new issue