Skip to content

refactor: renamed bundle scss file and fixed path in usage files #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 1, 2022
Merged

refactor: renamed bundle scss file and fixed path in usage files #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82bc6d1
refactor: renamed db-ui-base.scss
annsch Nov 1, 2022
ffb8842
refactor: consume renamed file
annsch Nov 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"copy:assets": "cpr assets build/assets -d",
"copy:scss": "cpr scss build/scss -o",
"build:style-dictionary": "node style-dictionary.js && npm run copy:scss",
"build:patternlab-css": "sass source/css/db-ui-base.scss:out/css/db-ui-base.css --style=compressed --embed-sources --load-path=node_modules",
"build:patternlab-css": "sass source/css/patternlab.scss:out/css/patternlab.css --style=compressed --embed-sources --load-path=node_modules",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@annsch why not call it documentation.scss or something similar instead?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mfranzke this branch was merged without duscussing your feedback, sry. I'll open an issue for this.

"build:tailwind": "node scripts/tailwind-config-generator.mjs false true && cpr scripts/tailwind-config-generator.mjs build/tailwind/tailwind-config-generator.mjs -o",
"build-test:css": "sass build/scss/_db-ui.scss:build/css/db-ui.css --load-path=node_modules",
"build-test:css": "sass build/scss/_db-ui-base.scss:build/css/db-ui-base.css --load-path=node_modules",
"build": "npm-run-all copy:assets build:* pl:build",
"clean": "rm -rf build",
"lint": "npm-run-all -p lint:*",
Expand Down
0 scss/_db-ui.scss → scss/_db-ui-base.scss
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion source/_meta/_head.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width" />

<link rel="stylesheet" href="../../css/db-ui-base.css?{{ cacheBuster }}" media="all" />
<link rel="stylesheet" href="../../css/patternlab.css?{{ cacheBuster }}" media="all" />
<link rel="stylesheet" href="../../css/pattern-scaffolding.css?{{ cacheBuster }}" media="all" />
<link rel="stylesheet" href="https://db-ui.github.io/core/css/pattern-scaffolding-project-specific.css?{{ cacheBuster }}" media="all" />

Expand Down
2 changes: 1 addition & 1 deletion source/_patterns/sizings/usage.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<db-tab label="SCSS" name="tab-bar" active>
<pre>
<code class="language-scss">/* ./index.scss */
@import "@db-ui-base/build/scss/db-ui";
@import "@db-ui/base/build/scss/db-ui-base";

body {
@extend %db-ui-functional;
Expand Down
2 changes: 1 addition & 1 deletion source/_patterns/spacings/usage.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<db-tab label="SCSS" name="tab-bar" active>
<pre>
<code class="language-scss">/* ./index.scss */
@import "@db-ui-base/build/scss/db-ui";
@import "@db-ui/base/build/scss/db-ui-base";

body {
@extend %db-ui-functional;
Expand Down
2 changes: 1 addition & 1 deletion source/_patterns/typography/usage.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<p>Applies all font-faces to body and headlines:</p>
<pre>
<code class="language-scss">/* ./index.scss */
@import "@db-ui-base/build/scss/db-ui";
@import "@db-ui/base/build/scss/db-ui-base";

body {
@extend %db-ui-functional;
Expand Down
2 changes: 1 addition & 1 deletion source/css/db-ui-base.scss → source/css/patternlab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../../build/scss/db-ui";
@import "../../build/scss/db-ui-base";
@import "../../build/scss/typography-classes";
@import "../../build/scss/color-classes";

Expand Down