Merge branch 'dont-fight-against-bootstrap' into 'master'

[FIX] Use proper markup instead of fighting against Bootstrap

See merge request allianceauth/allianceauth!1462
This commit is contained in:
Ariel Rin 2022-09-11 13:43:38 +00:00
commit cf7a8cedf1
2 changed files with 12 additions and 14 deletions

View File

@ -103,13 +103,17 @@
{% endif %} {% endif %}
<div class="clearfix"></div> <div class="clearfix"></div>
<div class="row"> <div class="row">
<div class="col-sm-6 button-wrapper"> <div class="col-sm-6">
<p>
<a href="{% url 'authentication:add_character' %}" class="btn btn-block btn-info" <a href="{% url 'authentication:add_character' %}" class="btn btn-block btn-info"
title="Add Character">{% translate 'Add Character' %}</a> title="Add Character">{% translate 'Add Character' %}</a>
</p>
</div> </div>
<div class="col-sm-6 button-wrapper"> <div class="col-sm-6">
<p>
<a href="{% url 'authentication:change_main_character' %}" class="btn btn-block btn-info" <a href="{% url 'authentication:change_main_character' %}" class="btn btn-block btn-info"
title="Change Main Character">{% translate "Change Main" %}</a> title="Change Main Character">{% translate "Change Main" %}</a>
</p>
</div> </div>
</div> </div>
</div> </div>

View File

@ -191,7 +191,8 @@ ul.list-group.list-group-horizontal > li.list-group-item {
} }
} }
/* Small devices (tablets, 768px and up) */ /* Small devices (tablets, 768px and up)
------------------------------------------------------------------------------------- */
@media (min-width: 768px) { @media (min-width: 768px) {
/* class for vertically aligning columns in a bootstrap row */ /* class for vertically aligning columns in a bootstrap row */
.row.vertical-flexbox-row2 { .row.vertical-flexbox-row2 {
@ -204,10 +205,3 @@ ul.list-group.list-group-horizontal > li.list-group-item {
flex-direction: column; flex-direction: column;
} }
} }
/* Extra Small devices (Phones, <768px) */
@media (max-width: 767px) {
.button-wrapper .btn {
margin-bottom: 5px;
}
}