Skip to content

Commit

Permalink
Merge pull request #4255 from jamalex/fix_container_overflow
Browse files Browse the repository at this point in the history
Fix container-inside-container overflow issue.
  • Loading branch information
jamalex committed Aug 18, 2015
2 parents d6abcae + 4f8b1c3 commit 0c49a77
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,12 @@ <h4 class="modal-title">{% trans "Export learner stats" %}</h4>
{% endblock buttons %}

{% block control_panel_content %}
<div class="container">
{# Coaches table #}
{% include "control_panel/partials/_coaches_table.html" %}
{# Coaches table #}
{% include "control_panel/partials/_coaches_table.html" %}

{# Groups table #}
{% include "control_panel/partials/_groups_table.html" %}
{# Groups table #}
{% include "control_panel/partials/_groups_table.html" %}

{# Students table #}
{% include "control_panel/partials/_students_table.html" %}
</div> <!-- End Container -->
{# Students table #}
{% include "control_panel/partials/_students_table.html" %}
{% endblock control_panel_content %}
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,9 @@
{% endblock buttons %}

{% block control_panel_content %}

<div class="container">
{# Facilities Section #}
{% include "control_panel/partials/_facility_table.html" %}

{# Device Section #}
{% include "control_panel/partials/_device_table.html" %}

</div> <!-- End container -->
{% endblock control_panel_content %}

0 comments on commit 0c49a77

Please sign in to comment.