Skip to content

Commit

Permalink
(refactor) Ward: Refactor styling imports and use Carbon spacing tokens
Browse files Browse the repository at this point in the history
This PR refactors some left over some CSS carbon spacing module imports to import from `@carbon/layout` instead of `@carbon/styles/scss/spacing`. It also replaces CSS imports from
the vars library in the framework that use the old `@import` directive, replacing them with the `@use` directive.
  • Loading branch information
denniskigen committed Oct 23, 2024
1 parent 37dd2aa commit 3508f98
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
10 changes: 5 additions & 5 deletions packages/esm-ward-app/src/ward-view-header/ward-metric.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@use '@carbon/styles/scss/spacing';
@use '@carbon/layout';
@use '@carbon/type';
@import '~@openmrs/esm-styleguide/src/vars';
@use '@openmrs/esm-styleguide/src/vars' as *;

.metric {
margin-left: spacing.$spacing-05;
margin-left: layout.$spacing-05;
display: flex;
align-items: end;
gap: 5px;
Expand All @@ -20,6 +20,6 @@
}

.skeleton {
height: 15px;
width: 15px;
height: layout.$spacing-05;
width: layout.$spacing-05;
}
3 changes: 1 addition & 2 deletions packages/esm-ward-app/src/ward-view-header/ward-metrics.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@use '@carbon/styles/scss/spacing';
@import '~@openmrs/esm-styleguide/src/vars';
@use '@openmrs/esm-styleguide/src/vars' as *;

.metricsContainer {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-ward-app/src/ward-view/ward-view.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use '@carbon/layout';
@import '~@openmrs/esm-styleguide/src/vars';
@use '@openmrs/esm-styleguide/src/vars' as *;

.wardView {
background-color: #e4e4e4;
Expand Down

0 comments on commit 3508f98

Please sign in to comment.