Skip to content

Commit

Permalink
feat: add support for design tokens and CSS variables
Browse files Browse the repository at this point in the history
  • Loading branch information
xitij2000 committed Sep 12, 2023
1 parent 9da5f81 commit 06c26b0
Show file tree
Hide file tree
Showing 8 changed files with 12,544 additions and 8,477 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@ temp/babel-plugin-react-intl
### transifex ###
src/i18n/transifex_input.json
temp

### Local-only config ###
.env.private
module.config.js
20,982 changes: 12,522 additions & 8,460 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
"extends @edx/browserslist-config"
],
"dependencies": {
"@edx/brand": "npm:@edx/brand-openedx@^1.2.0",
"@edx/frontend-component-footer": "12.2.0",
"@edx/brand": "npm:@edx/brand-edx.org@2.2.0-alpha.16",
"@edx/frontend-component-footer": "12.2.1",
"@edx/frontend-component-header": "4.6.0",
"@edx/frontend-platform": "5.0.0",
"@edx/paragon": "20.45.0",
"@edx/frontend-platform": "github:openedx/frontend-platform#ags/inject-theme-css",
"@edx/paragon": "22.0.0-alpha.1",
"@edx/react-unit-test-utils": "1.7.0",
"@edx/reactifex": "^2.1.1",
"@edx/reactifex": "^2.2.0",
"@fortawesome/fontawesome-svg-core": "^1.2.25",
"@fortawesome/free-brands-svg-icons": "^5.11.2",
"@fortawesome/free-solid-svg-icons": "^5.11.2",
Expand Down Expand Up @@ -67,8 +67,8 @@
"whatwg-fetch": "^2.0.4"
},
"devDependencies": {
"@edx/browserslist-config": "^1.1.1",
"@edx/frontend-build": "12.9.3",
"@edx/browserslist-config": "^1.2.0",
"@edx/frontend-build": "github:openedx/frontend-build#ags/2321",
"@testing-library/react": "12.1.5",
"@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
"axios": "0.21.2",
Expand Down
14 changes: 7 additions & 7 deletions src/App.scss
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// frontend-app-*/src/index.scss
@import "~@edx/brand/paragon/fonts";
@import "~@edx/brand/paragon/variables";
@import "~@edx/paragon/scss/core/core";
@import "~@edx/brand/paragon/overrides";
//@import "~@edx/brand/paragon/fonts";
//@import "~@edx/brand/paragon/variables";
//@import "~@edx/paragon/scss/core/core";
//@import "~@edx/brand/paragon/overrides";

$fa-font-path: "~font-awesome/fonts";
@import "~font-awesome/scss/font-awesome";

$input-focus-box-shadow: $input-box-shadow; // hack to get upgrade to paragon 4.0.0 to work
$input-focus-box-shadow: var(--pgn-elevation-form-input-base); // hack to get upgrade to paragon 4.0.0 to work

@import "~@edx/frontend-component-header/dist/index";
@import "~@edx/frontend-component-footer/dist/_footer";
//@import "~@edx/frontend-component-header/dist/index";
//@import "~@edx/frontend-component-footer/dist/_footer";

@import "./components/GradesView/GradesView";
@import "./components/BulkManagementHistoryView/BulkManagementHistoryView";
Expand Down
2 changes: 1 addition & 1 deletion src/components/GradesView/GradebookTable/hooks.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const useGradebookTableData = () => {
[Headings.username]: (
<Fields.Username username={entry.username} userKey={entry.external_user_key} />
),
[Headings.email]: (<Fields.Email email={entry.email} />),
[Headings.email]: (<Fields.Text value={entry.email} />),
[Headings.totalGrade]: `${roundGrade(entry.percent * 100)}${getLocalizedPercentSign()}`,
...entry.section_breakdown.reduce((acc, subsection) => ({
...acc,
Expand Down
2 changes: 1 addition & 1 deletion src/components/GradesView/GradebookTable/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import useGradebookTableData from './hooks';
* a row for each user, with a column for their username, email, and total grade,
* along with one for each subsection in their grade entry.
*/
export const GradebookTable = () => {
const GradebookTable = () => {
const {
columns,
data,
Expand Down
2 changes: 1 addition & 1 deletion src/components/GradesView/GradesView.scss
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,6 @@ select#ScoreView.form-control {

&:before {
border-width: 0.4rem 0.4rem 0.4rem 0;
border-right-color: $black;
border-right-color: var(--pgn-color-black);
}
}
1 change: 1 addition & 0 deletions src/components/GradesView/ImportSuccessToast/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export const ImportSuccessToast = () => {
show,
description,
} = useImportSuccessToastData();
return null;
return (
<Toast {...{ action, onClose, show }}>
{description}
Expand Down

0 comments on commit 06c26b0

Please sign in to comment.