Skip to content

Commit edfa1b8

Browse files
committed
fix: import db-ui/base only once
1 parent 6d5bb10 commit edfa1b8

File tree

6 files changed

+21
-32
lines changed

6 files changed

+21
-32
lines changed

source/css/_db-ui-core.variables.scss

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,16 @@
33
***** */
44

55
// Define the path for both image and font folders
6-
// $icons-path: "../../icons/" !default;
7-
// $images-path: "../../images/" !default;
8-
// $fonts-path: "../../fonts/" !default;
6+
$icons-path: "../../icons/" !default;
7+
$images-path: "../../images/" !default;
8+
$fonts-path: "../../fonts/" !default;
99

10-
// @import "@db-ui/base/build/scss/variables";
10+
// TODO change later and use db-ui/base bundle files
11+
12+
@import "@db-ui/base/build/scss/variables";
13+
@import "@db-ui/base/build/scss/variables.global";
14+
// TODO change later, placeholders shouldn't be imported here
15+
@import "@db-ui/base/build/scss/color-placeholder";
1116

1217
// General configurations
1318
$dbBaseFontSize: 16px;

source/css/db-ui-core.general.scss

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,7 @@
22
This is mainly meant to get included within scoped components like e.g. within StencilJS Custom Components / DB UI Elements
33
***** */
44

5-
@import "db-ui-core.variables";
65
@import "@csstools/normalize.css/normalize";
6+
@import "db-ui-core.variables";
77
@import "../_patterns/00-base/init";
88
@import "fonts.general";
9-
10-
$icons-path: "../../icons/" !default;
11-
$images-path: "../../images/" !default;
12-
$fonts-path: "../../fonts/" !default;
13-
14-
@import "@db-ui/base/build/scss/db-ui-base";
15-
16-
/* TODO: We most likely need to rework this */
17-
body,
18-
div,
19-
button,
20-
input,
21-
select,
22-
textarea {
23-
@extend %general-fonts;
24-
}

source/css/db-ui-core.vars.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ $icons-path: "../icons/" !default;
99
$images-path: "../images/" !default;
1010
$fonts-path: "../fonts/" !default;
1111

12-
// General variables by DB UI Base
13-
@import "@db-ui/base/build/scss/variables";
14-
1512
@import "../_patterns/00-base/icons/icons.variables";
1613
@import "../_patterns/00-base/icons/icons.font-faces";
1714

source/css/enterprise/db-ui-core.demonstration.scss

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
@charset "utf-8";
22

3-
@import "../helpers/functions";
4-
@import "../../_patterns/00-base/helpers";
5-
63
@import "db-ui-core.variables";
74

5+
@import "@db-ui/base/build/scss/typescale";
6+
7+
@import "../../_patterns/00-base/helpers";
8+
89
@import "../../_patterns/00-base/init.demonstration";
910

1011
@import "../../_patterns/00-base/icons/icons.demonstration";
@@ -22,3 +23,7 @@
2223
@import "../../_patterns/02-components/table/enterprise/table.demonstration";
2324
@import "../../_patterns/03-areas/02-grid/enterprise/grid.demonstration";
2425
@import "../../_patterns/04-pages/enterprise/intro.demonstration";
26+
27+
:root {
28+
@extend %db-ui-functional;
29+
}

source/css/enterprise/db-ui-core.vars.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ $icons-path: "../../icons/" !default;
33
$images-path: "../../images/" !default;
44
$fonts-path: "../../fonts/" !default;
55

6-
@import "@db-ui/base/build/scss/variables";
7-
86
@import "../../_patterns/00-base/colors/enterprise/colors";
97
@import "../../_patterns/00-base/type/enterprise/fonts";
108
@import "../../_patterns/00-base/icons/enterprise/icons.variables";

source/css/pattern-scaffolding-project-specific.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ body,
99
font-family: $db-font-family-sans;
1010
}
1111

12-
pl-header {
13-
font-size: to-rem($pxValue: 15.49191);
14-
}
12+
// pl-header {
13+
// font-size: to-rem($pxValue: 15.49191);
14+
// }
1515

1616
pl-logo {
1717
align-self: flex-start !important; // shame.css

0 commit comments

Comments
 (0)