Skip to content

Commit

Permalink
Prepare for full typography release
Browse files Browse the repository at this point in the history
  • Loading branch information
freost committed Sep 25, 2023
1 parent 0e644b4 commit 72a7a44
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@digitalarkivet/mui-theme",
"version": "2.0.0-alpha4",
"version": "2.0.0-alpha5",
"description": "MUI themes for Digitalarkivet applications",
"private": false,
"main": "dist/main.js",
Expand Down
13 changes: 10 additions & 3 deletions src/light.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,14 @@ declare module "@mui/material/Paper" {
const themeTypography = createTheme({
typography: {
fontSize: 16,
fontFamily: ["'Neue Haas Grotesk'", "'Source Sans 3'", "'Source Sans Pro'", "'Helvetica Neue'", "Arial", "sans-serif"].join(","),
fontFamily: [
"'Neue Haas Grotesk'",
"'Source Sans 3'",
"'Source Sans Pro'",
"'Helvetica Neue'",
"Arial",
"sans-serif"
].join(","),
fontWeightRoman: 400, // Alias for fontWeightRegular
lineHeight100: 1.0,
lineHeight110: 1.1,
Expand Down Expand Up @@ -404,7 +411,7 @@ const theme = createTheme(
+ themeColors.palette.fill.tertiary + " 20%, "
+ themeColors.palette.fill.tertiary + " 20%, rgba(0,0,0,0) 20%)",
},
"& .MuiSvgIcon-root:not(.MuiSvgIcon-root ~ .MuiSvgIcon-root) path":{
"& .MuiSvgIcon-root:not(.MuiSvgIcon-root ~ .MuiSvgIcon-root) path": {
color: themeColors.palette.fill.tertiary,
stroke: themeColors.palette.fill.tertiary,
strokeWidth: 4,
Expand Down Expand Up @@ -445,7 +452,7 @@ const theme = createTheme(
},
track: {
opacity: 1,
backgroundColor:themeColors.palette.fill.tertiary,
backgroundColor: themeColors.palette.fill.tertiary,
".Mui-checked.Mui-checked + &": {
opacity: 1,
backgroundColor: themeColors.palette.brandGreen.variant1,
Expand Down

0 comments on commit 72a7a44

Please sign in to comment.