Merge master into i18n branch #1454

Merged
djoate merged 103 commits from i18n into i18n 2019-11-02 20:43:17 +00:00
2 changed files with 3 additions and 3 deletions
Showing only changes of commit 2eaf6441db - Show all commits

View File

@@ -1,4 +1,4 @@
<div class="col-xl-4 col-lg-6 col-md-12 mb-2">
<div class="col-xl-4 col-lg-6 col-md-12 mb-4">
<div class="card card-{{include.color}}">
{% if include.color == "warning" %}
<div class="card-header text-dark bg-{{include.color}}">

View File

@@ -1,4 +1,4 @@
<div class="col-xl-4 col-lg-6 col-md-12 mb-2">
<div class="col-xl-4 col-lg-6 col-md-12 mb-4">
<div class="card card-{{include.color}}">
{% if include.color == "warning" %}
<div class="card-header text-dark bg-{{include.color}}">
@@ -11,4 +11,4 @@
{{include.body}}
</div>
</div>
</div>
</div>