Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@edunext/frontend-component-header",
"version": "6.6.1-nelp.2",
"version": "6.6.1-nelp.3",
"description": "The standard header for Open edX",
"main": "dist/index.js",
"publishConfig": {
Expand Down
4 changes: 2 additions & 2 deletions src/__snapshots__/Header.test.jsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ exports[`<Header /> renders correctly for anonymous desktop 1`] = `
</nav>
<nav
aria-label="Secondary"
className="nav secondary-menu-container align-items-center ml-auto"
className="nav secondary-menu-container align-items-center"
>
<a
className="btn mr-2 btn-link"
Expand Down Expand Up @@ -237,7 +237,7 @@ exports[`<Header /> renders correctly for authenticated desktop 1`] = `
</nav>
<nav
aria-label="Secondary"
className="nav secondary-menu-container align-items-center ml-auto"
className="nav secondary-menu-container align-items-center"
>
<div
className="menu null"
Expand Down
2 changes: 1 addition & 1 deletion src/desktop-header/DesktopHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class DesktopHeader extends React.Component {
</nav>
<nav
aria-label={intl.formatMessage(messages['header.label.secondary.nav'])}
className="nav secondary-menu-container align-items-center ml-auto"
className="nav secondary-menu-container align-items-center"
>
{getConfig().ENABLE_HEADER_LANG_SELECTOR && (<LanguageSelector />)}
{loggedIn
Expand Down
10 changes: 8 additions & 2 deletions src/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,13 @@ $rounded-pill: 50rem !default;
}
}

.user-dropdown .btn {
height: 3rem;
.user-dropdown{
margin-left: var(--pgn-spacing-spacer-base);
.btn {
height: 3rem;
}
}

}

.site-header-mobile,
Expand Down Expand Up @@ -93,6 +97,8 @@ $rounded-pill: 50rem !default;
}
}
.secondary-menu-container {
margin-left: auto;

.nav-link:hover,
.nav-link:focus,
.nav-link.active,
Expand Down
2 changes: 1 addition & 1 deletion src/language-selector/LanguageSelector.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.language-selector {
padding: .75rem;
padding: 0 var(--pgn-spacing-spacer-base);

.dropdown-toggle {
.lang-label-medium,
Expand Down
2 changes: 1 addition & 1 deletion src/learning-header/AuthenticatedUserDropdown.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const AuthenticatedUserDropdown = ({ intl, username }) => {
];

return (
<Dropdown className="user-dropdown ml-3">
<Dropdown className="user-dropdown">
<Dropdown.Toggle variant="outline-primary" aria-label={intl.formatMessage(messages.userOptionsDropdownLabel)}>
<LearningUserMenuToggleSlot label={username} icon={faUserCircle} />
</Dropdown.Toggle>
Expand Down