diff --git a/hiboo/templates/base.html b/hiboo/templates/base.html
index 85f68091079c40a93d7e3a9868bea55036b5a6bb..5e3bf569e707b5c24a08831e207d6f5ca091a3ce 100644
--- a/hiboo/templates/base.html
+++ b/hiboo/templates/base.html
@@ -23,18 +23,18 @@
<ul class="navbar-nav ml-auto">
{% if current_user.is_authenticated %}
<li class="nav-item user">
- <div class="nav-link"><i class="fa fa-user"></i> {{ current_user.username }}</div>
+ <div class="nav-link"><i class="fas fa-user"></i> {{ current_user.username }}</div>
</li>
<li class="nav-item user">
<a href="{{ url_for("account.signout") }}" class="nav-link">
- <i class="fa fa-sign-out"></i>
+ <i class="fas fa-sign-out"></i>
{% trans %}Sign out{% endtrans %}
</a>
</li>
{% else %}
<li class="nav-item user">
<a href="{{ url_for("account.signin") }}" class="nav-link">
- <i class="fa fa-sign-in"></i>
+ <i class="fas fa-sign-in"></i>
{% trans %}Sign in{% endtrans %}
</a>
</li>
diff --git a/hiboo/templates/macros.html b/hiboo/templates/macros.html
index dc372f38de04d6adfa26ba2c0c10f72f7c94a434..0b1f0009b194c6d23f4489fc2f9d8d92471078ca 100644
--- a/hiboo/templates/macros.html
+++ b/hiboo/templates/macros.html
@@ -12,9 +12,9 @@
</div>
{% endif %}
<div>
- <i class="fa fa-{{ {"signup": "address-card", "password": "lock"}[event.category] }} bg-blue"></i>
+ <i class="fas fa-{{ {"signup": "address-card", "create": "plus", "transition": "recycle", "password": "lock"}[event.category] }} bg-blue"></i>
<div class="timeline-item">
- <span class="time"><i class="fa fa-clock"></i> {{ event.created_at.time().strftime("%H:%M") }}</span>
+ <span class="time"><i class="fas fa-clock"></i> {{ event.created_at.time().strftime("%H:%M") }}</span>
<h3 class="timeline-header">
<strong>{{ event.actor.username or event.user.username }}</strong>
{{ event.description }}
@@ -37,23 +37,23 @@
{% if profile.transition_step %}
{% set transition = profile.TRANSITIONS[profile.transition] %}
{% set target = profile.STATUSES[transition.to] %}
- <i class="fa fa-arrow-right"></i>
+ <i class="fas fa-arrow-right"></i>
<span class="badge bg-{{ target[0] }}">{{ target[1] }}</span>
{% if profile.transition_step == profile.INIT %}
- <i class="fa fa-clock"></i> {{ transition.delta(profile) }}
+ <i class="fas fa-clock"></i> {{ transition.delta(profile) }}
{% elif profile.transition_step == profile.START %}
- <i class="fa fa-rocket"></i>
+ <i class="fas fa-rocket"></i>
{% elif profile.transition_step == profile.DONE %}
- <i class="fa fa-check"></i>
+ <i class="fas fa-check"></i>
{% elif profile.transition_step == profile.MANUAL %}
- <a href="{{ url_for("profile.complete_transition", profile_uuid=profile.uuid) }}"><i class="fa fa-hand-point-up"></i></a>
+ <a href="{{ url_for("profile.complete_transition", profile_uuid=profile.uuid) }}"><i class="fas fa-hand-point-up"></i></a>
{% endif %}
{% endif %}
{% endmacro %}
{% macro infobox(title, text, color, icon) %}
<div class="info-box">
- <span class="info-box-icon bg-{{ color }}"><i class="fa fa-{{ icon }}"></i></span>
+ <span class="info-box-icon bg-{{ color }}"><i class="fas fa-{{ icon }}"></i></span>
<div class="info-box-content">
<span class="info-box-text">{{ title }}</span>
<span class="info-box-number">{{ text }}</span>
@@ -66,7 +66,7 @@
<div class="form-group">
<div class="row">
{% for field in fields %}
- <div class="col-lg-{{ width }} col-xs-12 {{ 'has-error' if field.errors else '' }}">
+ <div class="col-lg-{{ width }} col {{ 'has-error' if field.errors else '' }}">
{{ form_individual_field(field, prepend=prepend, append=append, label=label, **kwargs) }}
</div>
{% endfor %}
diff --git a/hiboo/templates/sidebar.html b/hiboo/templates/sidebar.html
index cc774cf39f86f3fc0e61c40eda5322477c519a70..4bfbf01d5bf5e68bd3c748b888f1abf8712ba581 100644
--- a/hiboo/templates/sidebar.html
+++ b/hiboo/templates/sidebar.html
@@ -28,12 +28,12 @@
{% else %}
<li class="nav-item">
<a class="nav-link" href="{{ utils.url_for("account.signup") }}">
- <i class="nav-icon fas fa-address-card-o"></i> <p>{% trans %}Sign up{% endtrans %}</p>
+ <i class="nav-icon fas fa-address-card"></i> <p>{% trans %}Sign up{% endtrans %}</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ utils.url_for("account.signin") }}">
- <i class="nav-icon fas fa-sign-in"></i> <p>{% trans %}Sign in{% endtrans %}</p>
+ <i class="nav-icon fas fa-sign-in-alt"></i> <p>{% trans %}Sign in{% endtrans %}</p>
</a>
</li>
{% endif %}
diff --git a/hiboo/user/templates/user_details.html b/hiboo/user/templates/user_details.html
index ee1e049aa6751f8393e586ea39d6ee1d5c2e520a..8813b4e95a237f8397ab4d6d2cd3333b58f5254e 100644
--- a/hiboo/user/templates/user_details.html
+++ b/hiboo/user/templates/user_details.html
@@ -64,5 +64,5 @@
{% endblock %}
{% block actions %}
-<a href="{{ url_for(".password_reset", user_uuid=user.uuid) }}" class="btn btn-primary">{% trans %}Password reset{% endtrans %}</a>
+<a href="{{ url_for(".password_reset", user_uuid=user.uuid) }}" class="btn btn-warning">{% trans %}Password reset{% endtrans %}</a>
{% endblock %}
diff --git a/hiboo/user/templates/user_list.html b/hiboo/user/templates/user_list.html
index 300b4b0794465bf2f0c15b2eb78de30cc8d6ca8a..e68e8847271d20019389b11688d7804d5dc0b9d4 100644
--- a/hiboo/user/templates/user_list.html
+++ b/hiboo/user/templates/user_list.html
@@ -30,5 +30,5 @@
{% endblock %}
{% block actions %}
-<a href="{{ url_for(".invite") }}" class="btn btn-primary">{% trans %}Sign-up link{% endtrans %}</a>
+<a href="{{ url_for(".invite") }}" class="btn btn-success">{% trans %}Invitation link{% endtrans %}</a>
{% endblock %}