thubrecht/poulpe
1
0
Fork 0
Code Issues 5 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'qwann/html/user' into qwann/views/shared

Browse source
This commit is contained in:
Qwann 2017-02-21 15:40:11 +01:00
commit b042ec1478
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
shared/static/css/style.css
View file

@ -61,6 +61,18 @@ a, a:hover, a:focus {
text-decoration: none; text-decoration: none;
} }
/* centered columns styles */
.row-centered {
text-align:center;
}
.col-centered {
display:inline-block;
float:none;
/* reset the text-align */
text-align:left;
/* inline-block space fix */
}
/*Helpers*/ /*Helpers*/
@ -684,7 +696,7 @@ PANELS CONFIGURATIONS
.form-panel { .form-panel {
background: #ffffff; background: #ffffff;
margin: 10px; margin: 10px;
padding: 10px; padding: 20px;
box-shadow: 0px 3px 2px #aab2bd; box-shadow: 0px 3px 2px #aab2bd;
text-align: left; text-align: left;
} }

4
shared/templates/base.html
View file

@ -22,8 +22,8 @@
{% endblock %} {% endblock %}
{% block real_content %} {% block real_content %}
<div class="row"> <div class="row row-centered">
<div class="col-lg-12"> <div class="{% block page_size %}col-lg-12{% endblock %} col-centered">
<h2><i class="fa fa-angle-right"></i>{% block page_title %}{% endblock %}</h2> <h2><i class="fa fa-angle-right"></i>{% block page_title %}{% endblock %}</h2>
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>

3
user/templates/user/user_form.html
View file

@ -4,6 +4,9 @@
{% load bootstrap %} {% load bootstrap %}
{% block page_title %}{{ page_title }}{% endblock %} {% block page_title %}{{ page_title }}{% endblock %}
{% block page_size %}col-lg-8{% endblock %}
{% block content %} {% block content %}
<!-- BASIC FORM ELELEMNTS --> <!-- BASIC FORM ELELEMNTS -->
<div class="row"> <div class="row">