Skip to content

Commit

Permalink
Fixing the scss style
Browse files Browse the repository at this point in the history
  • Loading branch information
Daphne210 committed Jan 24, 2024
1 parent 815db32 commit 0769451
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 77 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"main": "src/index.ts",
"source": true,
"scripts": {
"start": "openmrs develop",
"start": "openmrs develop --backend http://194.163.171.253:8282",
"serve": "webpack serve --mode=development",
"build": "webpack --mode production",
"analyze": "webpack --mode=production --env analyze=true",
Expand Down Expand Up @@ -120,4 +120,4 @@
"@carbon/react": "1.14.0"
},
"packageManager": "[email protected]"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -71,79 +71,4 @@
left: 0.5rem;
margin-right: -50%;
}
}

@use '@carbon/styles/scss/spacing';
@use '@carbon/styles/scss/colors';
@use '@carbon/styles/scss/type';
@import "~@openmrs/esm-styleguide/src/vars";
@import '../../root.scss';
<<<<<<<< HEAD:src/patient-chart/laboratory-active-test-order/laboratory-active-test-order-results.scss========>>>>>>>>a331a0b (U43X-360 Adding the text button):src/patient-chart/laboratory-past-test/laboratory-past-test-order-results.scss .widgetCard {
border: 1px solid colors.$gray-20;
border-bottom: none;
}

.headerBtnContainer {
background-color: $ui-background;
padding: spacing.$spacing-05;
text-align: right;
}

.tileContainer {
background-color: $ui-02;
border-top: 1px solid $ui-03;
padding: 5rem 0;
}

.tile {
margin: auto;
width: fit-content;
}

.tileContent {
display: flex;
flex-direction: column;
align-items: center;
}

.content {
@include type.type-style('heading-compact-02');
color: $text-02;
margin-bottom: 0.5rem;
}

.helper {
@include type.type-style('body-compact-01');
color: $text-02;
}

.container {
background-color: $ui-01;
}

.separator {
@include type.type-style('body-compact-02');
color: $text-02;
width: 80%;
margin: 1.5rem auto;
overflow: hidden;
text-align: center;
<<<<<<<< HEAD:src/patient-chart/laboratory-active-test-order/laboratory-active-test-order-results.scss========>>>>>>>>a331a0b (U43X-360 Adding the text button):src/patient-chart/laboratory-past-test/laboratory-past-test-order-results.scss &::before,
&::after {
background-color: $text-03;
content: '';
display: inline-block;
height: 1px;
position: relative;
vertical-align: middle;
width: 50%;
}
<<<<<<<< HEAD:src/patient-chart/laboratory-active-test-order/laboratory-active-test-order-results.scss========>>>>>>>>a331a0b (U43X-360 Adding the text button):src/patient-chart/laboratory-past-test/laboratory-past-test-order-results.scss &::before {
right: 0.5rem;
margin-left: -50%;
}
<<<<<<<< HEAD:src/patient-chart/laboratory-active-test-order/laboratory-active-test-order-results.scss========>>>>>>>>a331a0b (U43X-360 Adding the text button):src/patient-chart/laboratory-past-test/laboratory-past-test-order-results.scss &::after {
left: 0.5rem;
margin-right: -50%;
}
}

0 comments on commit 0769451

Please sign in to comment.