Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8697 from edx/frances/fix/lmsbigwindow

Browse Source 
InstrDash and Wiki content responsive
This commit is contained in:
frances botsford
2015-07-02 11:40:20 -04:00
parent 281ebaa3b3 9969549b3a
commit 05249d590f
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/static/sass/base/_layouts.scss
View File

@@ -55,7 +55,9 @@ body.view-incourse {
// courseware and progress page
.course-wrapper,
.profile-wrapper {
.profile-wrapper,
.instructor-dashboard-wrapper-2,
.wiki-wrapper {
max-width: 1180px;
margin: 0 auto;
padding: 0;

2
lms/static/sass/shared/_header.scss
View File

@@ -115,8 +115,8 @@ header.global {
.user {
@include float(right);
@extend %ui-print-excluded;
margin-top: ($baseline/4);
padding-left: 0;
> .primary {
display: block;

41
lms/templates/main_django.html
View File

@@ -27,30 +27,33 @@
</head>
<body class="{% block bodyclass %}{% endblock %} lang_{{LANGUAGE_CODE}}">
<a class="nav-skip" href="{% block nav_skip %}#content{% endblock %}">{% trans "Skip to main content" %}</a>
{% with course=request.course %}
{% if IS_EDX_DOMAIN %}
{% include "navigation-edx.html" %}
<div class="window-wrap" dir="${static.dir_rtl()}">
<a class="nav-skip" href="{% block nav_skip %}#content{% endblock %}">{% trans "Skip to main content" %}</a>
{% with course=request.course %}
{% if IS_EDX_DOMAIN %}
{% include "navigation-edx.html" %}
{% else %}
{% include "navigation.html" %}
{% endif %}
{% endwith %}
<div class="content-wrapper" id="content">
{% block body %}{% endblock %}
{% block bodyextra %}{% endblock %}
</div>
{% if IS_REQUEST_IN_MICROSITE %}
{# For now we don't support overriden Django templates in microsites. Leave footer blank for now which is better than saying Edx.#}
{% elif IS_EDX_DOMAIN %}
{% include "footer-edx-v3.html" %}
{% else %}
{% include "navigation.html" %}
{% include "footer.html" %}
{% endif %}
{% endwith %}
<div class="content-wrapper" id="content">
{% block body %}{% endblock %}
{% block bodyextra %}{% endblock %}
</div>
{% if IS_REQUEST_IN_MICROSITE %}
{# For now we don't support overriden Django templates in microsites. Leave footer blank for now which is better than saying Edx.#}
{% elif IS_EDX_DOMAIN %}
{% include "footer-edx-v3.html" %}
{% else %}
{% include "footer.html" %}
{% endif %}
{% compressed_js 'application' %}
{% compressed_js 'module-js' %}
{% compressed_js 'application' %}
{% compressed_js 'module-js' %}
{% render_block "js" %}
{% render_block "js" %}
</body>
</html>