Merge branch 'develop' into pyup/update-psycopg2-binary-2.8.5-to-2.8.6

uccser · Sep 7, 2020 · 0ff6db3 · 0ff6db3
2 parents a4f10d5 + 1cfc5f3
commit 0ff6db3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/codewof/static/js/question_types/base.js b/codewof/static/js/question_types/base.js
@@ -133,13 +133,15 @@ function scroll_to_element(containerId, element) {
     // For use by the tutorials
     var container = $('#' + containerId);
     var contWidth = container.width();
-    var elemLeft = $(element).offset().left - container.offset().left;
+    var contLeft = container.offset().left;
+    var elemLeft = $(element).offset().left - contLeft; // wrt container
     var elemWidth = element.width();
-    var isInView = (elemLeft >= 0 && ((elemLeft + elemWidth) <= contWidth));
+    var isInView = elemLeft >= 0 && (elemLeft + elemWidth) <= contWidth;
 
     if (!isInView) {
-        var scrollLeftValue = element.offset().left;
-        container.scrollLeft(scrollLeftValue);
+        container.scrollLeft(0);
+        var scrollTo = $(element).offset().left - contLeft;
+        container.scrollLeft(scrollTo);
     }
 }
 

diff --git a/codewof/templates/style/language-statistics.html b/codewof/templates/style/language-statistics.html
@@ -53,5 +53,6 @@ <h2 class="mt-3">
 {% endblock content %}
 
 {% block css %}
+    {{ block.super }}
     <link href="{% static 'css/style_checker.css' %}" rel="stylesheet">
 {% endblock css %}
diff --git a/codewof/templates/style/language.html b/codewof/templates/style/language.html
@@ -60,6 +60,7 @@ <h3>Your code</h3>
 {% endblock content_container %}
 
 {% block css %}
+    {{ block.super }}
     <link href="{% static 'css/style_checker.css' %}" rel="stylesheet">
 {% endblock css %}
 

diff --git a/requirements/local.txt b/requirements/local.txt
@@ -20,5 +20,5 @@ pydocstyle==5.1.1
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.0.7  # https://github.com/django-extensions/django-extensions
+django-extensions==3.0.8  # https://github.com/django-extensions/django-extensions
 pytest-django==3.9.0  # https://github.com/pytest-dev/pytest-django