Merge branch 'master' into asad/pick-csrf-from-cookie

Author: pdpinch

requirements/edx/base.txt

@@ -829,7 +829,7 @@ openedx-calc==5.0.0
     # via
     #   -r requirements/edx/kernel.in
     #   xblocks-contrib
-openedx-core==0.38.0
+openedx-core==0.38.2
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/edx/kernel.in
@@ -1299,7 +1299,7 @@ xblock-utils==4.0.0
     # via
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.15.2
+xblocks-contrib==0.15.3
     # via -r requirements/edx/bundled.in
 xmlsec==1.3.14
     # via

requirements/edx/development.txt

@@ -1382,7 +1382,7 @@ openedx-calc==5.0.0
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   xblocks-contrib
-openedx-core==0.38.0
+openedx-core==0.38.2
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/edx/doc.txt
@@ -2326,7 +2326,7 @@ xblock-utils==4.0.0
     #   -r requirements/edx/testing.txt
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.15.2
+xblocks-contrib==0.15.3
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt

requirements/edx/doc.txt

@@ -1007,7 +1007,7 @@ openedx-calc==5.0.0
     # via
     #   -r requirements/edx/base.txt
     #   xblocks-contrib
-openedx-core==0.38.0
+openedx-core==0.38.2
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/edx/base.txt
@@ -1637,7 +1637,7 @@ xblock-utils==4.0.0
     #   -r requirements/edx/base.txt
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.15.2
+xblocks-contrib==0.15.3
     # via -r requirements/edx/base.txt
 xmlsec==1.3.14
     # via

requirements/edx/testing.txt

@@ -1056,7 +1056,7 @@ openedx-calc==5.0.0
     # via
     #   -r requirements/edx/base.txt
     #   xblocks-contrib
-openedx-core==0.38.0
+openedx-core==0.38.2
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/edx/base.txt
@@ -1732,7 +1732,7 @@ xblock-utils==4.0.0
     #   -r requirements/edx/base.txt
     #   edx-sga
     #   xblock-poll
-xblocks-contrib==0.15.2
+xblocks-contrib==0.15.3
     # via -r requirements/edx/base.txt
 xmlsec==1.3.14
     # via

xmodule/static/css-builtin-blocks/VideoBlockDisplay.css

@@ -96,6 +96,9 @@
 }
 
 .xmodule_display.xmodule_VideoBlock .video .wrapper-downloads .wrapper-download-video .video-sources {
+    /* Match it with Transcipts */
+    font-size: 16px !important;
+    font-weight: unset;
     margin: 0;
 }
 

xmodule/tests/test_poll.py

@@ -33,9 +33,9 @@ def setUp(self):
         super().setUp()
         course_key = CourseKey.from_string('org/course/run')
         self.system = get_test_system(course_key)
-        usage_key = course_key.make_usage_key(self.poll_block_class.category, 'test_loc')
+        usage_key = course_key.make_usage_key('poll_question', 'test_loc')
         # ScopeIds has 4 fields: user_id, block_type, def_id, usage_id
-        self.scope_ids = ScopeIds(1, self.poll_block_class.category, usage_key, usage_key)
+        self.scope_ids = ScopeIds(1, 'poll_question', usage_key, usage_key)
         self.xblock = self.poll_block_class(
             self.system, DictFieldData(self.raw_field_data), self.scope_ids
         )
@@ -68,7 +68,7 @@ def test_poll_export_with_unescaped_characters_xml(self):
         unescaped characters.
         """
         module_system = DummyModuleStoreRuntime(load_error_blocks=True)
-        module_system.id_generator.target_course_id = self.xblock.course_id
+        module_system.id_generator.target_course_id = self.xblock.context_key
         sample_poll_xml = '''
         <poll_question display_name="Poll Question">
             <p>How old are you?</p>