- {brandString}
+ ?
+
:
- {brandString}
+
}
diff --git a/src/components/Tooltip.js b/src/components/Tooltip.js
new file mode 100644
index 00000000000..e27c4c9aa4f
--- /dev/null
+++ b/src/components/Tooltip.js
@@ -0,0 +1,22 @@
+import Tooltip from "@material-ui/core/Tooltip";
+import { withStyles } from "@material-ui/core/styles";
+
+export const ProgressTooltip = withStyles((theme) => ({
+ tooltip: {
+ backgroundColor: "rgba(97,97,97,0.9)",
+ color: "#fff",
+ padding: 16,
+ borderRadius: 6,
+ width: 280,
+ maxWidth: 280,
+ boxSizing: "border-box",
+ fontFamily: theme.typography.fontFamily,
+ boxShadow: "none",
+ },
+ arrow: { color: "rgba(97,97,97,0.9)" },
+}))(Tooltip);
+
+export const InfoTooltip = withStyles(() => ({
+ tooltip: { backgroundColor: "rgba(97,97,97,0.9)", color:"#fff", padding:12, borderRadius:6, maxWidth:240, fontFamily:"Inter, sans-serif", boxShadow:"none" },
+ arrow: { color: "rgba(97,97,97,0.9)" },
+}))(Tooltip);
\ No newline at end of file
diff --git a/src/components/problem-input/MultipleChoice.js b/src/components/problem-input/MultipleChoice.js
index 8742a92f16d..618aa796d11 100644
--- a/src/components/problem-input/MultipleChoice.js
+++ b/src/components/problem-input/MultipleChoice.js
@@ -36,12 +36,12 @@ class MultipleChoice extends React.Component {
}
return (
-
+
{choices.length > 0
? choices.map((choice, i) =>
- }
+ }
label={renderText(choice, null, variabilization, this.context)}
key={choice}/>)
: "Error: This problem has no answer choices. Please submit feedback."}
diff --git a/src/components/problem-layout/HintTextbox.js b/src/components/problem-layout/HintTextbox.js
index 959b71eea4f..37579486193 100644
--- a/src/components/problem-layout/HintTextbox.js
+++ b/src/components/problem-layout/HintTextbox.js
@@ -32,6 +32,7 @@ class HintTextbox extends React.Component {
isCorrect: context.use_expanded_view && context.debug ? true : null,
checkMarkOpacity: context.use_expanded_view && context.debug ? '100' : '0',
showHints: false,
+ answerSelected: false
}
}
@@ -74,7 +75,11 @@ class HintTextbox extends React.Component {
setInputValState = (inputVal) => {
// console.debug("new inputVal state: ", inputVal)
- this.setState(({ isCorrect }) => ({ inputVal, isCorrect: isCorrect ? true : null }))
+ this.setState(({ isCorrect }) => ({
+ inputVal,
+ isCorrect: isCorrect ? true : null,
+ answerSelected: inputVal.trim() !== ""
+ }))
}
render() {
@@ -130,7 +135,7 @@ class HintTextbox extends React.Component {
+
+
+