Skip to content

E
edx-platform
Commit 05249d59 by frances botsford
Options

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

InstrDash and Wiki content responsive
parents 281ebaa3 9969549b
Showing with 26 additions and 21 deletions
lms/static/sass/base/_layouts.scss
...@@ -55,7 +55,9 @@ body.view-incourse { ...@@ -55,7 +55,9 @@ body.view-incourse {
// courseware and progress page // courseware and progress page
.course-wrapper, .course-wrapper,
.profile-wrapper { .profile-wrapper,
.instructor-dashboard-wrapper-2,
.wiki-wrapper {
max-width: 1180px; max-width: 1180px;
margin: 0 auto; margin: 0 auto;
padding: 0; padding: 0;
......
lms/static/sass/shared/_header.scss
...@@ -115,8 +115,8 @@ header.global { ...@@ -115,8 +115,8 @@ header.global {
.user { .user {
@include float(right); @include float(right);
@extend %ui-print-excluded; @extend %ui-print-excluded;
margin-top: ($baseline/4); margin-top: ($baseline/4);
padding-left: 0;
> .primary { > .primary {
display: block; display: block;
......
lms/templates/main_django.html
...@@ -27,30 +27,33 @@ ...@@ -27,30 +27,33 @@
</head> </head>
<body class="{% block bodyclass %}{% endblock %} lang_{{LANGUAGE_CODE}}"> <body class="{% block bodyclass %}{% endblock %} lang_{{LANGUAGE_CODE}}">
<a class="nav-skip" href="{% block nav_skip %}#content{% endblock %}">{% trans "Skip to main content" %}</a> <div class="window-wrap" dir="${static.dir_rtl()}">
{% with course=request.course %} <a class="nav-skip" href="{% block nav_skip %}#content{% endblock %}">{% trans "Skip to main content" %}</a>
{% if IS_EDX_DOMAIN %} {% with course=request.course %}
{% include "navigation-edx.html" %} {% 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 %} {% else %}
{% include "navigation.html" %} {% include "footer.html" %}
{% endif %} {% endif %}
{% endwith %}
<div class="content-wrapper" id="content">
{% block body %}{% endblock %}
{% block bodyextra %}{% endblock %}
</div> </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 'application' %}
{% compressed_js 'module-js' %} {% compressed_js 'module-js' %}
{% render_block "js" %} {% render_block "js" %}
</body> </body>
</html> </html>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment