@instructure/quiz-core 20.37.1 → 21.0.0

package/es/banks/components/BankSearch/presenter.js

@@ -12,7 +12,6 @@ import { IconPlusLine } from '@instructure/ui-icons';
 import { Button, CondensedButton } from '@instructure/ui-buttons';
 import { Checkbox } from '@instructure/ui-checkbox';
 import { View } from '@instructure/ui-view';
-import { Flex } from '@instructure/ui-flex';
 import { Text } from '@instructure/ui-text';
 import { AccessibleContent, ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { jsx } from '@instructure/emotion';
@@ -21,7 +20,7 @@ import TagSuggestSelect from "../../../common/components/shared/TagSuggestSelect
 import { interactionTypesNameDictionary } from "../../../common/util/interactionTypeMetadata.js";
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
-import { TextInput, withStyleOverrides } from '@instructure/quiz-common';
+import { Flex, TextInput, withStyleOverrides } from '@instructure/quiz-common';
 var tagShape = PropTypes.shape({
   tag: PropTypes.shape({
     id: PropTypes.string,

package/es/banks/components/CreateBankModal/presenter.js

@@ -2,9 +2,9 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
-var _dec, _class, _CreateBankModal;
+var _CreateBankModal;
 /** @jsx jsx */
-import { Component } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Button, CloseButton } from '@instructure/ui-buttons';
 import { Checkbox } from '@instructure/ui-checkbox';
@@ -14,19 +14,14 @@ import { jsx } from '@instructure/emotion';
 import t from '@instructure/quiz-i18n/es/format-message';
 import Bank from "../../../common/records/Bank.js";
 import { toErrors } from "../../../common/util/instUIMessages.js";
-import { Modal, ModalHeader, ModalBody, ModalFooter, TextInput, XSMALL_SIDE_MARGIN, withStyleOverrides } from '@instructure/quiz-common';
-import generateStyle from "./styles.js";
-import generateComponentTheme from "./theme.js";
-export var CreateBankModal = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_CreateBankModal = /*#__PURE__*/function (_Component) {
+import { Modal, ModalHeader, ModalBody, ModalFooter, TextInput, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';
+export var CreateBankModal = /*#__PURE__*/function (_Component) {
   _inherits(CreateBankModal, _Component);
   var _super = _createSuper(CreateBankModal);
-  function CreateBankModal() {
+  function CreateBankModal(props) {
     var _this;
     _classCallCheck(this, CreateBankModal);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
+    _this = _super.call(this, props);
     _this.state = {
       shareWithCourse: false
     };
@@ -38,7 +33,8 @@ export var CreateBankModal = (_dec = withStyleOverrides(generateStyle, generateC
         _this.props.onCreateBank();
         _this.closeAction();
       } else {
-        _this.props.screenreaderNotification(t('Bank name cannot be blank.'));
+        var _this$bankNameInput$c;
+        (_this$bankNameInput$c = _this.bankNameInput.current) === null || _this$bankNameInput$c === void 0 ? void 0 : _this$bankNameInput$c.focus();
       }
     };
     _this.closeAction = function () {
@@ -68,6 +64,7 @@ export var CreateBankModal = (_dec = withStyleOverrides(generateStyle, generateC
         shareWithCourse: event.target.checked
       });
     };
+    _this.bankNameInput = /*#__PURE__*/React.createRef();
     return _this;
   }
   _createClass(CreateBankModal, [{
@@ -92,17 +89,14 @@ export var CreateBankModal = (_dec = withStyleOverrides(generateStyle, generateC
   }, {
     key: "renderContent",
     value: function renderContent() {
-      return jsx("div", {
-        css: this.props.styles.bankNameInput
-      }, jsx(TextInput, {
+      return jsx("div", null, jsx(TextInput, {
         messages: this.getErrors(),
         onChange: this.onNameChange,
-        renderLabel: jsx("div", {
-          css: this.props.styles.bankNameLabel
-        }, t('Bank Name')),
+        renderLabel: t('Bank Name'),
+        isRequired: true,
         type: "text",
-        placeholder: t('Enter a name...'),
-        "data-automation": "sdk-create-bank-name-textinput"
+        "data-automation": "sdk-create-bank-name-textinput",
+        ref: this.bankNameInput
       }), this.renderCheckbox());
     }
   }, {
@@ -134,7 +128,6 @@ export var CreateBankModal = (_dec = withStyleOverrides(generateStyle, generateC
         label: t('Item Bank'),
         "data-automation": "sdk-create-bank-modal"
       }, jsx(ModalHeader, null, jsx(Heading, {
-        level: "reset",
         as: "h2"
       }, t('New Item Bank')), jsx(CloseButton, {
         onClick: this.closeAction,
@@ -146,7 +139,11 @@ export var CreateBankModal = (_dec = withStyleOverrides(generateStyle, generateC
   }]);
   CreateBankModal.displayName = "CreateBankModal";
   return CreateBankModal;
-}(Component), _CreateBankModal.displayName = 'CreateBankModal', _CreateBankModal.componentId = "Quizzes".concat(_CreateBankModal.displayName), _CreateBankModal.propTypes = {
+}(Component);
+_CreateBankModal = CreateBankModal;
+CreateBankModal.displayName = 'CreateBankModal';
+CreateBankModal.componentId = "Quizzes".concat(_CreateBankModal.displayName);
+CreateBankModal.propTypes = {
   modalOpen: PropTypes.bool.isRequired,
   modalTrigger: PropTypes.instanceOf(Component),
   temporaryBank: PropTypes.instanceOf(Bank).isRequired,
@@ -169,11 +166,12 @@ export var CreateBankModal = (_dec = withStyleOverrides(generateStyle, generateC
     root_account_name: PropTypes.string
   }),
   styles: PropTypes.object
-}, _CreateBankModal.defaultProps = {
+};
+CreateBankModal.defaultProps = {
   displayError: false,
   modalTrigger: null,
   showShareBankOnCreate: false,
   itemBanksScope: {},
   onCreateBank: function onCreateBank() {}
-}, _CreateBankModal)) || _class);
+};
 export default CreateBankModal;

package/es/banks/components/EditBankModal/presenter.js

@@ -2,34 +2,32 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
-var _dec, _class, _EditBankModal;
+var _EditBankModal;
 /** @jsx jsx */
-import { Component } from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Button, CloseButton } from '@instructure/ui-buttons';
 import { Heading } from '@instructure/ui-heading';
 import { jsx } from '@instructure/emotion';
 import t from '@instructure/quiz-i18n/es/format-message';
 import { toErrors } from "../../../common/util/instUIMessages.js";
-import { Modal, ModalHeader, ModalBody, ModalFooter, TextInput, XSMALL_SIDE_MARGIN, withStyleOverrides } from '@instructure/quiz-common';
+import { Modal, ModalHeader, ModalBody, ModalFooter, TextInput, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';
 import Bank from "../../../common/records/Bank.js";
-import generateStyle from "./styles.js";
-import generateComponentTheme from "./theme.js";
-export var EditBankModal = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_EditBankModal = /*#__PURE__*/function (_Component) {
+export var EditBankModal = /*#__PURE__*/function (_Component) {
   _inherits(EditBankModal, _Component);
   var _super = _createSuper(EditBankModal);
-  function EditBankModal() {
+  function EditBankModal(props) {
     var _this;
     _classCallCheck(this, EditBankModal);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
+    _this = _super.call(this, props);
     _this.continueAction = function () {
       _this.props.showError(_this.props.errorKey);
       if (_this.props.workingBank.isValid()) {
         _this.props.updateBank(_this.props.workingBank);
         _this.closeAction();
+      } else {
+        var _this$bankNameInput$c;
+        (_this$bankNameInput$c = _this.bankNameInput.current) === null || _this$bankNameInput$c === void 0 ? void 0 : _this$bankNameInput$c.focus();
       }
     };
     _this.closeAction = function () {
@@ -51,6 +49,7 @@ export var EditBankModal = (_dec = withStyleOverrides(generateStyle, generateCom
         return toErrors(_this.props.workingBank.errorsFor('title').toJS());
       }
     };
+    _this.bankNameInput = /*#__PURE__*/React.createRef();
     return _this;
   }
   _createClass(EditBankModal, [{
@@ -75,17 +74,16 @@ export var EditBankModal = (_dec = withStyleOverrides(generateStyle, generateCom
   }, {
     key: "renderContent",
     value: function renderContent() {
-      return jsx("div", {
-        css: this.props.styles.bankNameInput
-      }, jsx(TextInput, {
+      return jsx(TextInput, {
         value: this.props.workingBank.title,
         messages: this.getErrors(),
         onChange: this.onNameChange,
-        renderLabel: jsx("div", null, t('Bank Name')),
+        renderLabel: t('Bank Name'),
         type: "text",
-        placeholder: t('Enter a name...'),
-        "data-automation": "sdk-edit-bank-name-textinput"
-      }));
+        isRequired: true,
+        "data-automation": "sdk-edit-bank-name-textinput",
+        ref: this.bankNameInput
+      });
     }
   }, {
     key: "render",
@@ -97,7 +95,6 @@ export var EditBankModal = (_dec = withStyleOverrides(generateStyle, generateCom
         label: t('Item Bank'),
         "data-automation": "sdk-edit-bank-modal"
       }, jsx(ModalHeader, null, jsx(Heading, {
-        level: "reset",
         as: "h2"
       }, t('Edit Item Bank')), jsx(CloseButton, {
         onClick: this.closeAction,
@@ -109,7 +106,11 @@ export var EditBankModal = (_dec = withStyleOverrides(generateStyle, generateCom
   }]);
   EditBankModal.displayName = "EditBankModal";
   return EditBankModal;
-}(Component), _EditBankModal.displayName = 'EditBankModal', _EditBankModal.componentId = "Quizzes".concat(_EditBankModal.displayName), _EditBankModal.propTypes = {
+}(Component);
+_EditBankModal = EditBankModal;
+EditBankModal.displayName = 'EditBankModal';
+EditBankModal.componentId = "Quizzes".concat(_EditBankModal.displayName);
+EditBankModal.propTypes = {
   modalOpen: PropTypes.bool.isRequired,
   modalTrigger: PropTypes.instanceOf(Component),
   workingBank: PropTypes.instanceOf(Bank).isRequired,
@@ -122,8 +123,9 @@ export var EditBankModal = (_dec = withStyleOverrides(generateStyle, generateCom
   hideError: PropTypes.func.isRequired,
   closeModal: PropTypes.func.isRequired,
   styles: PropTypes.object
-}, _EditBankModal.defaultProps = {
+};
+EditBankModal.defaultProps = {
   displayError: false,
   modalTrigger: null
-}, _EditBankModal)) || _class);
+};
 export default EditBankModal;

package/es/banks/components/SharingModal/presenter.js

@@ -22,7 +22,6 @@ import { Grid } from '@instructure/ui-grid';
 import { Tabs } from '@instructure/ui-tabs';
 import { Text } from '@instructure/ui-text';
 import { jsx } from '@instructure/emotion';
-import elementsForSelectors from "../../../common/util/ElementsForSelectors.js";
 import CustomPropTypes from "../../../common/util/CustomPropTypes.js";
 import ShareList from "./ShareList/index.js";
 import AsyncSearch from "../AsyncSearch/index.js";
@@ -54,9 +53,6 @@ export var SharingModalPresenter = (_dec = withStyleOverrides(generateStyle, gen
     };
     _this.shareListRef = null;
     _this.shareButtonRef = null;
-    _this.applicationElement = function () {
-      return elementsForSelectors(_this.props.appContainer);
-    };
     // =============
     //   LIFECYCLE
     // =============

package/es/building/api/stimuli.js

@@ -21,7 +21,8 @@ export function createStimulus(stimulus, parentId, parentType) {
     parent_stimulus_id: parentStimulusId,
     source_url: stimulus.sourceUrl,
     stimulus_type: stimulus.stimulusType,
-    title: stimulus.title
+    title: stimulus.title,
+    passage: stimulus.passage
   };
   var requestBody = JSON.stringify({
     stimulus: stimulusParams

package/es/building/components/resources/DeleteStimulusModal/presenter.js

@@ -114,6 +114,12 @@ export var DeleteStimulusModal = (_dec = withStyleOverrides(generateStyle, gener
         cancelText: t('Cancel')
       };
     }
+  }, {
+    key: "isPassage",
+    value: function isPassage() {
+      var _this$props$stimulusE;
+      return (_this$props$stimulusE = this.props.stimulusEntry) === null || _this$props$stimulusE === void 0 ? void 0 : _this$props$stimulusE.getEntry().passage;
+    }
   }, {
     key: "anyImmutableKeepers",
     value: function anyImmutableKeepers() {
@@ -142,8 +148,8 @@ export var DeleteStimulusModal = (_dec = withStyleOverrides(generateStyle, gener
       return jsx(Button, {
         onClick: this.closeAction,
         margin: XSMALL_SIDE_MARGIN,
-        "data-automation": "sdk-keep-stimulus-button"
-      }, t('Keep Stimulus'));
+        "data-automation": "sdk-keep-".concat(this.isPassage() ? 'passage' : 'stimulus', "-button")
+      }, this.isPassage() ? t('Keep Passage') : t('Keep Stimulus'));
     }
   }, {
     key: "doneButton",
@@ -157,8 +163,8 @@ export var DeleteStimulusModal = (_dec = withStyleOverrides(generateStyle, gener
         color: "primary",
         onClick: this.handleSubmit,
         margin: XSMALL_SIDE_MARGIN,
-        "data-automation": "sdk-remove-stimulus-button"
-      }, t('Remove Stimulus'));
+        "data-automation": "sdk-remove-".concat(this.isPassage() ? 'passage' : 'stimulus', "-button")
+      }, this.isPassage() ? t('Remove Passage') : t('Remove Stimulus'));
     }
   }, {
     key: "renderChooseWhich",
@@ -199,7 +205,8 @@ export var DeleteStimulusModal = (_dec = withStyleOverrides(generateStyle, gener
   }, {
     key: "renderContent",
     value: function renderContent() {
-      var content = this.props.childEntries.size === 0 ? jsx("span", null, t('Are you sure you want to remove this stimulus?')) : this.renderMainMenu();
+      var message = this.isPassage() ? t('Are you sure you want to remove this passage?') : t('Are you sure you want to remove this stimulus?');
+      var content = this.props.childEntries.size === 0 ? jsx("span", null, message) : this.renderMainMenu();
       var stimulusTitle = this.props.stimulusEntry && this.props.stimulusEntry.getEntry().title;
       return jsx("div", {
         className: "deleteStimulusModal",
@@ -215,11 +222,11 @@ export var DeleteStimulusModal = (_dec = withStyleOverrides(generateStyle, gener
         open: this.props.modalOpen,
         onDismiss: this.closeAction,
         size: "small",
-        label: t('Confirm Stimulus Removal')
+        label: this.isPassage() ? t('Confirm Passage Removal') : t('Confirm Stimulus Removal')
       }, jsx(ModalHeader, null, jsx(Heading, {
         level: "reset",
         as: "h2"
-      }, t('Confirm Stimulus Removal')), jsx(CloseButton, {
+      }, this.isPassage() ? t('Confirm Passage Removal') : t('Confirm Stimulus Removal')), jsx(CloseButton, {
         onClick: this.closeAction,
         placement: "end",
         offset: "medium",

package/es/building/components/resources/quizEntry/QuizEntry/presenter.js

@@ -38,10 +38,10 @@ export var QuizEntry = (_dec = withStyleOverrides(generateStyle, generateCompone
   function QuizEntry() {
     var _this;
     _classCallCheck(this, QuizEntry);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+    for (var _len = arguments.length, _args = new Array(_len), _key = 0; _key < _len; _key++) {
+      _args[_key] = arguments[_key];
     }
-    _this = _super.call.apply(_super, [this].concat(args));
+    _this = _super.call.apply(_super, [this].concat(_args));
     _this.itemOverrideTypes = function () {
       return ['choice'].concat(_toConsumableArray(_this.props.partialScoringEnabled ? ['multi-answer'] : []), _toConsumableArray(_this.props.partialDeepScoringEnabled ? ['matching'] : []));
     };
@@ -96,7 +96,14 @@ export var QuizEntry = (_dec = withStyleOverrides(generateStyle, generateCompone
     };
     _this.bankEntryWarningWrapperProps = function () {
       if (_this.props.quizEntry.entryEditable) {
-        var propsFunc = _this.props.quizEntry.hasStimulus ? propsForStimulusBankEntryEditPrompt : propsForItemBankEntryEditPrompt;
+        var _this$props$entry;
+        var isPassage = (_this$props$entry = _this.props.entry) === null || _this$props$entry === void 0 ? void 0 : _this$props$entry.passage;
+        var propsFunc = _this.props.quizEntry.hasStimulus ? function () {
+          for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+            args[_key2] = arguments[_key2];
+          }
+          return propsForStimulusBankEntryEditPrompt.apply(void 0, [isPassage].concat(args));
+        } : propsForItemBankEntryEditPrompt;
         return propsFunc(_this.isEditing(), _this.props.switchOffEditing, function () {
           var bankEntry = _this.props.quizEntry.getEntry();
           _this.props.setUi(BUILD_TRAY_OPEN, true);

package/es/building/components/resources/quizEntry/QuizEntryEdit/Footer/presenter.js

@@ -9,7 +9,6 @@ import { Component } from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { View } from '@instructure/ui-view';
-import { Flex } from '@instructure/ui-flex';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { Text } from '@instructure/ui-text';
 import NumberInput from '@instructure/quiz-number-input';
@@ -19,7 +18,7 @@ import { IconDiscussionLine, IconDiscussionSolid } from '@instructure/ui-icons';
 import { interactionPoints } from '@instructure/quiz-interactions';
 import t from '@instructure/quiz-i18n/es/format-message';
 import EntrySave from "../../../../../../common/components/resources/entry/EntrySave/index.js";
-import { ITEM_FEEDBACK_MODAL, ITEM_FEEDBACK_MODAL_ITEM, ITEM_FEEDBACK_MODAL_FEEDBACK, withStyleOverrides } from '@instructure/quiz-common';
+import { Flex, ITEM_FEEDBACK_MODAL, ITEM_FEEDBACK_MODAL_ITEM, ITEM_FEEDBACK_MODAL_FEEDBACK, withStyleOverrides } from '@instructure/quiz-common';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
 function pointsAsFloat(pointsString) {

package/es/common/actions/modifications.js

@@ -474,13 +474,14 @@ export function clearTemporaryBankItem(bankId) {
 // =====================
 // =====================
 
-export function createStimulus(quizId, position) {
+export function createStimulus(quizId, position, isPassage) {
   return function (dispatch, getState) {
     dispatch({
       type: CREATE_TEMPORARY_STIMULUS,
       payload: {
         quizId: quizId,
-        position: position
+        position: position,
+        isPassage: isPassage
       }
     });
   };

package/es/common/components/ConfirmationModal/presenter.js

@@ -57,19 +57,20 @@ export var ConfirmationModal = /*#__PURE__*/function (_Component) {
         continueText = _this$props2.continueText,
         size = _this$props2.size,
         shouldReturnFocus = _this$props2.shouldReturnFocus,
-        continueVariant = _this$props2.continueVariant;
+        continueVariant = _this$props2.continueVariant,
+        automationPrefix = _this$props2.automationPrefix;
       return /*#__PURE__*/React.createElement(ImportantModal, {
         open: this.props.modalOpen,
         size: size || 'small',
         label: title || t('Confirm'),
         onDismiss: this.cancelAction,
-        "data-automation": "sdk-confirmation-modal",
+        "data-automation": automationPrefix ? "sdk-".concat(automationPrefix, "-confirmation-modal") : 'sdk-confirmation-modal',
         shouldReturnFocus: shouldReturnFocus,
         onClose: this.doAction
       }, /*#__PURE__*/React.createElement(ModalHeader, null, /*#__PURE__*/React.createElement(Heading, {
         level: "reset",
         as: "h2",
-        "data-automation": "sdk-confirmation-modal-heading"
+        "data-automation": automationPrefix ? "sdk-".concat(automationPrefix, "-confirmation-modal-heading") : 'sdk-confirmation-modal-heading'
       }, title || t('Confirm')), /*#__PURE__*/React.createElement(CloseButton, {
         onClick: this.cancelAction,
         placement: "end",
@@ -80,12 +81,12 @@ export var ConfirmationModal = /*#__PURE__*/function (_Component) {
       }, text || t('Are you sure?'))), /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
         onClick: this.cancelAction,
         margin: XSMALL_SIDE_MARGIN,
-        "data-automation": "sdk-confirmation-modal-cancel"
+        "data-automation": automationPrefix ? "sdk-".concat(automationPrefix, "-confirmation-modal-cancel") : 'sdk-confirmation-modal-cancel'
       }, cancelText || t('Cancel')), /*#__PURE__*/React.createElement(Button, {
         color: continueVariant || 'primary',
         onClick: this.continueAction,
         margin: XSMALL_SIDE_MARGIN,
-        "data-automation": "sdk-confirmation-modal-confirm"
+        "data-automation": automationPrefix ? "sdk-".concat(automationPrefix, "-confirmation-modal-confirm") : 'sdk-confirmation-modal-confirm'
       }, continueText || t('Confirm'))));
     }
   }]);
@@ -103,7 +104,8 @@ ConfirmationModal.propTypes = {
   size: PropTypes.string,
   shouldReturnFocus: PropTypes.bool,
   onContinue: PropTypes.func,
-  onCancel: PropTypes.func
+  onCancel: PropTypes.func,
+  automationPrefix: PropTypes.string
 };
 ConfirmationModal.defaultProps = {
   title: null,
@@ -114,6 +116,7 @@ ConfirmationModal.defaultProps = {
   size: null,
   shouldReturnFocus: true,
   onContinue: null,
-  onCancel: null
+  onCancel: null,
+  automationPrefix: null
 };
 export default ConfirmationModal;

package/es/common/components/layout/Page/styles.js

@@ -17,7 +17,19 @@ var generateStyle = function generateStyle(componentTheme, props) {
       overflowY: 'auto'
     }), {}, {
       transition: componentTheme.contentTransition,
-      width: '100%'
+      width: '100%',
+      '.user_content p': {
+        margin: "".concat(componentTheme.userContentMargin, " 0"),
+        '&:first-of-type': {
+          margin: "0 0 ".concat(componentTheme.userContentMargin)
+        },
+        '&:last-of-type': {
+          margin: "".concat(componentTheme.userContentMargin, " 0 0")
+        },
+        '&:only-child': {
+          margin: 0
+        }
+      }
     })
   };
 };

package/es/common/components/layout/Page/theme.js

@@ -6,8 +6,7 @@ var generateComponentTheme = function generateComponentTheme(_ref) {
   return {
     fontFamily: typography.fontFamily,
     contentTransition: "transform ".concat(transitions.duration),
-    userContentMargin: spacing.mediumSmall,
-    userContentZeroMargin: 0
+    userContentMargin: spacing.mediumSmall
   };
 };
 export default generateComponentTheme;

package/es/common/components/layout/navbar/SecondaryNavBarButton/index.js

@@ -2,17 +2,14 @@ import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
-var _dec, _class, _SecondaryNavBarButton;
+var _SecondaryNavBarButton;
 /** @jsx jsx */
 import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { TopNavBar } from '@instructure/ui-top-nav-bar';
-import { InstUISettingsProvider, jsx } from '@instructure/emotion';
+import { jsx } from '@instructure/emotion';
 import { omitProps } from '@instructure/ui-react-utils';
-import generateStyle from "./styles.js";
-import generateComponentTheme from "./theme.js";
-import { withStyleOverrides } from '@instructure/quiz-common';
-export var SecondaryNavBarButton = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_SecondaryNavBarButton = /*#__PURE__*/function (_Component) {
+export var SecondaryNavBarButton = /*#__PURE__*/function (_Component) {
   _inherits(SecondaryNavBarButton, _Component);
   var _super = _createSuper(SecondaryNavBarButton);
   function SecondaryNavBarButton() {
@@ -20,37 +17,21 @@ export var SecondaryNavBarButton = (_dec = withStyleOverrides(generateStyle, gen
     return _super.apply(this, arguments);
   }
   _createClass(SecondaryNavBarButton, [{
-    key: "componentDidMount",
-    value: function componentDidMount() {
-      this.props.makeStyles();
-    }
-  }, {
-    key: "componentDidUpdate",
-    value: function componentDidUpdate() {
-      this.props.makeStyles();
-    }
-  }, {
     key: "render",
     value: function render() {
-      return jsx(InstUISettingsProvider, {
-        theme: {
-          componentOverrides: {
-            BaseButton: {
-              primaryColor: this.props.styles.textColor,
-              primaryBackground: this.props.styles.backgroundColor,
-              primaryHoverBackground: this.props.styles.backgroundHoverColor,
-              primaryBorderColor: this.props.styles.borderColor
-            }
-          }
-        }
-      }, jsx(TopNavBar.Item, omitProps(this.props, this.constructor.propTypes), this.props.children));
+      return jsx(TopNavBar.Item, Object.assign({
+        color: "secondary"
+      }, omitProps(this.props, this.constructor.propTypes)), this.props.children);
     }
   }]);
   SecondaryNavBarButton.displayName = "SecondaryNavBarButton";
   return SecondaryNavBarButton;
-}(Component), _SecondaryNavBarButton.displayName = 'TopNavBarItem', _SecondaryNavBarButton.componentId = "Quizzes".concat(_SecondaryNavBarButton.displayName), _SecondaryNavBarButton.propTypes = {
+}(Component);
+_SecondaryNavBarButton = SecondaryNavBarButton;
+SecondaryNavBarButton.displayName = 'TopNavBarItem';
+SecondaryNavBarButton.componentId = "Quizzes".concat(_SecondaryNavBarButton.displayName);
+SecondaryNavBarButton.propTypes = {
   children: PropTypes.string.isRequired,
-  styles: PropTypes.object,
-  makeStyles: PropTypes.func
-}, _SecondaryNavBarButton)) || _class);
+  styles: PropTypes.object
+};
 export default SecondaryNavBarButton;

package/es/common/components/layout/navbar/index.js

@@ -93,9 +93,6 @@ export var NavBar = (_dec = withStyleOverrides(generateStyle, generateComponentT
             desktopBottomBorderInverse: false
           } : {}),
           navLabel: t('Quizzes navigation bar'),
-          desktopConfig: {
-            hideActionsUserSeparator: true
-          },
           smallViewportConfig: {
             dropdownMenuToggleButtonLabel: t('Toggle Menu'),
             dropdownMenuLabel: t('Main Menu')