@instructure/quiz-core 20.38.0 → 21.0.1-rc.0

package/lib/common/components/resources/item/ItemEdit/presenter.js

@@ -21,7 +21,6 @@ var _componentForItem = _interopRequireDefault(require("../../../../util/compone
 var _quizCommon = require("@instructure/quiz-common");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 var _interactionTypePropsHelper = require("../../../../util/interactionTypePropsHelper.js");
-var _ElementsForSelectors = _interopRequireDefault(require("../../../../../common/util/ElementsForSelectors.js"));
 var _instUIMessages = require("../../../../util/instUIMessages.js");
 var ItemEdit = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(ItemEdit, _Component);
@@ -40,9 +39,6 @@ var ItemEdit = /*#__PURE__*/function (_Component) {
       }
       return null;
     };
-    _this.applicationElement = function () {
-      return (0, _ElementsForSelectors.default)(_this.props.appContainer);
-    };
     _this.onModalOpen = function () {
       _this.props.occludeQuizEntries(true);
     };
@@ -105,7 +101,6 @@ var ItemEdit = /*#__PURE__*/function (_Component) {
           component: /*#__PURE__*/_react.default.createElement(_OutcomeAlignments.default, Object.assign({
             artifactType: "quizEntry",
             artifactId: itemId,
-            applicationElement: this.applicationElement,
             alignmentSetId: outcomeAlignmentSetGuid,
             contextUuid: this.props.contextUuid
           }, launchContexts.length > 0 && {

package/lib/common/components/resources/positionBox/theme.js

@@ -11,10 +11,10 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
   return {
     positionMargin: spacing.xSmall,
     positionPadding: spacing.xSmall,
-    positionBackgroundColor: colors.licorice,
+    positionBackgroundColor: colors.contrasts.grey125125,
     positionZIndex: '3333',
     positionDimension: '2em',
-    positionTextColor: colors.porcelain,
+    positionTextColor: colors.contrasts.grey1111,
     positionTextFontSize: typography.fontSizeMedium
   };
 };

package/lib/common/components/resources/quiz/AddContent/Body/theme.js

@@ -14,7 +14,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     phoneBreakPoint: "max-width: ".concat(breakpoints.medium),
     popoverContentMargin: spacing.medium,
     popoverHeaderBoxBorderWidth: borders.widthSmall,
-    popoverHeaderBoxBorderColor: colors.tiara
+    popoverHeaderBoxBorderColor: colors.contrasts.grey1214
   };
 };
 var _default = generateComponentTheme;

package/lib/common/components/resources/quiz/AddContent/Button/theme.js

@@ -14,16 +14,16 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     attachQuestionButtonHolderZIndex: '2222',
     newItemButtonMargin: spacing.xSmall,
     newItemButtonPadding: spacing.xSmall,
-    newItemButtonBackgroundColor: colors.brand,
+    newItemButtonBackgroundColor: colors.contrasts.blue4570,
     newItemButtonBorderRadius: spacing.large,
-    newItemButtonColor: colors.white,
-    newItemButtonFocusOutline: "2px solid ".concat(colors.brand),
+    newItemButtonColor: colors.contrasts.white1010,
+    newItemButtonFocusOutline: "2px solid ".concat(colors.contrasts.blue4570),
     newItemButtonFocusOutlineOffset: spacing.xxxSmall,
     newItemButtonFontSize: typography.fontSizeMedium,
     newItemButtonFontWeight: typography.fontWeightBold,
     newItemButtonZIndex: '4444',
     newItemButtonBoxShadow: '2px 2px 3px #ddd',
-    newItemButtonEditingBackgroundColor: colors.crimson,
+    newItemButtonEditingBackgroundColor: colors.contrasts.red4570,
     newItemButtonHolderZIndex: '2222',
     newItemButtonTransition: "background-color ".concat(transitions.duration, " linear, transform ").concat(transitions.duration, " ease")
   };

package/lib/common/components/resources/quiz/AddContent/Popover/presenter.js

@@ -14,7 +14,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _uiPopover = require("@instructure/ui-popover");
 var _emotion = require("@instructure/emotion");
 var _CustomPropTypes = _interopRequireDefault(require("../../../../../util/CustomPropTypes.js"));
-var _ElementsForSelectors = _interopRequireDefault(require("../../../../../util/ElementsForSelectors.js"));
 var _windowChecks = require("../../../../../util/windowChecks.js");
 var _index = _interopRequireDefault(require("../Button/index.js"));
 var _index2 = _interopRequireDefault(require("../Body/index.js"));
@@ -33,9 +32,6 @@ var AddContentPopover = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defa
       args[_key] = arguments[_key];
     }
     _this = _super.call.apply(_super, [this].concat(args));
-    _this.applicationElement = function () {
-      return (0, _ElementsForSelectors.default)(_this.props.appContainer);
-    };
     _this.showContent = function () {
       _this.props.switchOnEditing();
     };

package/lib/common/components/resources/quiz/AddContent/Popover/theme.js

@@ -9,7 +9,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     borders = _ref.borders;
   return {
     borderLineBorderWidth: borders.widthMedium,
-    borderLineBorderColor: colors.porcelain
+    borderLineBorderColor: colors.contrasts.grey1111
   };
 };
 var _default = generateComponentTheme;

package/lib/common/components/resources/sessionItemResult/ResultStimulus/theme.js

@@ -12,16 +12,16 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     breakpoints = _ref.breakpoints;
   return {
     rootBorderWidth: borders.widthSmall,
-    rootBorderColor: colors.porcelain,
+    rootBorderColor: colors.contrasts.grey1111,
     instructionsPaddingTopBottom: spacing.medium,
     instructionsPaddingLeftRight: spacing.large,
     instructionsBorderWidth: borders.widthSmall,
-    instructionsBorderColor: colors.porcelain,
+    instructionsBorderColor: colors.contrasts.grey1111,
     instructionsHeaderPadding: spacing.xSmall,
     instructionsHeaderFontWeight: typography.fontWeightBold,
     infoPaddingTopBottom: spacing.small,
     infoPaddingLeftRight: spacing.medium,
-    infoBackgroundColor: colors.porcelain,
+    infoBackgroundColor: colors.contrasts.grey1111,
     headerPaddingTop: spacing.xSmall,
     headerPaddingBottom: spacing.small,
     titleFontSize: typography.fontSizeMedium,
@@ -32,7 +32,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     phoneInstructionsPaddingLeftRight: spacing.small,
     phoneInfoPadding: spacing.small,
     phoneConnectingLinesBorderWidth: borders.widthSmall,
-    phoneConnectingLinesBorderColor: colors.tiara,
+    phoneConnectingLinesBorderColor: colors.contrasts.grey1214,
     phoneConnectingLinesMargin: spacing.small
   };
 };

package/lib/common/components/resources/sessionItemResult/SessionItemResult/presenter.js

@@ -115,7 +115,7 @@ var SessionItemResult = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defa
         size: "small",
         margin: "small"
       }, (0, _emotion.jsx)(_uiText.Text, {
-        color: "warning"
+        color: "alert"
       }, (0, _formatMessage.default)("Regrade score { possible, plural,\n              one   {{points, number} / # point}\n              other {{points, number} / # points}\n            }", {
         points: this.props.sessionItemResult.regradeInfo.get('newScore') || 0,
         possible: this.props.sessionItemResult.regradeInfo.get('newPointsPossible')

package/lib/common/components/resources/sessionItemResult/SessionItemResult/theme.js

@@ -12,9 +12,9 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
   return {
     sessionItemResultPadding: spacing.small,
     topBorderWidth: borders.widthSmall,
-    topBorderColor: colors.tiara,
+    topBorderColor: colors.contrasts.grey1214,
     resultMargin: spacing.small,
-    pointsColor: colors.ash,
+    pointsColor: colors.contrasts.grey4570,
     pointFontSize: typography.fontSizeXSmall,
     questionFontSize: typography.fontSizeMedium,
     itemFeedbackWrapperMargin: spacing.small,
@@ -23,9 +23,9 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     itemFeedbackWrapperFontSize: typography.fontSizeSmall,
     itemFeedbackWrapperBorderStyle: borders.borderStyle,
     itemFeedbackWrapperBorderWidth: borders.widthSmall,
-    itemFeedbackWrapperBorderColor: colors.tiara,
+    itemFeedbackWrapperBorderColor: colors.contrasts.grey1214,
     itemFeedbackWrapperStyle: borders.style,
-    itemFeedbackLabelColor: colors.oxford,
+    itemFeedbackLabelColor: colors.contrasts.grey100100,
     itemFeedbackLabelFontSize: typography.fontSizeXSmall,
     itemFeedbackMargin: spacing.xxSmall,
     itemFeedbackTextSize: typography.fontSizeMedium,

package/lib/common/components/resources/sessionItemResult/SessionItemResultsList/theme.js

@@ -14,7 +14,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     sessionItemResultsListHeaderWrapperMarginLeftRight: spacing.large,
     sessionItemResultsListHeaderFontSize: typography.fontSizeXLarge,
     sessionItemResultsListMargin: spacing.xSmall,
-    sessionItemResultsListBorderColor: colors.tiara,
+    sessionItemResultsListBorderColor: colors.contrasts.grey1214,
     sessionItemResultsListBorderWidth: borders.widthSmall
   };
 };

package/lib/common/components/resources/stimulus/Stimulus/presenter.js

@@ -74,6 +74,11 @@ var Stimulus = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _the
         lockBlueprintContentEnabled = _this$props2.lockBlueprintContentEnabled;
       return lockBlueprintContentEnabled && isContentLockedByBlueprint;
     }
+  }, {
+    key: "isPassage",
+    value: function isPassage() {
+      return this.props.stimulus.passage;
+    }
   }, {
     key: "renderChildQuizEntries",
     value: function renderChildQuizEntries() {
@@ -101,9 +106,10 @@ var Stimulus = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _the
     key: "renderStimulusPanel",
     value: function renderStimulusPanel() {
       var StimulusComponent = this.props.isEditing ? _index2.default : _index3.default;
+      var automationPrefix = this.isPassage() ? 'passage' : 'stimulus';
       var connectDragPreview = this.props.connectDragPreview;
       return connectDragPreview((0, _emotion.jsx)("div", {
-        "data-automation": "sdk-stimulus-LeftPanelShow"
+        "data-automation": "sdk-".concat(automationPrefix, "-LeftPanelShow")
       }, (0, _emotion.jsx)(StimulusComponent, {
         bankEntryWarningWrapperProps: this.props.bankEntryWarningWrapperProps,
         connectDragSource: this.props.connectDragSource,
@@ -128,18 +134,18 @@ var Stimulus = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _the
   }, {
     key: "renderPanels",
     value: function renderPanels(propsForDnDZone) {
-      var isPassage = this.props.stimulus.passage;
+      var automationPrefix = this.isPassage() ? 'passage' : 'stimulus';
       return (0, _emotion.jsx)("div", {
         css: this.props.styles.stimulus,
         ref: this.props.dndRef,
-        "data-automation": "sdk-stimulus"
+        "data-automation": "sdk-".concat(automationPrefix)
       }, (0, _emotion.jsx)("div", {
         css: this.props.styles.leftPanel
       }, this.renderStimulusPanel()), (0, _emotion.jsx)("div", {
         css: this.props.styles.itemPanel
-      }, (0, _emotion.jsx)("div", null), this.renderChildQuizEntries(), !isPassage && (0, _emotion.jsx)(_index4.default, Object.assign({}, propsForDnDZone, {
+      }, (0, _emotion.jsx)("div", null), this.renderChildQuizEntries(), !this.isPassage() && (0, _emotion.jsx)(_index4.default, Object.assign({}, propsForDnDZone, {
         location: "in"
-      })), this.props.childEntries.size === 0 && !this.isQuizContentLocked() && !isPassage && (0, _emotion.jsx)(_index.default, {
+      })), this.props.childEntries.size === 0 && !this.isQuizContentLocked() && !this.isPassage() && (0, _emotion.jsx)(_index.default, {
         allowStimulusCreation: false,
         stimulusId: this.props.stimulus.id,
         parentEntryId: this.props.quizEntry.id,

package/lib/common/components/resources/stimulus/Stimulus/theme.js

@@ -12,7 +12,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
   return {
     leftPanelPadding: spacing.xxSmall,
     leftPanelBorderWidth: borders.widthSmall,
-    leftPanelBorderColor: colors.tiara,
+    leftPanelBorderColor: colors.contrasts.grey1214,
     rightPanelPadding: spacing.xSmall,
     dragAndDropHandleZIndex: '3333',
     dragAndDropHandleFontSize: typography.fontSizeMedium,

package/lib/common/components/resources/stimulus/StimulusEdit/presenter.js

@@ -65,6 +65,7 @@ var StimulusEdit = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
       _this.props.setUi(_quizCommon.SHOULD_CLONE_ITEM, false);
     };
     _this.handleDeleteTemporary = function () {
+      var isPassage = _this.isPassage();
       _this.props.withConfirm(function () {
         _this.onCancel();
         _this.props.setUi(_quizCommon.DELETED_QUIZ_ENTRY, {
@@ -72,10 +73,11 @@ var StimulusEdit = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
           inStimulus: false
         });
       }, {
-        title: (0, _formatMessage.default)('Confirm Stimulus Removal'),
-        text: (0, _formatMessage.default)('Are you sure you want to remove this stimulus?'),
-        continueText: (0, _formatMessage.default)('Remove Stimulus'),
-        cancelText: (0, _formatMessage.default)('Keep Stimulus')
+        title: isPassage ? (0, _formatMessage.default)('Confirm Passage Removal') : (0, _formatMessage.default)('Confirm Stimulus Removal'),
+        text: isPassage ? (0, _formatMessage.default)('Are you sure you want to remove this passage?') : (0, _formatMessage.default)('Are you sure you want to remove this stimulus?'),
+        continueText: isPassage ? (0, _formatMessage.default)('Remove Passage') : (0, _formatMessage.default)('Remove Stimulus'),
+        cancelText: isPassage ? (0, _formatMessage.default)('Keep Passage ') : (0, _formatMessage.default)('Keep Stimulus'),
+        automationPrefix: isPassage ? 'passage' : 'stimulus'
       });
     };
     _this.handleDeleteStimulus = function () {
@@ -300,6 +302,12 @@ var StimulusEdit = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
         outsideApp = _checkClickedNode.outsideApp;
       return outsideApp || !isEndEditingTrigger;
     }
+  }, {
+    key: "isPassage",
+    value: function isPassage() {
+      var _this$props$stimulus;
+      return (_this$props$stimulus = this.props.stimulus) === null || _this$props$stimulus === void 0 ? void 0 : _this$props$stimulus.passage;
+    }
   }, {
     key: "afterSubmit",
     value: function afterSubmit() {
@@ -327,8 +335,7 @@ var StimulusEdit = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
   }, {
     key: "renderAddToBankOptions",
     value: function renderAddToBankOptions() {
-      var _this$props$stimulus;
-      var paddingTopStyle = ((_this$props$stimulus = this.props.stimulus) === null || _this$props$stimulus === void 0 ? void 0 : _this$props$stimulus.passage) ? {
+      var paddingTopStyle = this.isPassage() ? {
         padding: 'small 0 0'
       } : {};
       return (0, _emotion.jsx)(_uiView.View, Object.assign({
@@ -353,7 +360,8 @@ var StimulusEdit = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
   }, {
     key: "renderStimulusEdit",
     value: function renderStimulusEdit() {
-      var stimulusLabel = this.props.stimulus.passage ? (0, _formatMessage.default)('Passage') : (0, _formatMessage.default)('Stimulus');
+      var stimulusLabel = this.isPassage() ? (0, _formatMessage.default)('Passage') : (0, _formatMessage.default)('Stimulus');
+      var automationPrefix = this.isPassage() ? 'passage' : 'stimulus';
       return (0, _emotion.jsx)("div", null, (0, _emotion.jsx)("div", {
         css: this.props.styles.stimulus,
         ref: this.handleRef
@@ -387,7 +395,7 @@ var StimulusEdit = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
       }, (0, _emotion.jsx)(_uiButtons.Button, {
         type: "button",
         onClick: this.onCancel,
-        "data-automation": "sdk-stimulus-discardButton"
+        "data-automation": "sdk-".concat(automationPrefix, "-discardButton")
       }, (0, _formatMessage.default)('Cancel'))), (0, _emotion.jsx)("div", {
         className: "submitButtonWrapper",
         css: this.props.styles.buttonWrapper
@@ -396,7 +404,7 @@ var StimulusEdit = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default,
         color: "primary",
         disabled: !this.state.canSubmit,
         onClick: this.onSubmit,
-        "data-automation": "sdk-stimulus-done-button"
+        "data-automation": "sdk-".concat(automationPrefix, "-done-button")
       }, (0, _formatMessage.default)('Done')))));
     }
   }, {

package/lib/common/components/resources/stimulus/StimulusEdit/theme.js

@@ -15,7 +15,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     optionPadding: spacing.small,
     stimulusContentPadding: spacing.small,
     stimulusContentPaddingBottom: spacing.small,
-    stimulusButtonsColor: colors.oxford,
+    stimulusButtonsColor: colors.contrasts.grey100100,
     stimulusButtonsZIndex: '3333'
   };
 };

package/lib/common/components/resources/stimulus/StimulusEditInfo/presenter.js

@@ -146,6 +146,7 @@ var StimulusEditInfo = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
       var stimulus = this.props.workingStimulus;
       var textAreaId = "stimulusBodyEdit_".concat(stimulus.id, "_").concat(this.props.isBankedContent);
       var stimulusBodyId = "stimulusBodyEdit_".concat(stimulus.id, "_body");
+      var automationPrefix = stimulus.passage ? 'passage' : 'stimulus';
       return (0, _emotion.jsx)(_quizCommon.FormFieldGroup, {
         messages: this.inputErrors('onSelf'),
         description: (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Edit Stimulus'))
@@ -161,7 +162,7 @@ var StimulusEditInfo = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
         ref: this.props.setTitleRef,
         onChange: this.onTextInputChange('title'),
         value: stimulus.get('title'),
-        "data-automation": "sdk-stimulus-title-input"
+        "data-automation": "sdk-".concat(automationPrefix, "-title-input")
       })), this.renderInstructions(stimulus), (0, _emotion.jsx)("div", {
         css: this.props.styles.section
       }, (0, _emotion.jsx)(_quizCommon.FormField, {

package/lib/common/components/resources/stimulus/StimulusEditInfo/theme.js

@@ -10,7 +10,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     colors = _ref.colors;
   return {
     sectionPadding: spacing.small,
-    optionalLabelColor: colors.ash,
+    optionalLabelColor: colors.contrasts.grey4570,
     optionalLabelFontSize: typography.fontSizeXSmall,
     urlLabelMargin: spacing.xSmall
   };

package/lib/common/components/resources/stimulus/StimulusShowInfo/index.js

@@ -27,7 +27,9 @@ var StimulusShowInfo = /*#__PURE__*/function (_Component) {
   (0, _createClass2.default)(StimulusShowInfo, [{
     key: "render",
     value: function render() {
-      var instructions = this.props.stimulus.instructions && /*#__PURE__*/_react.default.createElement(_uiView.View, {
+      var stimulus = this.props.stimulus;
+      var automationPrefix = stimulus.passage ? 'passage' : 'stimulus';
+      var instructions = stimulus.instructions && /*#__PURE__*/_react.default.createElement(_uiView.View, {
         as: "div",
         padding: "small",
         margin: "x-small 0 0 0",
@@ -46,10 +48,10 @@ var StimulusShowInfo = /*#__PURE__*/function (_Component) {
         color: "primary",
         size: "small",
         weight: "bold"
-      }, this.props.stimulus.instructions))));
+      }, stimulus.instructions))));
       return /*#__PURE__*/_react.default.createElement(_uiView.View, {
         as: "div"
-      }, this.props.stimulus.title && /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
+      }, stimulus.title && /*#__PURE__*/_react.default.createElement(_uiHeading.Heading, {
         level: "h3",
         as: "h2",
         color: "primary",
@@ -57,8 +59,8 @@ var StimulusShowInfo = /*#__PURE__*/function (_Component) {
         themeOverride: {
           h2FontWeight: '700'
         }
-      }, this.props.stimulus.title), instructions, /*#__PURE__*/_react.default.createElement("div", {
-        "data-automation": "sdk-stimulus-LeftPanelShow-content"
+      }, stimulus.title), instructions, /*#__PURE__*/_react.default.createElement("div", {
+        "data-automation": "sdk-".concat(automationPrefix, "-LeftPanelShow-content")
       }, /*#__PURE__*/_react.default.createElement(_quizRce.RichContentRenderer, {
         content: this.props.stimulus.body
       })));

package/lib/common/components/shared/Card/CardContent/theme.js

@@ -12,13 +12,13 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     transitions = _ref.transitions;
   return {
     contentTransitionDuration: transitions.duration,
-    contentBackgroundColor: colors.white,
+    contentBackgroundColor: colors.contrasts.white1010,
     contentMaxWidth: '79.5rem',
     contentMargin: spacing.medium,
     phoneBreakPoint: "max-width: ".concat(breakpoints.medium),
     phoneContentMargin: spacing.xSmall,
     contentBoxShadow: shadows.depth1,
-    contentBorderColor: colors.tiara,
+    contentBorderColor: colors.contrasts.grey1214,
     contentBorderRadius: '4px'
   };
 };

package/lib/common/components/shared/InteractionTypes/theme.js

@@ -10,7 +10,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     spacing = _ref.spacing;
   return {
     stimulusDividerBorderWidth: borders.widthSmall,
-    stimulusDividerBorderColor: colors.ash,
+    stimulusDividerBorderColor: colors.contrasts.grey4570,
     stimulusDividerMarginTop: spacing.xSmall,
     stimulusDividerMarginBottom: spacing.small
   };

package/lib/common/components/shared/PaginatedCollection/theme.js

@@ -11,7 +11,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
   return {
     emptyPadding: spacing.small,
     emptyFontSize: typography.fontSizeLarge,
-    emptyColor: colors.ash
+    emptyColor: colors.contrasts.grey4570
   };
 };
 var _default = generateComponentTheme;

package/lib/common/components/shared/PrintTrigger/presenter.js

@@ -16,7 +16,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _uiOverlays = require("@instructure/ui-overlays");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 var _Spinner = require("../spinner/Spinner.js");
-var _ElementsForSelectors = _interopRequireDefault(require("../../../util/ElementsForSelectors.js"));
 var _CustomPropTypes = _interopRequireDefault(require("../../../util/CustomPropTypes.js"));
 var _printUtils = require("../../../util/printUtils.js");
 var _index = _interopRequireDefault(require("../../PrintFontSizeModal/index.js"));
@@ -82,9 +81,6 @@ var PrintTrigger = /*#__PURE__*/function (_Component) {
       });
       _this.props.openPrintFontSizeModal();
     };
-    _this.applicationElement = function () {
-      return (0, _ElementsForSelectors.default)(_this.props.appContainer);
-    };
     _this.onExited = function () {};
     _this.fontSize = '';
     return _this;
@@ -93,7 +89,6 @@ var PrintTrigger = /*#__PURE__*/function (_Component) {
     key: "render",
     value: function render() {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_uiOverlays.Overlay, {
-        applicationElement: this.applicationElement,
         open: this.state.waitingForPrintingToBeReady,
         shouldContainFocus: true,
         transition: "fade",

package/lib/common/components/shared/drag_and_drop/DragAndDropZone/theme.js

@@ -10,16 +10,16 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     borders = _ref.borders;
   return {
     DnDZoneBorderWidth: borders.widthSmall,
-    DnDZoneBorderColor: colors.tiara,
-    DnDZoneBackgroundColor: colors.porcelain,
+    DnDZoneBorderColor: colors.contrasts.grey1214,
+    DnDZoneBackgroundColor: colors.contrasts.grey1111,
     DnDZonePadding: spacing.medium,
     // sidebar:
     sidebarDnDZoneBorderWidth: borders.widthSmall,
-    sidebarDnDZoneBorderColor: colors.oxford,
-    sidebarDnDZoneBackgroundColor: colors.porcelain,
+    sidebarDnDZoneBorderColor: colors.contrasts.grey100100,
+    sidebarDnDZoneBackgroundColor: colors.contrasts.grey1111,
     sidebarDnDZonePadding: spacing.small,
     sidebarDnDZoneMargin: spacing.xSmall,
-    sidebarDnDZoneColor: colors.licorice
+    sidebarDnDZoneColor: colors.contrasts.grey125125
   };
 };
 var _default = generateComponentTheme;

package/lib/common/components/shared/errors/theme.js

@@ -10,7 +10,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
   return {
     errorFontFamily: typography.fontFamily,
     errorFontSize: typography.fontSizeSmall,
-    errorColor: colors.crimson
+    errorColor: colors.contrasts.red4570
   };
 };
 var _default = generateComponentTheme;

package/lib/common/components/shared/file_selector/theme.js

@@ -9,9 +9,9 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     spacing = _ref.spacing,
     borders = _ref.borders;
   return {
-    dropzoneBackgroundColor: colors.porcelain,
+    dropzoneBackgroundColor: colors.contrasts.grey1111,
     dropzoneBorderWidth: borders.widthSmall,
-    dropzoneBorderColor: colors.ash,
+    dropzoneBorderColor: colors.contrasts.grey4570,
     dropzonePadding: spacing.medium
   };
 };

package/lib/common/components/shared/overlay/theme.js

@@ -10,7 +10,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     spacing = _ref.spacing;
   return {
     overlayZIndex: '2222',
-    overlayBarColor: colors.electric,
+    overlayBarColor: colors.contrasts.blue4570,
     overlayBarSize: '0.3rem'
   };
 };

package/lib/moderating/components/events/theme.js

@@ -12,7 +12,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     embeddedImageMargin: spacing.xSmall,
     embeddedImagePadding: spacing.small,
     mediaToggleMargin: spacing.xSmall,
-    mediaToggleColor: colors.tiara
+    mediaToggleColor: colors.contrasts.grey1214
   };
 };
 var _default = generateComponentTheme;

package/lib/moderating/components/resources/ModerateTable/theme.js

@@ -9,7 +9,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     colors = _ref.colors;
   return {
     emptyTextMargin: spacing.small,
-    pageBackgroundColor: colors.white
+    pageBackgroundColor: colors.contrasts.white1010
   };
 };
 var _default = generateComponentTheme;

package/lib/reporting/components/charts/Distribution/theme.js

@@ -8,8 +8,8 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
   var colors = _ref.colors,
     typography = _ref.typography;
   return {
-    barFillColor: colors.electric,
-    barStarFillColor: colors.fire,
+    barFillColor: colors.contrasts.blue4570,
+    barStarFillColor: colors.contrasts.orange4570,
     barLabelColor: colors.textDarkest,
     barLabelFontFamily: typography.fontFamily,
     barLabelFontSize: typography.fontSizeSmall,

package/lib/reporting/components/charts/Legend/theme.js

@@ -11,11 +11,11 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     typography = _ref.typography;
   return {
     containerBorderWidth: borders.widthSmall,
-    containerBorderColor: colors.tiara,
+    containerBorderColor: colors.contrasts.grey1214,
     seriesContainerMargin: spacing.small,
     seriesContainerRowMargin: spacing.medium,
     seriesSwatchMargin: spacing.small,
-    seriesSwatchBackgroundColor: colors.electric,
+    seriesSwatchBackgroundColor: colors.contrasts.blue4570,
     seriesLabelFontFamily: typography.fontFamily,
     seriesLabelFontSize: typography.fontSizeXSmall,
     seriesLabelColor: colors.textDarkest

package/lib/reporting/components/itemAnalysis/AnswerFrequencySummary/theme.js

@@ -12,20 +12,20 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
     borders = _ref.borders,
     transitions = _ref.transitions;
   return {
-    contentCellBorderColor: colors.tiara,
+    contentCellBorderColor: colors.contrasts.grey1214,
     answerRowCellPadding: spacing.xSmall,
-    answerRowCorrectBackgroundColor: colors.white,
-    answerRowAnswerIconColor: colors.shamrock,
+    answerRowCorrectBackgroundColor: colors.contrasts.white1010,
+    answerRowAnswerIconColor: colors.contrasts.green4570,
     answerRowCorrectTextFieldFontWeight: typography.fontWeightBold,
-    answerRowCorrectBarBackgroundColor: colors.shamrock,
+    answerRowCorrectBarBackgroundColor: colors.contrasts.green4570,
     answerIconFontSize: typography.fontSizeXSmall,
-    answerIconColor: colors.ash,
+    answerIconColor: colors.contrasts.grey4570,
     answerTextfieldFontWeight: typography.fontWeightNormal,
-    respondentLinkColor: colors.ash,
-    respondentLinkPresentColor: colors.electric,
+    respondentLinkColor: colors.contrasts.grey4570,
+    respondentLinkPresentColor: colors.contrasts.blue4570,
     answerRatioPaddingLeft: spacing.small,
     barMinWidth: borders.widthSmall,
-    barBackgroundColor: colors.licorice,
+    barBackgroundColor: colors.contrasts.grey125125,
     phoneBreakPoint: "max-width: ".concat(breakpoints.medium),
     barTransition: "width ".concat(transitions.duration)
   };

package/lib/reporting/components/itemAnalysis/ItemAnalysisRow/theme.js

@@ -12,20 +12,20 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
   return {
     itemAnalysisRowPadding: spacing.small,
     itemAnalysisRowMargin: spacing.small,
-    headerTextColor: colors.ash,
+    headerTextColor: colors.contrasts.grey4570,
     headerTextFontSize: typography.fontSizeXSmall,
     metricNoteFontSize: typography.fontSizeMedium,
-    metricNoteColor: colors.ash,
+    metricNoteColor: colors.contrasts.grey4570,
     metricsRowLowerPadding: spacing.large,
     stemFontSize: typography.fontSizeXSmall,
     stemLineHeight: typography.lineHeight,
     stemMargin: spacing.small,
     emptyTextPadding: spacing.small,
-    emptyTextColor: colors.ash,
+    emptyTextColor: colors.contrasts.grey4570,
     answerDistributionPadding: spacing.small,
     answerDistributionChartPadding: spacing.small,
     answerDistributionLegendPadding: spacing.small,
-    answerDistributionSwatchColor: colors.electric,
+    answerDistributionSwatchColor: colors.contrasts.blue4570,
     phoneBreakPoint: "max-width: ".concat(breakpoints.medium)
   };
 };

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/LegacyChoiceType/ChoiceTypeTableRow/theme.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 var generateComponentTheme = function generateComponentTheme(_ref) {
   var colors = _ref.colors;
   return {
-    colorGreen: colors.shamrock,
+    colorGreen: colors.contrasts.green4570,
     cellPadding: '0.75rem 0.75rem'
   };
 };

package/lib/reporting/components/resources/NewQuizAndItemAnalysis/AnswerFrequencySummary/shared/AggregationTable/theme.js

@@ -7,11 +7,11 @@ exports.default = void 0;
 var generateComponentTheme = function generateComponentTheme(_ref) {
   var colors = _ref.colors;
   return {
-    colorGreen: colors.shamrock,
-    colorBlue: colors.brand,
-    colorRed: colors.crimson,
-    colorGrey: colors.ash,
-    colorHeaderBottomBorder: colors.tiara,
+    colorGreen: colors.contrasts.green4570,
+    colorBlue: colors.contrasts.blue4570,
+    colorRed: colors.contrasts.red4570,
+    colorGrey: colors.contrasts.grey4570,
+    colorHeaderBottomBorder: colors.contrasts.grey1214,
     cellPadding: '13.5px 13.5px;'
   };
 };