Merge branch 'style_docutil_17_adjustments' of https://github.com/ascholerChemeketa/RunestoneComponents

Author: bnmnetp

requirements-dev.txt

@@ -44,7 +44,7 @@ cryptography==36.0.1
     # via
     #   pyopenssl
     #   urllib3
-docutils==0.16
+docutils==0.17.1
     # via
     #   codechat
     #   myst-parser

requirements.txt

@@ -18,7 +18,7 @@ codechat==1.9.0
     # via -r requirements.in
 cogapp==3.3.0
     # via -r requirements.in
-docutils==0.16
+docutils==0.17.1
     # via
     #   codechat
     #   sphinx

runestone/activecode/activecode.py

@@ -73,7 +73,7 @@ def setup(app):
 """
 
 TEMPLATE_START = """
-<div class="%(divclass)s">
+<div class="%(divclass)s %(optclass)s">
 <div data-component="activecode" id=%(divid)s data-question_label="%(question_label)s">
 <div id=%(divid)s_question class="ac_question col-md-12">
 """

runestone/activecode/css/activecode.css

@@ -49,28 +49,20 @@
     border: 0;
 }
 
-.ac_section {
+#main-content section .runestone.ac_section .ac_section {
     position: relative;
     margin-right: auto;
     margin-left: auto;
     max-width: 800px;
     clear: both;
 }
 
-.ac_section > *:not(.ac_section) {
-    max-width: 500pt;
-    margin-left: auto;
-    margin-right: auto;
-    position: relative;
-}
-
 .ac_section .clearfix {
     position: initial;
 }
 
 .ac_output {
     display: none;
-    max-width: 450px;
     background-color: inherit;
 }
 .ac_output pre {

runestone/activecode/js/activecode.js

@@ -893,7 +893,7 @@ export class ActiveCode extends RunestoneBase {
         var embedUrlStr = `${srcURL}#${srcVars}`;
         var myIframe = document.createElement("iframe");
         myIframe.setAttribute("id", this.divid + "_codelens");
-        myIframe.setAttribute("width", "800");
+        myIframe.setAttribute("width", "100%");
         myIframe.setAttribute("height", "500");
         myIframe.setAttribute("style", "display:block");
         myIframe.style.background = "#fff";
@@ -924,7 +924,7 @@ export class ActiveCode extends RunestoneBase {
         srcURL = eBookConfig.app + "/admin/diffviewer?divid=" + div_id;
         myIframe = document.createElement("iframe");
         myIframe.setAttribute("id", div_id + "_coach");
-        myIframe.setAttribute("width", "800px");
+        myIframe.setAttribute("width", "100%");
         myIframe.setAttribute("height", "500px");
         myIframe.setAttribute("style", "display:block");
         myIframe.style.background = "#fff";

runestone/animation/animation.py

@@ -29,7 +29,7 @@ def setup(app):
 
 
 SRC = """
-<div id="%(divid)s">
+<div id="%(divid)s" class="%(optclass)s">
 <canvas id="%(divid)s_canvas" width="400" height="400" style="border:4px solid blue"></canvas>
 <br />
 <button onclick="%(divid)s_anim = %(divid)s_init('%(divid)s')">Initialize</button>
@@ -60,12 +60,15 @@ class Animation(RunestoneIdDirective):
     optional_arguments = 1
     final_argument_whitespace = True
     has_content = False
-    option_spec = {
-        "modelfile": directives.unchanged,
-        "viewerfile": directives.unchanged,
-        "model": directives.unchanged,
-        "viewer": directives.unchanged,
-    }
+    option_spec = RunestoneIdDirective.option_spec.copy()
+    option_spec.update(
+        {
+            "modelfile": directives.unchanged,
+            "viewerfile": directives.unchanged,
+            "model": directives.unchanged,
+            "viewer": directives.unchanged,
+        }
+    )
 
     def run(self):
         """

runestone/blockly/blockly.py

@@ -207,7 +207,8 @@ class Blockly(RunestoneIdDirective):
     required_arguments = 1
     optional_arguments = 0
     has_content = True
-    option_spec = {}
+    option_spec = RunestoneIdDirective.option_spec.copy()
+    option_spec.update( {} )
 
     def run(self):
         super(Blockly, self).run()

runestone/clickableArea/clickable.py

@@ -35,7 +35,7 @@ def setup(app):
 
 
 TEMPLATE = """
-<div class="runestone">
+<div class="runestone %(optclass)s">
 <div data-component="clickablearea" class="%(divclass)s" id="%(divid)s" data-question_label="%(question_label)s" %(optional)s %(table)s %(correct)s %(incorrect)s style="visibility: hidden;">
 <span data-question>%(qnumber)s: %(question)s</span>%(feedback)s%(clickcode)s
 """

runestone/codelens/visualizer.py

@@ -37,7 +37,7 @@ def setup(app):
 #  data-tracefile="pytutor-embed-demo/java.json"
 
 VIS = """
-<div class="runestone" style="max-width: none;">
+<div class="runestone codelens %(optclass)s">
     <div class="%(divclass)s" data-component="codelens" data-question_label="%(question_label)s">
         <div class="pytutorVisualizer" id="%(divid)s"
            data-params='{"embeddedMode": true, "lang": "%(language)s", "jumpToEnd": false}'>