Skip to content

Commit 6963cbf

Browse files
nmergetmfranzke
andauthored
feat: replace dbux-2 base with dbux-3 (#95)
* feat: replace dbux-2 base with dbux-3 Co-authored-by: Maximilian Franzke <[email protected]>
1 parent 862bb8c commit 6963cbf

File tree

102 files changed

+2863
-3452
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+2863
-3452
lines changed

package-lock.json

Lines changed: 2650 additions & 2070 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"license": "Apache-2.0",
6161
"dependencies": {
6262
"@csstools/normalize.css": "^12.0.0",
63-
"@db-ui/base": "^0.18.0"
63+
"@db-ui/base": "2.0.0-0-01dc14a"
6464
},
6565
"devDependencies": {
6666
"@babel/cli": "^7.19.3",

source/_patterns/00-base/_helpers.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,17 @@
2020
$margin-top: $width * 0.2,
2121
$margin-bottom: $width * 0.35
2222
) {
23-
background-color: $db-color-red-500;
24-
border-bottom: 4px solid $db-color-red-500;
23+
background-color: $db-colors-primary-enabled;
24+
border-bottom: 4px solid $db-colors-primary-enabled;
2525
border-radius: 5px;
26+
border-top: 3px solid $db-colors-primary-enabled;
2627
border-top: 3px solid $db-color-red-500;
2728
content: "";
2829
display: block;
2930
height: 0;
31+
height: 0;
3032
margin-bottom: $margin-bottom;
3133
margin-top: $margin-top;
3234
width: $width;
35+
width: $width;
3336
}

source/_patterns/00-base/_init.global.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ input,
2929
optgroup,
3030
select,
3131
textarea {
32-
font-family: $db-font-family-base;
32+
font-family: $db-font-family-sans;
3333
}
3434

3535
code,
@@ -39,15 +39,15 @@ pre {
3939
}
4040

4141
body {
42-
color: $db-color-cool-gray-700;
42+
color: $db-colors-secondary-enabled;
4343
font-size: 1rem;
4444
font-weight: 400;
4545
line-height: 1.5;
4646
}
4747

4848
// Inline
4949
a {
50-
color: $db-color-cool-gray-700;
50+
color: $db-colors-secondary-enabled;
5151

5252
strong {
5353
color: currentColor;
@@ -60,7 +60,7 @@ a {
6060

6161
code {
6262
background-color: #f5f5f5;
63-
color: darken($db-color-red, 2%);
63+
color: darken($db-colors-primary-enabled, 2%);
6464
font-size: 0.875em;
6565
font-weight: normal;
6666
padding: 0.25em 0.5em;

source/_patterns/00-base/colors/eds-colors.hbs

Lines changed: 0 additions & 12 deletions
This file was deleted.

source/_patterns/00-base/colors/eds-colors.listitems.json

Lines changed: 0 additions & 59 deletions
This file was deleted.

source/_patterns/00-base/colors/eds-colors.md

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,2 @@
11
// DB colors
22
@import "../colors.variables";
3-
4-
// EDS semantic colors (TODO: probably leftovers, those would most likely need to get replaced again as soon as the Enterprise extension is finalized)
5-
6-
$DBdarkgray: $db-color-cool-gray-500; // DB Dunkelgrau/DB dark gray
7-
$DBblue: $db-color-cyan-600; // DB Blau/DB blue
8-
$DBwhitegray: $db-color-cool-gray-200; // DB Weißgrau/DB white-gray
9-
$DBlightgray: $db-color-cool-gray-300; // DB light-gray
10-
$DBgray: $db-color-cool-gray-400; // DB gray
11-
12-
// * General
13-
$black: $db-color-cool-gray-800;
14-
$black-bis: $db-color-cool-gray-700;
15-
$black-ter: $db-color-cool-gray-600;
16-
17-
$gray-darker: $db-color-cool-gray-600;
18-
$gray-dark: $DBdarkgray;
19-
$gray: $DBgray;
20-
$gray-light: $DBlightgray;
21-
$gray-lighter: $DBwhitegray;
22-
23-
// $white-ter:
24-
// $white-bis:
25-
// $white:
26-
27-
$orange: $db-color-yellow-900;
28-
// $yellow:
29-
$green: $db-color-green-600;
30-
// $turquoise:
31-
// $cyan:
32-
$blue: $db-color-cyan-600;
33-
// $purple:
34-
$red: $db-color-red;
35-
$red-invert: #fff;
36-
37-
// * Enterprise Design System
38-
39-
// Enterprise Design System Colors
40-
$Text: $db-color-cool-gray-800; // Text
41-
$Background: $db-color-cool-gray-700; // Background, buttons
42-
$Buttons: $db-color-cool-gray-700; // Background, buttons
43-
$Icons: $db-color-cool-gray-600; // Icons, divider
44-
$divider01: $db-color-cool-gray-700; // Icons, divider
45-
$inputfields: $DBdarkgray; // Input fields
46-
$selected: $db-color-cool-gray-400; // selected -> to be changed
47-
$divider02: $db-color-cool-gray-200; // Divider
48-
$hover: $db-color-cool-gray-200; // hover -> to be changed
49-
$LightBG: #fdfdfd; // Background
50-
$highlight-color01: $db-color-red; // Highlight color
51-
$highlight-color02: $blue; // Highlight color
52-
$hover-buttons: $db-color-red-600; // hover Buttons
53-
54-
// Semantic color codes
55-
// * light background
56-
// $db-color-red-500, defined already
57-
// $db-color-light-green-400, defined already
58-
// $db-color-cyan-300, defined already
59-
// * dark background
60-
// $db-color-yellow-300, defined already
61-
// $db-color-light-green-300, defined already
62-
63-
// Color set
64-
$eds-colors: () !default;

source/_patterns/00-base/colors/feedback.hbs

Lines changed: 0 additions & 12 deletions
This file was deleted.

source/_patterns/00-base/colors/feedback.listitems.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)