diff --git a/package-lock.json b/package-lock.json index 5739eeb..8be49a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@edx/frontend-component-footer": "12.0.0", "@edx/frontend-component-header": "4.0.0", "@edx/frontend-platform": "4.5.1", - "@edx/paragon": "^20.32.0", + "@edx/paragon": "^20.43.0", "@fortawesome/fontawesome-svg-core": "1.2.36", "@fortawesome/free-brands-svg-icons": "5.15.4", "@fortawesome/free-regular-svg-icons": "5.15.4", @@ -2780,9 +2780,9 @@ } }, "node_modules/@edx/paragon": { - "version": "20.32.0", - "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-20.32.0.tgz", - "integrity": "sha512-d2rlYoWyRLvzPMo7MfCojqU/Qvk0cXnBpXW7aOOOQYhTvC3m3Y3yNWjQ8DJhbnWyL1tFEjZG2mjlgXHDHBqtLQ==", + "version": "20.43.0", + "resolved": "https://registry.npmjs.org/@edx/paragon/-/paragon-20.43.0.tgz", + "integrity": "sha512-ErgTL2k8DrV0Xp+2c81YBn1ekdHa6VAtSLMpOw/BI6RN6hQ/AaCSSLxVyvq9sVpmNSvKmOd/tPAY0aBwA5hSUA==", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.1.1", "@fortawesome/react-fontawesome": "^0.1.18", diff --git a/package.json b/package.json index d66a7ed..018abf0 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@edx/frontend-component-footer": "12.0.0", "@edx/frontend-component-header": "4.0.0", "@edx/frontend-platform": "4.5.1", - "@edx/paragon": "^20.32.0", + "@edx/paragon": "^20.43.0", "@fortawesome/fontawesome-svg-core": "1.2.36", "@fortawesome/free-brands-svg-icons": "5.15.4", "@fortawesome/free-regular-svg-icons": "5.15.4", diff --git a/src/profile/__snapshots__/ProfilePage.test.jsx.snap b/src/profile/__snapshots__/ProfilePage.test.jsx.snap index aafe50c..f8f5d7d 100644 --- a/src/profile/__snapshots__/ProfilePage.test.jsx.snap +++ b/src/profile/__snapshots__/ProfilePage.test.jsx.snap @@ -163,7 +163,7 @@ exports[` Renders correctly in various states test country edit w xmlns="http://www.w3.org/2000/svg" > @@ -241,7 +241,7 @@ exports[` Renders correctly in various states test country edit w xmlns="http://www.w3.org/2000/svg" > @@ -1745,7 +1745,7 @@ exports[` Renders correctly in various states test country edit w xmlns="http://www.w3.org/2000/svg" > @@ -2387,7 +2387,7 @@ exports[` Renders correctly in various states test country edit w xmlns="http://www.w3.org/2000/svg" > @@ -2544,7 +2544,7 @@ exports[` Renders correctly in various states test education edit xmlns="http://www.w3.org/2000/svg" > @@ -2622,7 +2622,7 @@ exports[` Renders correctly in various states test education edit xmlns="http://www.w3.org/2000/svg" > @@ -3100,7 +3100,7 @@ exports[` Renders correctly in various states test education edit xmlns="http://www.w3.org/2000/svg" > @@ -3562,7 +3562,7 @@ exports[` Renders correctly in various states test education edit xmlns="http://www.w3.org/2000/svg" > @@ -3719,7 +3719,7 @@ exports[` Renders correctly in various states test preferreded la xmlns="http://www.w3.org/2000/svg" > @@ -3797,7 +3797,7 @@ exports[` Renders correctly in various states test preferreded la xmlns="http://www.w3.org/2000/svg" > @@ -5060,7 +5060,7 @@ exports[` Renders correctly in various states test preferreded la xmlns="http://www.w3.org/2000/svg" > @@ -5612,7 +5612,7 @@ exports[` Renders correctly in various states test preferreded la xmlns="http://www.w3.org/2000/svg" > @@ -5723,7 +5723,7 @@ exports[` Renders correctly in various states viewing other profi xmlns="http://www.w3.org/2000/svg" > @@ -5784,7 +5784,7 @@ exports[` Renders correctly in various states viewing other profi xmlns="http://www.w3.org/2000/svg" > @@ -6001,7 +6001,7 @@ exports[` Renders correctly in various states viewing own profile xmlns="http://www.w3.org/2000/svg" > @@ -6079,7 +6079,7 @@ exports[` Renders correctly in various states viewing own profile xmlns="http://www.w3.org/2000/svg" > @@ -6894,7 +6894,7 @@ exports[` Renders correctly in various states viewing own profile xmlns="http://www.w3.org/2000/svg" > @@ -7051,7 +7051,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -7129,7 +7129,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -7818,7 +7818,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -8011,7 +8011,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -8168,7 +8168,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -8246,7 +8246,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -8941,7 +8941,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -9134,7 +9134,7 @@ exports[` Renders correctly in various states while saving an edi xmlns="http://www.w3.org/2000/svg" > @@ -10094,7 +10094,7 @@ exports[` Renders correctly in various states without credentials xmlns="http://www.w3.org/2000/svg" > diff --git a/src/profile/forms/__snapshots__/SocialLinks.test.jsx.snap b/src/profile/forms/__snapshots__/SocialLinks.test.jsx.snap index 15bf86d..9c5f8cd 100644 --- a/src/profile/forms/__snapshots__/SocialLinks.test.jsx.snap +++ b/src/profile/forms/__snapshots__/SocialLinks.test.jsx.snap @@ -170,7 +170,7 @@ exports[` calls social links with edit mode bio 1`] = ` xmlns="http://www.w3.org/2000/svg" > diff --git a/src/skills-builder/skills-builder-header/SkillsBuilderHeader.jsx b/src/skills-builder/skills-builder-header/SkillsBuilderHeader.jsx index a93ec18..d935b17 100644 --- a/src/skills-builder/skills-builder-header/SkillsBuilderHeader.jsx +++ b/src/skills-builder/skills-builder-header/SkillsBuilderHeader.jsx @@ -1,11 +1,21 @@ import React from 'react'; +import PropTypes from 'prop-types'; import { useIntl } from '@edx/frontend-platform/i18n'; import edXLogo from '../images/edX-logo.svg'; import messages from './messages'; -const SkillsBuilderHeader = () => { +const SkillsBuilderHeader = ({ isMedium }) => { const { formatMessage } = useIntl(); + if (isMedium) { + return ( +
+

+ {formatMessage(messages.skillsBuilderHeaderTitleIsMedium)} +

+
+ ); + } return (
edx-logo @@ -22,4 +32,8 @@ const SkillsBuilderHeader = () => { ); }; +SkillsBuilderHeader.propTypes = { + isMedium: PropTypes.func.isRequired, +}; + export default SkillsBuilderHeader; diff --git a/src/skills-builder/skills-builder-header/messages.js b/src/skills-builder/skills-builder-header/messages.js index 1c7fabf..a39bcb2 100644 --- a/src/skills-builder/skills-builder-header/messages.js +++ b/src/skills-builder/skills-builder-header/messages.js @@ -11,6 +11,11 @@ const messages = defineMessages({ defaultMessage: 'Let edX be your guide', description: 'Subheading to the Skills Builder title in the header component', }, + skillsBuilderHeaderTitleIsMedium: { + id: 'skills.builder.header.title.is.medium', + defaultMessage: 'edX Skills builder', + description: 'Title for the Skills Builder feature when screen size is medium or less', + }, }); export default messages; diff --git a/src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx b/src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx index 4bff358..deab56c 100644 --- a/src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx +++ b/src/skills-builder/skills-builder-modal/SkillsBuilderModal.jsx @@ -1,6 +1,6 @@ import React, { useState, useContext } from 'react'; import { - Button, Container, Stepper, ModalDialog, Form, Hyperlink, + Button, Container, Stepper, ModalDialog, Form, Hyperlink, useMediaQuery, breakpoints, } from '@edx/paragon'; import { getConfig } from '@edx/frontend-platform'; import { useIntl } from '@edx/frontend-platform/i18n'; @@ -19,6 +19,7 @@ import headerImage from '../images/headerImage.png'; const SkillsBuilderModal = () => { const { formatMessage } = useIntl(); + const isMedium = useMediaQuery({ maxWidth: breakpoints.medium.maxWidth }); const { state } = useContext(SkillsBuilderContext); const { currentGoal, currentJobTitle, careerInterests } = state; const [currentStep, setCurrentStep] = useState(STEP1); @@ -59,16 +60,16 @@ const SkillsBuilderModal = () => { isOpen onClose={closeButtonHandle} > - + - + { !isMedium && } - + - + diff --git a/src/skills-builder/skills-builder-modal/skillsBuilderModal.scss b/src/skills-builder/skills-builder-modal/skillsBuilderModal.scss index c543e8a..5f80033 100644 --- a/src/skills-builder/skills-builder-modal/skillsBuilderModal.scss +++ b/src/skills-builder/skills-builder-modal/skillsBuilderModal.scss @@ -1,5 +1,16 @@ .skills-builder-modal { button[aria-label="Close"][type="button"]{ - color: #ffffff; + color: $white; + } +} + + +$breakpoint-medium: 992px; +@media (max-width: $breakpoint-medium) { + .med-min-height { + min-height: map-get($spacers, 6); + } + .pgn__modal-close-container { + top: 1rem; } }