Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: changed to DB Screen Flex (variable font) #2088

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
+46 −2
Draft

refactor: changed to DB Screen Flex (variable font) #2088

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
242e1f9
refactor: added that variable font
mfranzke Jan 16, 2024
30f0b39
fix: actions/upload-artifact naming convention
mfranzke Jan 16, 2024
4e43f28
Merge branch 'main' into 2087-evaluate-to-use-db-screen-variable-font
mfranzke Jan 17, 2024
1eebb33
Merge branch 'main' into 2087-evaluate-to-use-db-screen-variable-font
mfranzke Jan 30, 2024
87446ab
Merge branch 'main' into 2087-evaluate-to-use-db-screen-variable-font
nmerget Jan 30, 2024
a95b8e4
Merge branch 'main' of github.com:db-ui/mono into 2087-evaluate-to-us…
nmerget Feb 5, 2024
fa57d27
Merge branch 'main' into 2087-evaluate-to-use-db-screen-variable-font
mfranzke Mar 25, 2024
694b2a3
Merge branch 'main' into 2087-evaluate-to-use-db-screen-variable-font
mfranzke Mar 26, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/02-e2e-showcases.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
framework: [angular, react, vue]
shard: [1/2, 2/2]
shard: [1of2, 2of2]
mfranzke marked this conversation as resolved.
Show resolved Hide resolved
steps:
- name: ⏬ Checkout repo
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/02-e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
framework: [react, vue]
shard: [1/3, 2/3, 3/3]
shard: [1of3, 2of3, 3of3]
steps:
- name: ⏬ Checkout repo
uses: actions/checkout@v4
Expand Down
Binary file added packages/foundations/assets/fonts/DBScreenFlexVF.woff2
View file
Open in desktop
Binary file not shown.
12 changes: 12 additions & 0 deletions packages/foundations/scss/_font-faces.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ $db-screensans-bold: assets-paths.$fonts-path +
$db-screensans-digital-regular: assets-paths.$fonts-path +
internals.$db-font-db-screensans-digital-regular-woff2;

$db-screenflex: assets-paths.$fonts-path +
internals.$db-font-db-screenflex-woff2;

@font-face {
font-family: internals.$db-font-db-screenhead-light-font-family;
font-style: normal;
Expand Down Expand Up @@ -70,3 +73,12 @@ $db-screensans-digital-regular: assets-paths.$fonts-path +
),
url($db-screensans-digital-regular) format("woff2");
}

@font-face {
font-family: internals.$db-font-db-screenflex-font-family;
src:
local(internals.$db-font-db-screenflex-name),
local(internals.$db-font-db-screenflex-local-name),
local(internals.$db-font-db-screenflex-local-name-short),
url($db-screenflex) format("woff2");
}
36 changes: 34 additions & 2 deletions packages/foundations/tokens/font.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,41 @@
}
}
},
"db-screenflex": {
"name": {
"value": "'DB Screen Flex'",
"attributes": {
"target": "web"
}
},
"local-name": {
"value": "DB Screen Flex",
"attributes": {
"target": "web"
}
},
"local-name-short": {
"value": "DB Flex",
"attributes": {
"target": "web"
}
},
"font-family": {
"value": "'DB Screen Flex'",
"attributes": {
"target": "web"
}
},
"woff2": {
"value": "'DBScreenFlexVF.woff2'",
"attributes": {
"target": "web"
}
}
},
"family": {
"sans": {
"value": "{font.db-screensans-regular.font-family.value}, Helvetica, Arial, sans-serif",
"value": "{font.db-screenflex.font-family.value}, Helvetica, Arial, sans-serif",
"attributes": {
"target": "web"
}
Expand All @@ -204,7 +236,7 @@
}
},
"bold": {
"value": "{font.db-screensans-bold.font-family.value}, Helvetica, Arial, sans-serif",
"value": "{font.db-screenflex.font-family.value}, Helvetica, Arial, sans-serif",
"attributes": {
"target": "web"
}
Expand Down
Loading