Skip to content

Commit

Permalink
Merge branch 'main' into docs-added-warning-for-sass-usage
Browse files Browse the repository at this point in the history
  • Loading branch information
mfranzke authored Nov 27, 2024
2 parents 5e6ef6c + dbf4cb3 commit 45b8cb0
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 17 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"postcss-cli": "^11.0.0",
"postcss-focus": "^7.0.0",
"postcss-list-style-safari-fix": "^1.0.0",
"prettier": "^3.3.3",
"prettier": "^3.4.1",
"rimraf": "^6.0.1",
"sass": "^1.81.0",
"start-server-and-test": "^2.0.8",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $icon-font-families: (
// "db_transportation-solid": (
// 40
// )
// )
// )
) !default;
$icon-glyphs-enterprise: (
// "attachment": "\e1245",
Expand Down Expand Up @@ -80,6 +80,6 @@ $icon-glyphs-enterprise: (
// "undo": "\e922",
// // TODO: would need to get replaced by non-out-of-range unicodes
// "upload-cloud": "\e923",
// "watch": "\1f552"
// "watch": "\1f552"
);
$icon-glyphs: map.merge($icon-glyphs-enterprise, $icon-glyphs-personenverkehr);
4 changes: 2 additions & 2 deletions source/_patterns/00-base/type/_fonts.variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ $font-families: (
"font-style": normal,
// TODO: Identify the correct name on local environments; most likely this isn't installed and/or possible to get referenced at the moment
// "font-local-name": "DB Screen Sans Medium",
// "font-local-name-short": "DB Sans Medium"
// "font-local-name-short": "DB Sans Medium"
),
"DB Screen Sans Semibold": (
"font-family": "DB Screen Sans",
Expand All @@ -64,7 +64,7 @@ $font-families: (
"font-style": normal,
// TODO: Identify the correct name on local environments; most likely this isn't installed and/or possible to get referenced at the moment
// "font-local-name": "DB Screen Sans Semibold",
// "font-local-name-short": "DB Sans Semibold"
// "font-local-name-short": "DB Sans Semibold"
),
"DB Screen Sans Bold": (
"font-family": "DB Screen Sans",
Expand Down
3 changes: 2 additions & 1 deletion source/_patterns/02-components/accordion/accordion.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
// Negating the padding left for moving the element into that direction with the same measures
transform: translateX(calc(var(--db-accordion---paddingLeft) * -1));
width: calc(
100% + var(--db-accordion---paddingLeft) + #{$accordion---paddingRight}
100% + var(--db-accordion---paddingLeft) +
#{$accordion---paddingRight}
);

& {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ $tabBar-tab-hover-backgroundColor: #{$db-color-cool-gray-700} + "1F" !default;
$tabBar-tab-pressed-backgroundColor: #{$db-color-cool-gray-700} + "3D" !default;
$tabBar-tab-active-border: #{to-rem(
$pxValue: 1
)} solid $db-color-cool-gray-500 !default;
)}
solid $db-color-cool-gray-500 !default;

$tabBar-tabpanel--borderTop: to-rem(
$pxValue: 1
Expand Down
3 changes: 2 additions & 1 deletion source/_patterns/03-areas/00-header/_header.variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ $header---backgroundColor: #fdfdfd !default; // TODO: This would need to get rep

$header---borderBottom: #{to-rem(
$pxValue: 1
)} solid $db-color-warm-gray-400 !default;
)}
solid $db-color-warm-gray-400 !default;

$header---marginBottom: to-rem(
$pxValue: 16
Expand Down
3 changes: 2 additions & 1 deletion source/_patterns/03-areas/02-grid/_grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@

&:not(:last-child) {
margin-bottom: calc(
#{to-rem($pxValue: 24)} - #{$column-gap-max-width-smaller-padding}
#{to-rem($pxValue: 24)} -
#{$column-gap-max-width-smaller-padding}
);
}
}
Expand Down
3 changes: 2 additions & 1 deletion source/_patterns/03-areas/03-footer/_footer.variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

$footer---borderTop: #{to-rem(
$pxValue: 6
)} solid $db-color-cool-gray-200 !default;
)}
solid $db-color-cool-gray-200 !default;

$footer---boxShadow: $box-shadow-01, $box-shadow-02 !default;

Expand Down

0 comments on commit 45b8cb0

Please sign in to comment.