feat: include base bundle

annsch · annsch · commit 6d5bb10d721c · 2022-11-10T12:14:09.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@csstools/normalize.css": "^12.0.0",
-    "@db-ui/base": "2.0.0-3-794c2f8"
+    "@db-ui/base": "2.0.0-5-6db143b"
   },
   "devDependencies": {
     "@babel/cli": "^7.19.3",
diff --git a/source/_patterns/00-base/icons/_icons.helpers.scss b/source/_patterns/00-base/icons/_icons.helpers.scss
@@ -63,7 +63,7 @@
 				content: none;
 			}
 		} @else {
-			@extend %icon;
+			@extend %icon !optional;
 		}
 	}
 }
diff --git a/source/_patterns/00-base/icons/icons.scss b/source/_patterns/00-base/icons/icons.scss
@@ -10,14 +10,14 @@
 [data-icon],
 [data-icon-before] {
 	&::before {
-		@extend %icon;
+		@extend %icon !optional;
 		margin-inline-end: var(--icon-margin-after, #{$icon-content-space});
 	}
 }
 
 [data-icon-after] {
 	&::after {
-		@extend %icon;
+		@extend %icon !optional;
 		margin-inline-start: var(--icon-margin-before, #{$icon-content-space});
 	}
 }
diff --git a/source/css/_db-ui-core.variables.scss b/source/css/_db-ui-core.variables.scss
@@ -3,11 +3,11 @@
 ***** */
 
 // Define the path for both image and font folders
-$icons-path: "../../icons/" !default;
-$images-path: "../../images/" !default;
-$fonts-path: "../../fonts/" !default;
+// $icons-path: "../../icons/" !default;
+// $images-path: "../../images/" !default;
+// $fonts-path: "../../fonts/" !default;
 
-@import "@db-ui/base/build/scss/db-ui-base";
+// @import "@db-ui/base/build/scss/variables";
 
 // General configurations
 $dbBaseFontSize: 16px;
diff --git a/source/css/db-ui-core.general.scss b/source/css/db-ui-core.general.scss
@@ -7,6 +7,12 @@
 @import "../_patterns/00-base/init";
 @import "fonts.general";
 
+$icons-path: "../../icons/" !default;
+$images-path: "../../images/" !default;
+$fonts-path: "../../fonts/" !default;
+
+@import "@db-ui/base/build/scss/db-ui-base";
+
 /* TODO: We most likely need to rework this */
 body,
 div,
@@ -16,7 +22,3 @@ select,
 textarea {
 	@extend %general-fonts;
 }
-
-body {
-	@extend %db-ui-normal;
-}
diff --git a/source/css/db-ui-core.vars.scss b/source/css/db-ui-core.vars.scss
@@ -10,7 +10,7 @@ $images-path: "../images/" !default;
 $fonts-path: "../fonts/" !default;
 
 // General variables by DB UI Base
-@import "@db-ui/base/build/scss/db-ui-base";
+@import "@db-ui/base/build/scss/variables";
 
 @import "../_patterns/00-base/icons/icons.variables";
 @import "../_patterns/00-base/icons/icons.font-faces";
diff --git a/source/css/pattern-scaffolding-project-specific.scss b/source/css/pattern-scaffolding-project-specific.scss
@@ -1,6 +1,5 @@
 @import "helpers/functions";
 @import "db-ui-core.variables";
-@import "@db-ui/base/build/scss/db-ui-base";
 $fonts-path: "../fonts/";
 @import "../_patterns/00-base/type/fonts";
 

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@`
`63`	`63`	`content: none;`
`64`	`64`	`}`
`65`	`65`	`} @else {`
`66`		`- @extend %icon;`
	`66`	`+ @extend %icon !optional;`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,14 +10,14 @@`
`10`	`10`	`[data-icon],`
`11`	`11`	`[data-icon-before] {`
`12`	`12`	`&::before {`
`13`		`- @extend %icon;`
	`13`	`+ @extend %icon !optional;`
`14`	`14`	`margin-inline-end: var(--icon-margin-after, #{$icon-content-space});`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`[data-icon-after] {`
`19`	`19`	`&::after {`
`20`		`- @extend %icon;`
	`20`	`+ @extend %icon !optional;`
`21`	`21`	`margin-inline-start: var(--icon-margin-before, #{$icon-content-space});`
`22`	`22`	`}`
`23`	`23`	`}`