Compare commits
22 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7970561181 | ||
|
|
8d46de8fe3 | ||
|
|
8341f17d46 | ||
|
|
d7c3e5a687 | ||
|
|
07b1c5bde1 | ||
|
|
5512faa9b0 | ||
|
|
48c49fe0b2 | ||
|
|
8c7778218b | ||
|
|
0dedbbd589 | ||
|
|
ef0b101fea | ||
|
|
edb22316b8 | ||
|
|
227a97afa1 | ||
|
|
d01486e5f7 | ||
|
|
a58f1eaf19 | ||
|
|
a5024c3fde | ||
|
|
d7be18e717 | ||
|
|
5e405da37e | ||
|
|
901f39f42c | ||
|
|
346a636b76 | ||
|
|
34dcc88880 | ||
|
|
a229c34535 | ||
|
|
5d7b4fecf4 |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -9,4 +9,4 @@ module.config.js
|
|||||||
.idea/
|
.idea/
|
||||||
|
|
||||||
.vscode
|
.vscode
|
||||||
src/i18n/messages
|
src/i18n/messages
|
||||||
|
|||||||
14
catalog-info.yaml
Normal file
14
catalog-info.yaml
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
# This file records information about this repo. Its use is described in OEP-55:
|
||||||
|
# https://open-edx-proposals.readthedocs.io/en/latest/processes/oep-0055-proc-project-maintainers.html
|
||||||
|
|
||||||
|
apiVersion: backstage.io/v1alpha1
|
||||||
|
kind: Component
|
||||||
|
metadata:
|
||||||
|
name: "frontend-component-header"
|
||||||
|
description: "A generic header for the Open edX micro-frontend applications."
|
||||||
|
annotations:
|
||||||
|
openedx.org/arch-interest-groups: ""
|
||||||
|
spec:
|
||||||
|
owner: group:committers-frontend
|
||||||
|
type: "library"
|
||||||
|
lifecycle: "production"
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
@import "@edx/brand/paragon/fonts";
|
@use "@openedx/paragon/dist/core.min.css" as paragonCore;
|
||||||
@import "@edx/brand/paragon/variables";
|
@use "@openedx/paragon/dist/light.min.css" as paragonLight;
|
||||||
@import "@openedx/paragon/scss/core/core";
|
|
||||||
@import "@edx/brand/paragon/overrides";
|
|
||||||
|
|
||||||
@import "@edx/frontend-component-header/index";
|
@import "@edx/frontend-component-header/index";
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
# openedx.yaml
|
|
||||||
|
|
||||||
---
|
|
||||||
owner: edx/fedx-team
|
|
||||||
tags:
|
|
||||||
- library
|
|
||||||
- component
|
|
||||||
- react
|
|
||||||
7185
package-lock.json
generated
7185
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
12
package.json
12
package.json
@@ -35,10 +35,10 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
|
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
|
||||||
"@edx/browserslist-config": "^1.1.1",
|
"@edx/browserslist-config": "^1.1.1",
|
||||||
"@edx/frontend-platform": "8.1.2",
|
"@edx/frontend-platform": "^8.3.1",
|
||||||
"@edx/reactifex": "^2.1.1",
|
"@edx/reactifex": "^2.1.1",
|
||||||
"@openedx/frontend-build": "14.1.5",
|
"@openedx/frontend-build": "14.2.2",
|
||||||
"@openedx/paragon": "22.9.0",
|
"@openedx/paragon": "^23.0.0",
|
||||||
"@testing-library/dom": "10.4.0",
|
"@testing-library/dom": "10.4.0",
|
||||||
"@testing-library/jest-dom": "5.17.0",
|
"@testing-library/jest-dom": "5.17.0",
|
||||||
"@testing-library/react": "10.4.9",
|
"@testing-library/react": "10.4.9",
|
||||||
@@ -49,7 +49,7 @@
|
|||||||
"react": "17.0.2",
|
"react": "17.0.2",
|
||||||
"react-dom": "17.0.2",
|
"react-dom": "17.0.2",
|
||||||
"react-redux": "7.2.9",
|
"react-redux": "7.2.9",
|
||||||
"react-router-dom": "6.27.0",
|
"react-router-dom": "6.28.1",
|
||||||
"react-test-renderer": "17.0.2",
|
"react-test-renderer": "17.0.2",
|
||||||
"redux": "4.2.1",
|
"redux": "4.2.1",
|
||||||
"redux-saga": "1.3.0"
|
"redux-saga": "1.3.0"
|
||||||
@@ -60,7 +60,7 @@
|
|||||||
"@fortawesome/free-regular-svg-icons": "6.6.0",
|
"@fortawesome/free-regular-svg-icons": "6.6.0",
|
||||||
"@fortawesome/free-solid-svg-icons": "6.6.0",
|
"@fortawesome/free-solid-svg-icons": "6.6.0",
|
||||||
"@fortawesome/react-fontawesome": "^0.2.0",
|
"@fortawesome/react-fontawesome": "^0.2.0",
|
||||||
"@openedx/frontend-plugin-framework": "^1.3.0",
|
"@openedx/frontend-plugin-framework": "^1.6.0",
|
||||||
"axios-mock-adapter": "1.22.0",
|
"axios-mock-adapter": "1.22.0",
|
||||||
"babel-polyfill": "6.26.0",
|
"babel-polyfill": "6.26.0",
|
||||||
"classnames": "^2.5.1",
|
"classnames": "^2.5.1",
|
||||||
@@ -70,7 +70,7 @@
|
|||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@edx/frontend-platform": "^7.0.0 || ^8.0.0",
|
"@edx/frontend-platform": "^7.0.0 || ^8.0.0",
|
||||||
"@openedx/paragon": ">= 21.5.7 < 23.0.0",
|
"@openedx/paragon": ">= 22.0.0 < 24.0.0",
|
||||||
"prop-types": "^15.5.10",
|
"prop-types": "^15.5.10",
|
||||||
"react": "^16.9.0 || ^17.0.0",
|
"react": "^16.9.0 || ^17.0.0",
|
||||||
"react-dom": "^16.9.0 || ^17.0.0",
|
"react-dom": "^16.9.0 || ^17.0.0",
|
||||||
|
|||||||
@@ -1,45 +1,45 @@
|
|||||||
.menu {
|
.menu {
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
.menu-content {
|
.menu-content {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 100%;
|
top: 100%;
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
background: #fff;
|
background: var(--pgn-color-white, #fff);
|
||||||
min-width: 10rem;
|
min-width: 10rem;
|
||||||
|
|
||||||
&.pin-left {
|
&.pin-left {
|
||||||
left: 0;
|
left: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
&.pin-right {
|
&.pin-right {
|
||||||
right: 0;
|
right: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.menu-dropdown-enter {
|
.menu-dropdown-enter {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transform-origin: 75% 0;
|
transform-origin: 75% 0;
|
||||||
transform: scale3d(0.8, 0.8, 1);
|
transform: scale3d(0.8, 0.8, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
.menu-dropdown-enter-active {
|
.menu-dropdown-enter-active {
|
||||||
transform-origin: 75% 0;
|
transform-origin: 75% 0;
|
||||||
transition: all 250ms cubic-bezier(0.4, 0, 0.2, 1);
|
transition: all 250ms cubic-bezier(0.4, 0, 0.2, 1);
|
||||||
transform: scale3d(1, 1, 1);
|
transform: scale3d(1, 1, 1);
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
.menu-dropdown-enter-done {
|
|
||||||
}
|
|
||||||
|
|
||||||
.menu-dropdown-exit {
|
.menu-dropdown-exit {
|
||||||
transform-origin: 75% 0;
|
transform-origin: 75% 0;
|
||||||
transform: scale3d(1, 1, 1);
|
transform: scale3d(1, 1, 1);
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.menu-dropdown-exit-active {
|
.menu-dropdown-exit-active {
|
||||||
transform-origin: 75% 0;
|
transform-origin: 75% 0;
|
||||||
transform: scale3d(0.8, 0.8, 1);
|
transform: scale3d(0.8, 0.8, 1);
|
||||||
transition: all 250ms cubic-bezier(0.8, 0, 0.6, 1);
|
transition: all 250ms cubic-bezier(0.8, 0, 0.6, 1);
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
.menu-dropdown-exit-done {
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
$spacer: 1rem;
|
$spacer: 1rem;
|
||||||
$blue: #007db8;
|
$blue: #007db8;
|
||||||
$white: #fff;
|
$white: #fff;
|
||||||
|
$component-active-bg: #0A3055FF !default;
|
||||||
|
$component-active-color: $white !default;
|
||||||
|
$rounded-pill: 50rem !default;
|
||||||
|
|
||||||
@import './Menu/menu.scss';
|
@import './Menu/menu.scss';
|
||||||
@import './studio-header/StudioHeader.scss';
|
@import './studio-header/StudioHeader.scss';
|
||||||
@@ -21,8 +24,9 @@ $white: #fff;
|
|||||||
padding: .75rem;
|
padding: .75rem;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items:center;
|
align-items:center;
|
||||||
|
|
||||||
&:hover, &:focus {
|
&:hover, &:focus {
|
||||||
background: rgba(0,0,0,.1);
|
background: rgba(0, 0, 0, .1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,17 +40,12 @@ $white: #fff;
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
padding-bottom: 0.1rem;
|
padding-bottom: calc(var(--pgn-spacing-spacer-base, $spacer)* 0.1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.user-dropdown {
|
.user-dropdown .btn {
|
||||||
.btn {
|
height: 3rem;
|
||||||
height: 3rem;
|
|
||||||
// @media (max-width: -1 + map-get($grid-breakpoints, "sm")) {
|
|
||||||
// padding: 0 0.5rem;
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -63,6 +62,7 @@ $white: #fff;
|
|||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
img {
|
img {
|
||||||
height: 1.5rem;
|
height: 1.5rem;
|
||||||
}
|
}
|
||||||
@@ -70,19 +70,22 @@ $white: #fff;
|
|||||||
|
|
||||||
|
|
||||||
.site-header-desktop {
|
.site-header-desktop {
|
||||||
box-shadow: 0 1px 0 0 rgba(0,0,0,.1);
|
box-shadow: 0 1px 0 0 rgba(0, 0, 0, .1);
|
||||||
background: $white;
|
background: var(--pgn-color-white, $white);
|
||||||
|
|
||||||
.nav-link {
|
.nav-link {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.logo {
|
.logo {
|
||||||
display: block;
|
display: block;
|
||||||
box-sizing: content-box;
|
box-sizing: content-box;
|
||||||
position: relative;
|
position: relative;
|
||||||
top: -.05em;
|
top: -.05em;
|
||||||
height: 1.75rem;
|
height: 1.75rem;
|
||||||
padding: 1rem 0;
|
padding: var(--pgn-spacing-spacer-base, $spacer) 0;
|
||||||
margin-right: 1rem;
|
margin-right: var(--pgn-spacing-spacer-base, $spacer);
|
||||||
|
|
||||||
img {
|
img {
|
||||||
display: block;
|
display: block;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
@@ -93,38 +96,42 @@ $white: #fff;
|
|||||||
.nav-link:focus,
|
.nav-link:focus,
|
||||||
.nav-link.active,
|
.nav-link.active,
|
||||||
.expanded .nav-link {
|
.expanded .nav-link {
|
||||||
background: $component-active-bg;
|
background: var(--pgn-color-bg-active, $component-active-bg);
|
||||||
color: $component-active-color;
|
color: var(--pgn-color-active, $component-active-color);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.main-nav {
|
.main-nav {
|
||||||
.nav-link {
|
.nav-link {
|
||||||
padding: 1.125rem 1rem;
|
padding: 1.125rem var(--pgn-spacing-spacer-base, $spacer);
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
letter-spacing: .01em;
|
letter-spacing: .01em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-link:hover,
|
.nav-link:hover,
|
||||||
.nav-link:focus,
|
.nav-link:focus,
|
||||||
.nav-link.active,
|
.nav-link.active,
|
||||||
.expanded .nav-link {
|
.expanded .nav-link {
|
||||||
background: $component-active-bg;
|
background: var(--pgn-color-bg-active, $component-active-bg);
|
||||||
color: $component-active-color;
|
color: var(--pgn-color-active, $component-active-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
.menu {
|
.menu {
|
||||||
position: static;
|
position: static;
|
||||||
|
|
||||||
.menu-content {
|
.menu-content {
|
||||||
border-top: solid 2px $component-active-bg;
|
border-top: solid 2px var(--pgn-color-bg-active);
|
||||||
left: 0;
|
left: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
box-shadow: 0 1px 2px rgba(0,0,0,.25);
|
box-shadow: var(--pgn-elevation-box-shadow-down-1, 0 1px 2px rgba(0,0,0,.25));
|
||||||
border-bottom-left-radius: 2px;
|
border-bottom-left-radius: 2px;
|
||||||
border-bottom-right-radius: 2px;
|
border-bottom-right-radius: 2px;
|
||||||
padding: 1rem;
|
padding: var(--pgn-spacing-spacer-base, $spacer);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.search-input {
|
.search-input {
|
||||||
border-radius: $rounded-pill;
|
border-radius: var(--pgn-size-rounded-pill, $rounded-pill);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,6 +13,11 @@ const CourseInfoSlot = ({
|
|||||||
slotOptions={{
|
slotOptions={{
|
||||||
mergeProps: true,
|
mergeProps: true,
|
||||||
}}
|
}}
|
||||||
|
pluginProps={{
|
||||||
|
courseOrg,
|
||||||
|
courseNumber,
|
||||||
|
courseTitle,
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<LearningHeaderCourseInfo
|
<LearningHeaderCourseInfo
|
||||||
courseOrg={courseOrg}
|
courseOrg={courseOrg}
|
||||||
|
|||||||
@@ -7,10 +7,10 @@ $white: #FFFFFF;
|
|||||||
|
|
||||||
height: 3.75rem;
|
height: 3.75rem;
|
||||||
box-shadow: 0 1px 0 0 rgb(0 0 0 / .1);
|
box-shadow: 0 1px 0 0 rgb(0 0 0 / .1);
|
||||||
background: $white;
|
background: var(--pgn-color-white, $white);
|
||||||
|
|
||||||
.btn-outline-primary {
|
.btn-outline-primary {
|
||||||
border-color: $white;
|
border-color: var(--pgn-color-white, $white);
|
||||||
}
|
}
|
||||||
|
|
||||||
.logo {
|
.logo {
|
||||||
@@ -19,8 +19,8 @@ $white: #FFFFFF;
|
|||||||
position: relative;
|
position: relative;
|
||||||
top: -.05em;
|
top: -.05em;
|
||||||
height: 1.75rem;
|
height: 1.75rem;
|
||||||
padding: $spacer 0;
|
padding: var(--pgn-spacing-spacer-base, $spacer) 0;
|
||||||
margin-right: $spacer;
|
margin-right: var(--pgn-spacing-spacer-base, $spacer);
|
||||||
|
|
||||||
img {
|
img {
|
||||||
display: block;
|
display: block;
|
||||||
@@ -29,17 +29,17 @@ $white: #FFFFFF;
|
|||||||
}
|
}
|
||||||
|
|
||||||
.course-title-lockup {
|
.course-title-lockup {
|
||||||
|
overflow: hidden;
|
||||||
|
|
||||||
@media only screen and (min-width: 769px) {
|
@media only screen and (min-width: 769px) {
|
||||||
padding: .5rem;
|
padding: .5rem;
|
||||||
padding-right: $spacer;
|
padding-right: var(--pgn-spacing-spacer-base, $spacer);
|
||||||
border-right: 1px solid #E5E5E5;
|
border-right: 1px solid #E5E5E5;
|
||||||
width: 70%;
|
width: 70%;
|
||||||
}
|
}
|
||||||
|
|
||||||
overflow: hidden;
|
|
||||||
|
|
||||||
span {
|
span {
|
||||||
color: #333333;
|
color: var(--pgn-color-gray-800, #333333);
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
|
|||||||
@@ -2,7 +2,9 @@ const path = require('path');
|
|||||||
const { createConfig } = require('@openedx/frontend-build');
|
const { createConfig } = require('@openedx/frontend-build');
|
||||||
|
|
||||||
module.exports = createConfig('webpack-dev', {
|
module.exports = createConfig('webpack-dev', {
|
||||||
entry: path.resolve(__dirname, 'example'),
|
entry: {
|
||||||
|
app: path.resolve(__dirname, 'example'),
|
||||||
|
},
|
||||||
output: {
|
output: {
|
||||||
path: path.resolve(__dirname, 'example/dist'),
|
path: path.resolve(__dirname, 'example/dist'),
|
||||||
publicPath: '/',
|
publicPath: '/',
|
||||||
|
|||||||
Reference in New Issue
Block a user