Skip to content

Commit

Permalink
fix: issues for asset paths and rename webpack.assets-paths (#143)
Browse files Browse the repository at this point in the history
fix: issues for asset paths and rename webpack.assets-paths to sass.assets-path
  • Loading branch information
nmerget authored Nov 16, 2022
1 parent c30fad7 commit c5738fc
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
8 changes: 5 additions & 3 deletions scss/_rollup.assets-paths.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// If this library is used as an npm dependency, and the source files should be included rather than css, this corrects the paths.
$icons-path: "@db-ui/core/dist/icons/";
$images-path: "@db-ui/core/dist/images/";
$fonts-path: "@db-ui/core/dist/fonts/";
@use "default.assets-paths" as * with (
$icons-path: "@db-ui/base/build/assets/icons/",
$images-path: "@db-ui/base/build/assets/images/",
$fonts-path: "@db-ui/base/build/assets/fonts/"
);
6 changes: 6 additions & 0 deletions scss/_sass.assets-paths.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// If this library is used as an npm dependency, and the source files should be included rather than css, this corrects the paths.
@use "default.assets-paths" with (
$icons-path: "~@db-ui/base/build/assets/icons/",
$images-path: "~@db-ui/base/build/assets/images/",
$fonts-path: "~@db-ui/base/build/assets/fonts/"
);
4 changes: 0 additions & 4 deletions scss/_webpack.assets-paths.scss

This file was deleted.

10 changes: 4 additions & 6 deletions scss/icon/icons.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
// @import "icons.variables";

@use "icons.variables" as *;
@use "icons.attributes-mappings" as *;
@use "icons.helpers" as *;
@use "icons.custom-properties" as *;
@use "icons.font-faces" as *;
@use "icons.variables" as *;
@use "icons.placeholder" as *;
@forward "icons.attributes-mappings";
@forward "icons.custom-properties";
@forward "icons.font-faces";

[data-icon],
[data-icon-before] {
Expand Down

0 comments on commit c5738fc

Please sign in to comment.