diff --git a/src/index.scss b/src/index.scss index 8d5d162541..bd25ec8033 100644 --- a/src/index.scss +++ b/src/index.scss @@ -42,7 +42,7 @@ $white: #fff; .user-dropdown { .btn { height: 3rem; - @media (max-width: -1 + map-get($grid-breakpoints, "sm")) { + @media (map-get($grid-breakpoints, "sm")) { padding: 0 0.5rem; } } diff --git a/src/learning-header/LearningHeader.jsx b/src/learning-header/LearningHeader.jsx index 4a91f24854..993613735e 100644 --- a/src/learning-header/LearningHeader.jsx +++ b/src/learning-header/LearningHeader.jsx @@ -9,6 +9,8 @@ import AuthenticatedUserDropdown from './AuthenticatedUserDropdown'; import messages from './messages'; import getCourseLogoOrg from './data/api'; +import './_header.scss'; + function LinkedLogo({ href, src, @@ -28,6 +30,9 @@ LinkedLogo.propTypes = { alt: PropTypes.string.isRequired, }; +// this feature flag is not included on the frontend-platform, we have to get it directly from ENV +const enabledOrgLogo = process.env.ENABLED_ORG_LOGO || true; + function LearningHeader({ courseOrg, courseTitle, intl, showUserDropdown, }) { @@ -54,17 +59,19 @@ function LearningHeader({ {intl.formatMessage(messages.skipNavLink)}
{headerLogo} -
- { +
+
+ {enabledOrgLogo ? ( (courseOrg && logoOrg) - && {`${courseOrg} - } + && {`${courseOrg} + ) : null} {courseTitle} +
{showUserDropdown && authenticatedUser && (