Commit f84ef60e3c79ceff0a70cd46895c1c8e678eac66
1 parent
21b49d36
Exists in
master
and in
5 other branches
fix bad structure on base.html, now it follows Bootstrap guidelines
Showing
1 changed file
with
16 additions
and
24 deletions
Show diff stats
core/templates/base.html
| @@ -38,10 +38,7 @@ | @@ -38,10 +38,7 @@ | ||
| 38 | <div class="container-fluid"> | 38 | <div class="container-fluid"> |
| 39 | {% block nav %} | 39 | {% block nav %} |
| 40 | <div class="row"> | 40 | <div class="row"> |
| 41 | - <div class="container-fluid"> | ||
| 42 | - <div class="row"> | ||
| 43 | <div class="navbar navbar-default"> | 41 | <div class="navbar navbar-default"> |
| 44 | - <div class="container-fluid"> | ||
| 45 | <div class="navbar-header"> | 42 | <div class="navbar-header"> |
| 46 | <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse"> | 43 | <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse"> |
| 47 | <span class="icon-bar"></span> | 44 | <span class="icon-bar"></span> |
| @@ -97,16 +94,11 @@ | @@ -97,16 +94,11 @@ | ||
| 97 | <li class="link"> <a href="{% url 'core:logout' %}">{% trans 'Log out' %}</a></li> | 94 | <li class="link"> <a href="{% url 'core:logout' %}">{% trans 'Log out' %}</a></li> |
| 98 | </ul> | 95 | </ul> |
| 99 | </div> | 96 | </div> |
| 100 | - </div> | ||
| 101 | </div> | 97 | </div> |
| 102 | - </div> | ||
| 103 | - </div> | ||
| 104 | </div> | 98 | </div> |
| 105 | {% endblock %} | 99 | {% endblock %} |
| 106 | 100 | ||
| 107 | <div class="row"> | 101 | <div class="row"> |
| 108 | - <div class="container-fluid"> | ||
| 109 | - <div class="row"> | ||
| 110 | <div class="col-xs-* col-sm-* col-md-2"> | 102 | <div class="col-xs-* col-sm-* col-md-2"> |
| 111 | {% block sidebar %} | 103 | {% block sidebar %} |
| 112 | 104 | ||
| @@ -121,25 +113,25 @@ | @@ -121,25 +113,25 @@ | ||
| 121 | {% block render_breadcrumbs %} | 113 | {% block render_breadcrumbs %} |
| 122 | 114 | ||
| 123 | {% endblock %} | 115 | {% endblock %} |
| 116 | + </div> | ||
| 117 | + | ||
| 118 | + | ||
| 119 | + | ||
| 120 | + | ||
| 121 | + <div class="col-xs-* col-sm-* col-md-8"> | ||
| 122 | + {% block content %} | ||
| 124 | 123 | ||
| 125 | - <div class="row"> | ||
| 126 | - <div class="container-fluid"> | ||
| 127 | - <div class="col-xs-* col-sm-* col-md-8"> | ||
| 128 | - {% block content %} | ||
| 129 | - | ||
| 130 | - {% endblock %} | ||
| 131 | - </div> | 124 | + {% endblock %} |
| 125 | + </div> | ||
| 132 | 126 | ||
| 133 | - <div class="col-xs-* col-sm-* col-md-4"> | ||
| 134 | - {% block rightbar %} | 127 | + <div class="col-xs-* col-sm-* col-md-2"> |
| 128 | + {% block rightbar %} | ||
| 135 | 129 | ||
| 136 | - {% endblock rightbar %} | ||
| 137 | - </div> | ||
| 138 | - </div> | ||
| 139 | - </div> | ||
| 140 | - </div> | ||
| 141 | - </div> | ||
| 142 | - </div> | 130 | + {% endblock rightbar %} |
| 131 | + </div> | ||
| 132 | + | ||
| 133 | + | ||
| 134 | + | ||
| 143 | </div> | 135 | </div> |
| 144 | </div> | 136 | </div> |
| 145 | 137 |