Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Migrate more CSS classes to bootstrap 4

Roland Geider1425c6f31dd8
diff --git a/wger/core/templates/index.html b/wger/core/templates/index.html
index b56e29ab1..774a41f85 100644
--- a/wger/core/templates/index.html
+++ b/wger/core/templates/index.html
@@ -55,7 +55,7 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str
<p>
{% endif %}
- <table class="table table-hover table-condensed">
+ <table class="table table-hover table-sm">
{% for day, exercise, is_workout in weekdays %}
<tr>
<td>
@@ -81,7 +81,7 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str
– {{ plan.creation_date }}
</p>
{% endif %}
- <table class="table table-hover table-condensed">
+ <table class="table table-hover table-sm">
<tr>
<td>{% trans "Energy" %}</td>
<td>
@@ -119,7 +119,7 @@ day in your current workout:{% endblocktrans %} <strong>{{current_workout}}</str
{% trans "Your current weight is: "%}
{{weight.weight|floatformat}} {% trans_weight_unit 'kg' user %}
</p>
- <table class="table table-hover table-condensed">
+ <table class="table table-hover table-sm">
{% for entry_detail in last_weight_entries %}
<tr>
<td>
diff --git a/wger/core/templates/license/list.html b/wger/core/templates/license/list.html
index 921bd59d8..3ecb62843 100644
--- a/wger/core/templates/license/list.html
+++ b/wger/core/templates/license/list.html
@@ -9,7 +9,7 @@
{% for license in license_list %}
<li class="list-group-item ">
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<div class="dropdown-menu" role="menu">
diff --git a/wger/core/templates/misc/license/list.html b/wger/core/templates/misc/license/list.html
index a2f71d025..c445001ab 100644
--- a/wger/core/templates/misc/license/list.html
+++ b/wger/core/templates/misc/license/list.html
@@ -9,7 +9,7 @@
{% for license in license_list %}
<li class="list-group-item ">
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<ul class="dropdown-menu" role="menu">
diff --git a/wger/core/templates/repetition_unit/list.html b/wger/core/templates/repetition_unit/list.html
index 5d61c856a..daff9c4ed 100644
--- a/wger/core/templates/repetition_unit/list.html
+++ b/wger/core/templates/repetition_unit/list.html
@@ -10,7 +10,7 @@
<li class="list-group-item ">
{% if unit.id != 1 and unit.id != 2 %}
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<ul class="dropdown-menu" role="menu">
diff --git a/wger/core/templates/tags/render_day.html b/wger/core/templates/tags/render_day.html
index 7a4b55531..7a9e40ab2 100644
--- a/wger/core/templates/tags/render_day.html
+++ b/wger/core/templates/tags/render_day.html
@@ -70,12 +70,12 @@ $(document).ready(function() {
<a href="{{exercise.obj.get_absolute_url}}" >
<div style="width: 64px; height: 64px;">
{% if exercise.obj.main_image %}
- <img class="img-responsive"
+ <img class="img-fluid"
src="{{ exercise.obj.main_image.image|thumbnail_url:'small' }}"
alt="{{exercise.obj}}"
style="max-width: 100%; max-height: 100%;">
{% else %}
- <img class="img-responsive"
+ <img class="img-fluid"
src="{% static 'images/icons/image-placeholder.svg' %}"
alt="{% trans 'Placeholder image for exercise' %}"
style="opacity: 0.4;">
diff --git a/wger/core/templates/template.html b/wger/core/templates/template.html
index 6aa07d6f0..414473c6c 100644
--- a/wger/core/templates/template.html
+++ b/wger/core/templates/template.html
@@ -108,7 +108,7 @@
{# #}
<div class="btn-group" role="group">
<div class="btn-group" role="group">
- <button id="btnGroupLanguages" type="button" class="btn btn-primary dropdown-toggle dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button id="btnGroupLanguages" type="button" class="btn btn-primary dropdown-toggle dropdown-toggle btn-sm" data-toggle="dropdown">
{% with 'images/icons/flag-'|add:language.short_name|add:'.svg' as flagname %}
<img src="{% static flagname %}"
width="18"
@@ -179,12 +179,12 @@
<div class="alert alert-warning" role="alert" style="padding:0.6em; margin-top: 1em; text-align:center; font-size:95%;">
{% trans "You are using a guest account, data entered will be deleted after a week." %}
{% if not has_demo_data %}
- <a href="{% url 'core:user:demo-entries' %}" rel="nofollow" class="btn btn-success btn-xs">
+ <a href="{% url 'core:user:demo-entries' %}" rel="nofollow" class="btn btn-success btn-sm">
{% trans "Create some demo entries" %}
<span class="glyphicon glyphicon-chevron-right"></span>
</a>
{% else %}
- <a href="{% url 'core:user:registration' %}" class="btn btn-success btn-xs">
+ <a href="{% url 'core:user:registration' %}" class="btn btn-success btn-sm">
{% trans "Register" %}
<span class="glyphicon glyphicon-chevron-right"></span>
</a>
diff --git a/wger/core/templates/template_features.html b/wger/core/templates/template_features.html
index 8d20ce572..114da255b 100644
--- a/wger/core/templates/template_features.html
+++ b/wger/core/templates/template_features.html
@@ -79,43 +79,51 @@
<div class="row">
<div class="col-md-4">
<ul class="list-inline quicklinks">
- <li><a href="{% url 'software:contribute' %}">{% trans "Contribute!" %}</a></li>
- <li><a href="{% url 'core:contact' %}">{% trans "Get in touch" %}</a></li>
+ <li class="list-inline-item">
+ <a href="{% url 'software:contribute' %}">{% trans "Contribute!" %}</a>
+ </li>
+ <li class="list-inline-item">
+ <a href="{% url 'core:contact' %}">{% trans "Get in touch" %}</a>
+ </li>
</ul>
</div>
<div class="col-md-4">
<ul class="list-inline social-buttons">
- <li>
+ <li class="list-inline-item">
<a href="https://github.com/wger-project/wger" title="Github">
<span class="{% fa_class 'github' %}"></span>
</a>
</li>
- <li>
+ <li class="list-inline-item">
<a href="https://twitter.com/wger_de" title="Twitter">
<span class="{% fa_class 'twitter' %}"></span>
</a>
</li>
- <li>
+ <li class="list-inline-item">
<a href="https://www.transifex.com/rge/wger-workout-manager/" title="{% trans 'Translate' %}">
<span class="{% fa_class 'globe' %}"></span>
</a>
</li>
- <li>
- {% if show_shariff %}
- {% include 'misc/fragments/shariff_modal.html' %}
- <a data-toggle="modal" href="#shariffModal" title="Share">
- <span class="{% fa_class 'share-alt' %}"></span>
- </a>
- <div class="clearfix"></div>
+ <li class="list-inline-item">
+ {% if show_shariff %}
+ {% include 'misc/fragments/shariff_modal.html' %}
+ <a data-toggle="modal" href="#shariffModal" title="Share">
+ <span class="{% fa_class 'share-alt' %}"></span>
+ </a>
+ <div class="clearfix"></div>
{% endif %}
</li>
</ul>
</div>
- <div class="col-md-4">
+ <div class="col-md-4 text-lg-right">
<ul class="list-inline quicklinks">
- <li><a href="{% url 'core:about' %}">{% trans "About" %}</a></li>
+ <li class="list-inline-item">
+ <a href="{% url 'core:about' %}">{% trans "About" %}</a>
+ </li>
- <li><a href="{% url 'software:tos' %}">{% trans "Terms of service" %}</a></li>
+ <li class="list-inline-item">
+ <a href="{% url 'software:tos' %}">{% trans "Terms of service" %}</a>
+ </li>
</ul>
</div>
</div>
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.html
index 8d23def56..5ce8fea83 100644
--- a/wger/core/templates/user/overview.html
+++ b/wger/core/templates/user/overview.html
@@ -198,7 +198,7 @@
{% block sidebar %}
{% if perms.gym.manage_gyms or perms.gym.manage_gym %}
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
{% trans "Actions" %} <span class="caret"></span>
</button>
<div class="dropdown-menu" role="menu">
@@ -319,7 +319,7 @@
{# #}
{% if perms.gym.add_contract %}
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
{% trans "Actions" %} <span class="caret"></span>
</button>
<div class="dropdown-menu" role="menu">
@@ -358,7 +358,7 @@
{# #}
{% if perms.gym.add_adminusernote %}
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
{% trans "Actions" %} <span class="caret"></span>
</button>
<div class="dropdown-menu" role="menu">
@@ -394,7 +394,7 @@
{# #}
{% if perms.gym.add_userdocument %}
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
{% trans "Actions" %} <span class="caret"></span>
</button>
<div class="dropdown-menu" role="menu">
@@ -409,7 +409,7 @@
<tr>
<td>
<a href="{{ document.document.url }}"
- class="btn btn-default btn-xs"
+ class="btn btn-default btn-sm"
title="{% trans 'Download' %}"
download="{{ document.original_name }}">
<span class="glyphicon glyphicon-download"></span>
@@ -439,7 +439,7 @@
{# #}
{% if perms.gym.change_gymuserconfig and current_user.gymuserconfig %}
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
{% trans "Actions" %} <span class="caret"></span>
</button>
<div class="dropdown-menu" role="menu">
diff --git a/wger/core/templates/weight_unit/list.html b/wger/core/templates/weight_unit/list.html
index d868c3ceb..3e07e743a 100644
--- a/wger/core/templates/weight_unit/list.html
+++ b/wger/core/templates/weight_unit/list.html
@@ -10,7 +10,7 @@
<li class="list-group-item ">
{% if unit.id != 1 and unit.id != 2 %}
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<div class="dropdown-menu" role="menu">
diff --git a/wger/exercises/templates/categories/admin-overview.html b/wger/exercises/templates/categories/admin-overview.html
index 11e50f894..9cd1753e0 100644
--- a/wger/exercises/templates/categories/admin-overview.html
+++ b/wger/exercises/templates/categories/admin-overview.html
@@ -9,7 +9,7 @@
{% for category in exercisecategory_list %}
<li class="list-group-item ">
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<div class="dropdown-menu" role="menu">
diff --git a/wger/exercises/templates/equipment/list.html b/wger/exercises/templates/equipment/list.html
index b50a13269..0238ceaca 100644
--- a/wger/exercises/templates/equipment/list.html
+++ b/wger/exercises/templates/equipment/list.html
@@ -9,7 +9,7 @@
{% for equipment in equipment_list %}
<li class="list-group-item ">
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<div class="dropdown-menu" role="menu">
diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.html
index f6cbb452c..1117a486e 100644
--- a/wger/exercises/templates/exercise/view.html
+++ b/wger/exercises/templates/exercise/view.html
@@ -124,7 +124,7 @@ $(document).ready(function() {
<div class="col-xs-3">
{% if perms.exercises.change_exerciseimage %}
<p>
- <a href="{% url 'exercise:image:add' exercise.id %}" class="btn btn-success btn-xs">
+ <a href="{% url 'exercise:image:add' exercise.id %}" class="btn btn-success btn-sm">
{% trans "Add new image" %}
</a>
</p>
@@ -240,7 +240,7 @@ $(document).ready(function() {
{% if perms.exercises.change_exercisecomment %}
<p>
- <a href="{% url 'exercise:comment:add' exercise.id %}" class="btn btn-success btn-xs wger-modal-dialog">
+ <a href="{% url 'exercise:comment:add' exercise.id %}" class="btn btn-success btn-sm wger-modal-dialog">
{% trans "Add new comment" %}
</a>
</p>
diff --git a/wger/exercises/templates/muscles/admin-overview.html b/wger/exercises/templates/muscles/admin-overview.html
index 0f5a5d38f..31f011af7 100644
--- a/wger/exercises/templates/muscles/admin-overview.html
+++ b/wger/exercises/templates/muscles/admin-overview.html
@@ -9,7 +9,7 @@
{% for muscle in muscle_list %}
<li class="list-group-item ">
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<div class="dropdown-menu" role="menu">
diff --git a/wger/gym/templates/admin_notes/list.html b/wger/gym/templates/admin_notes/list.html
index 18c91a8cb..58ca255ec 100644
--- a/wger/gym/templates/admin_notes/list.html
+++ b/wger/gym/templates/admin_notes/list.html
@@ -22,7 +22,7 @@
{% for note in adminusernote_list %}
<li class="list-group-item ">
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<ul class="dropdown-menu" role="menu">
diff --git a/wger/gym/templates/contract/list.html b/wger/gym/templates/contract/list.html
index f27c5db9a..af792a5dc 100644
--- a/wger/gym/templates/contract/list.html
+++ b/wger/gym/templates/contract/list.html
@@ -21,7 +21,7 @@
{% for contract in contract_list %}
<li class="list-group-item ">
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<ul class="dropdown-menu" role="menu">
diff --git a/wger/gym/templates/contract_option/list.html b/wger/gym/templates/contract_option/list.html
index da0aef89c..551f97cbe 100644
--- a/wger/gym/templates/contract_option/list.html
+++ b/wger/gym/templates/contract_option/list.html
@@ -21,7 +21,7 @@
{% for option in contractoption_list %}
<li class="list-group-item ">
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<ul class="dropdown-menu" role="menu">
diff --git a/wger/gym/templates/contract_type/list.html b/wger/gym/templates/contract_type/list.html
index 45ad594a1..fc276ff95 100644
--- a/wger/gym/templates/contract_type/list.html
+++ b/wger/gym/templates/contract_type/list.html
@@ -21,7 +21,7 @@
{% for contract_type in contracttype_list %}
<li class="list-group-item ">
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<ul class="dropdown-menu" role="menu">
diff --git a/wger/gym/templates/document/list.html b/wger/gym/templates/document/list.html
index 6ab5cc41e..ed9e658e1 100644
--- a/wger/gym/templates/document/list.html
+++ b/wger/gym/templates/document/list.html
@@ -22,7 +22,7 @@
{% for document in userdocument_list %}
<li class="list-group-item ">
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<ul class="dropdown-menu" role="menu">
diff --git a/wger/gym/templates/gym/list.html b/wger/gym/templates/gym/list.html
index 326970ac6..a66a05ad5 100644
--- a/wger/gym/templates/gym/list.html
+++ b/wger/gym/templates/gym/list.html
@@ -12,7 +12,7 @@
{% for gym in gym_list %}
<li class="list-group-item ">
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<div class="dropdown-menu" role="menu">
@@ -36,7 +36,7 @@
{% block sidebar %}
{% if perms.config.change_gymconfig %}
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
{% trans "Actions" %} <span class="caret"></span>
</button>
<div class="dropdown-menu" role="menu">
diff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.html
index 8d871aaa3..e4e5d1621 100644
--- a/wger/gym/templates/gym/member_list.html
+++ b/wger/gym/templates/gym/member_list.html
@@ -58,7 +58,7 @@
{% if perms.gym.manage_gym or perms.gym.manage_gyms %}
<td style="text-align: right;">
- <a href="{% url 'gym:gym:edit-user-permission' current_user.obj.pk %}" class="btn btn-default btn-xs wger-modal-dialog">
+ <a href="{% url 'gym:gym:edit-user-permission' current_user.obj.pk %}" class="btn btn-default btn-sm wger-modal-dialog">
<span class="{% fa_class 'cog' %}"></span>
</a>
</td>
@@ -80,7 +80,7 @@
{# #}
{% if perms.gym.change_gym %}
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
{% trans "Actions" %} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
@@ -137,7 +137,7 @@
{# #}
{% if perms.gym.change_gymconfig %}
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
{% trans "Actions" %} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
@@ -174,7 +174,7 @@
{# #}
{% if user.gymadminconfig and user.userprofile.gym_id == gym.id %}
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
{% trans "Actions" %} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
@@ -209,7 +209,7 @@
{% endif %}
{% if perms.gym.change_contracttype %}
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
{% trans "Actions" %} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
@@ -246,7 +246,7 @@
{% if perms.gym.change_contractoption %}
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
{% trans "Actions" %} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
@@ -287,7 +287,7 @@
{# #}
{% if perms.email.change_log %}
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
{% trans "Actions" %} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
diff --git a/wger/manager/templates/calendar/day.html b/wger/manager/templates/calendar/day.html
index 379522c31..340bd2b97 100644
--- a/wger/manager/templates/calendar/day.html
+++ b/wger/manager/templates/calendar/day.html
@@ -59,7 +59,7 @@
{% if is_owner %}
<span class="editoptions">
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<ul class="dropdown-menu" role="menu">
diff --git a/wger/manager/templates/calendar/month.html b/wger/manager/templates/calendar/month.html
index 9a2ca7072..9e2fe0828 100644
--- a/wger/manager/templates/calendar/month.html
+++ b/wger/manager/templates/calendar/month.html
@@ -76,7 +76,7 @@ $(document).ready(function() {
{% if is_owner %}
<span class="editoptions">
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<ul class="dropdown-menu" role="menu">
diff --git a/wger/nutrition/templates/ingredient/view.html b/wger/nutrition/templates/ingredient/view.html
index 9b707e72a..76d385bb2 100644
--- a/wger/nutrition/templates/ingredient/view.html
+++ b/wger/nutrition/templates/ingredient/view.html
@@ -184,7 +184,7 @@ the search.{% endblocktrans %}
{% if perms.nutrition.delete_ingredient %}
<h4>{% trans "Weight units" %}</h4>
<p>
- <a href="{% url 'nutrition:unit_ingredient:add' ingredient.id %}" class="btn btn-success btn-xs wger-modal-dialog">
+ <a href="{% url 'nutrition:unit_ingredient:add' ingredient.id %}" class="btn btn-success btn-sm wger-modal-dialog">
{% trans "Add new weight unit" %}
</a>
</p>
@@ -202,7 +202,7 @@ the search.{% endblocktrans %}
<td>
{{unit.amount}} {{unit.unit.name}} = {{unit.gram}}g
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<ul class="dropdown-menu" role="menu">
diff --git a/wger/nutrition/templates/plan/view.html b/wger/nutrition/templates/plan/view.html
index b7620f09d..d58282b10 100644
--- a/wger/nutrition/templates/plan/view.html
+++ b/wger/nutrition/templates/plan/view.html
@@ -161,7 +161,7 @@ function wgerCustomModalInit()
<h5> Based on the weight entry dated {{date}} ({{weight}})</h5>
{% endblocktrans %}
{% endif %}
-<table class="table table-condensed">
+<table class="table table-sm">
<thead>
<tr>
<th>{% trans "Macronutrients" %}</th>
@@ -240,7 +240,7 @@ function wgerCustomModalInit()
{# #}
{% block sidebar %}
<h4>{% trans "Energy" %}</h4>
-<table class="table table-condensed" id="nutritional-data-energy">
+<table class="table table-sm" id="nutritional-data-energy">
<thead>
<tr>
<th>{% trans "Energy" %}</th>
diff --git a/wger/nutrition/templates/units/list.html b/wger/nutrition/templates/units/list.html
index dc66920af..997e08f21 100644
--- a/wger/nutrition/templates/units/list.html
+++ b/wger/nutrition/templates/units/list.html
@@ -11,7 +11,7 @@
{% for unit in unit_list %}
<li class="list-group-item ">
<div class="btn-group pull-right">
- <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
<div class="dropdown-menu" role="menu">
diff --git a/wger/software/templates/features.html b/wger/software/templates/features.html
index 3031e0ca0..c631bd07f 100644
--- a/wger/software/templates/features.html
+++ b/wger/software/templates/features.html
@@ -126,7 +126,7 @@
<ul class="timeline">
<li>
<div class="timeline-image">
- <img class="img-circle img-responsive" src="{% static 'images/weight-chart.png' %}" alt="">
+ <img class="img-fluid rounded-circle" src="{% static 'images/weight-chart.png' %}" alt="">
</div>
<div class="timeline-panel">
<div class="timeline-heading">
@@ -145,7 +145,7 @@
</li>
<li class="timeline-inverted">
<div class="timeline-image">
- <img class="img-circle img-responsive" src="{% static 'images/calendar.png' %}" alt="">
+ <img class="img-fluid rounded-circle" src="{% static 'images/calendar.png' %}" alt="">
</div>
<div class="timeline-panel">
<div class="timeline-heading">
@@ -164,7 +164,7 @@
</li>
<li class="timeline">
<div class="timeline-image">
- <img class="img-circle img-responsive" src="{% static 'images/muscle-overview.png' %}" alt="">
+ <img class="img-fluid rounded-circle" src="{% static 'images/muscle-overview.png' %}" alt="">
</div>
<div class="timeline-panel">
<div class="timeline-heading">
@@ -183,7 +183,7 @@
</li>
<li class="timeline-inverted">
<div class="timeline-image">
- <img class="img-circle img-responsive" src="{% static 'images/gym-management.png' %}" alt="">
+ <img class="img-fluid rounded-circle" src="{% static 'images/gym-management.png' %}" alt="">
</div>
<div class="timeline-panel">
<div class="timeline-heading">
@@ -202,7 +202,7 @@
</li>
<li class="timeline">
<div class="timeline-image">
- <img class="img-circle img-responsive" src="{% static 'images/rest-api.png' %}" alt="">
+ <img class="img-fluid rounded-circle" src="{% static 'images/rest-api.png' %}" alt="">
</div>
<div class="timeline-panel">
<div class="timeline-heading">