Merge branch 'main' into K12-90/Update-PSET-interactives

openstax · Jul 24, 2024 · 2f8a83b · 2f8a83b
2 parents f278d5e + 50dedcf
commit 2f8a83b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/docs/schemas.md b/docs/schemas.md
@@ -162,7 +162,7 @@ If students are entering something into a text block, be sure to follow these co
 The output if the `data-wait-for-event="eventnameY"` attribute is removed and the user submits an answer.
 
 <div style="text-align: center;">
-    <img src="./static/input_block.png" width="450">
+    <img src="./static/gen-input.png" width="450">
 </div>
 
 Notes on schema:

diff --git a/docs/static/gen-input.png b/docs/static/gen-input.png
diff --git a/docs/static/input_block.png b/docs/static/input_block.png
diff --git a/src/components/UserInputBlock.tsx b/src/components/UserInputBlock.tsx
@@ -105,9 +105,9 @@ export const UserInputBlock = ({ content, prompt, ack, waitForEvent, fireEvent,
               disabled={isSubmitting || responseSubmitted}
               rows={DEFAULT_TEXTAREA_ROWS}
               className={buildClassName(responseSubmitted, errors.response)}/>
-              <ErrorMessage className="text-danger my-3" component="div" name="response" />
+              <ErrorMessage className="text-danger my-2" component="div" name="response" />
               <div className='os-text-center mt-4'>
-              <button type="submit" disabled={isSubmitting || responseSubmitted} className="os-btn btn-outline-primary">{buttonText}</button>
+              <button type="submit" disabled={isSubmitting || responseSubmitted} className="os-submit-button-default-theme">{buttonText}</button>
               </div>
             </Form>
           )}

diff --git a/src/styles/bootstrap.scss b/src/styles/bootstrap.scss
@@ -149,6 +149,7 @@
   $os-default-answer-border-color: #424242;
   $os-medium-gray: #626262;
   $os-default-box-shadow: #808080;
+  $os-default-gray: #757575;
 
   // Extends Select Element for Dropdown Styles
   .os-form-select {
@@ -175,11 +176,15 @@
     border-radius: .3125rem;
     box-shadow: 0 .125rem .25rem 0 hsla(0deg 0% 46% / 25%);
   }
-
+  
   input.os-form-control {
     padding: 1rem 1.5rem;
   }
 
+  textarea.os-form-control {
+    padding: 1rem 1.5rem;
+  }
+
   math-field.os-form-control {
     padding: 0;
   }
@@ -207,7 +212,7 @@
 
     min-width: 1.2em;
     min-height: 1.2em;
-    border: .125rem solid $os-default-answer-border-color;
+    border: .125rem solid $os-default-gray;
   }
 
   // Extends Check Button for All Interactives