Skip to content
Draft
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ packages/locales/**/*.d.ts.map
packages/locales/**/*.js
packages/locales/**/*.js.map
packages/themes/**/*.css
!packages/themes/**/fonts.css
!packages/themes/core/*.css
packages/themes/**/*.d.ts
packages/themes/**/*.d.ts.map
Expand Down
5 changes: 4 additions & 1 deletion .storybook/themes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ export const themes: Theme[] = [
{
id: 'bingel-dc',
name: 'Bingel DC',
fonts: ['https://use.typekit.net/ghy4rhf.css'],
fonts: [
'https://use.typekit.net/ghy4rhf.css',
'/themes/bingel-dc/fonts.css'
],
setup: async () => {
const { setup } = await import('@sl-design-system/bingel-dc');

Expand Down
10 changes: 10 additions & 0 deletions packages/themes/bingel-dc/fonts.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
@font-face {
font-family: EnOhPee;
font-weight: 400;
src: url('./fonts/EnOhPee-Regular.woff2') format('woff2');
}
@font-face {
font-family: EnOhPee;
font-weight: 700;
src: url('./fonts/EnOhPee-Bold.woff2') format('woff2');
}
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions packages/themes/bingel-dc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"./light.min.css": "./light.min.css",
"./light-deprecated.css": "./light-deprecated.css",
"./light-deprecated.min.css": "./light-deprecated.min.css",
"./fonts.css": "./fonts.css",
"./package.json": "./package.json",
"./css/*.css": "./css/*.css"
},
Expand Down
28 changes: 14 additions & 14 deletions packages/tokens/src/bingel-dc/base-new.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,30 +41,30 @@
"body": {
"lg": {
"$type": "fontSizes",
"$value": "{size.font.200}"
"$value": "{size.font.300}"
},
"md": {
"$type": "fontSizes",
"$value": "{size.font.175}",
"$value": "{size.font.250}",
"$description": "default text size for body"
},
"sm": {
"$type": "fontSizes",
"$value": "{size.font.150}"
"$value": "{size.font.200}"
}
},
"heading": {
"lg": {
"$type": "fontSizes",
"$value": "{size.font.300}"
"$value": "{size.font.400}"
},
"md": {
"$type": "fontSizes",
"$value": "{size.font.200}"
"$value": "{size.font.300}"
},
"sm": {
"$type": "fontSizes",
"$value": "{size.font.175}"
"$value": "{size.font.250}"
},
"xl": {
"$type": "fontSizes",
Expand Down Expand Up @@ -142,7 +142,7 @@
"fontSize": "{I-A.size.text-new.body.lg}",
"fontFamily": "{I-A.text-new.typeset.fontFamily.body}",
"fontWeight": "{I-A.text-new.typeset.fontWeight.regular}",
"lineHeight": "{size.lineHeight.300}"
"lineHeight": "{size.lineHeight.400}"
}
},
"md": {
Expand All @@ -151,7 +151,7 @@
"fontSize": "{I-A.size.text-new.body.md}",
"fontFamily": "{I-A.text-new.typeset.fontFamily.body}",
"fontWeight": "{I-A.text-new.typeset.fontWeight.regular}",
"lineHeight": "{size.lineHeight.250}"
"lineHeight": "{size.lineHeight.400}"
}
},
"sm": {
Expand All @@ -160,7 +160,7 @@
"fontSize": "{I-A.size.text-new.body.sm}",
"fontFamily": "{I-A.text-new.typeset.fontFamily.body}",
"fontWeight": "{I-A.text-new.typeset.fontWeight.regular}",
"lineHeight": "{size.lineHeight.200}"
"lineHeight": "{size.lineHeight.300}"
}
}
},
Expand Down Expand Up @@ -212,15 +212,15 @@
"$value": {
"fontSize": "{I-A.size.text-new.heading.md}",
"fontFamily": "{I-A.text-new.typeset.fontFamily.body}",
"lineHeight": "{size.lineHeight.250}"
"lineHeight": "{size.lineHeight.400}"
}
},
"sm": {
"$type": "typography",
"$value": {
"fontSize": "{I-A.size.text-new.heading.sm}",
"fontFamily": "{I-A.text-new.typeset.fontFamily.body}",
"lineHeight": "{size.lineHeight.250}"
"lineHeight": "{size.lineHeight.400}"
}
},
"xl": {
Expand All @@ -244,7 +244,7 @@
"fontFamily": {
"body": {
"$type": "fontFamilies",
"$value": "Open Sans"
"$value": "EnOhPee"
},
"icon": {
"$type": "fontFamilies",
Expand All @@ -253,7 +253,7 @@
},
"heading": {
"$type": "fontFamilies",
"$value": "Open Sans"
"$value": "EnOhPee"
}
},
"fontWeight": {
Expand All @@ -269,4 +269,4 @@
}
}
}
}
}
6 changes: 3 additions & 3 deletions packages/tokens/src/bingel-dc/base.json
Original file line number Diff line number Diff line change
Expand Up @@ -1414,7 +1414,7 @@
"fontFamily": {
"body": {
"$type": "fontFamilies",
"$value": "Open Sans",
"$value": "EnOhPee",
"$description": "text.typeset.fontFamily.body"
},
"icon": {
Expand All @@ -1424,7 +1424,7 @@
},
"heading": {
"$type": "fontFamilies",
"$value": "Open Sans",
"$value": "EnOhPee",
"$description": "text.typeset.fontFamily.heading"
}
},
Expand Down Expand Up @@ -2453,4 +2453,4 @@
}
}
}
}
}