Skip to content
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.

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

(enhancement) bump styling to carbon 11 for form-entry engine #1

Merged
merged 1 commit into from
Aug 31, 2022

Conversation

donaldkibet
Copy link
Member

Requirements

  • This PR has a title that briefly describes the work done, including the ticket number if there is a ticket.

Summary

  • Update the styling of form-entry to Carbon 11

Screenshots

None.

Issue

None.

Other

None.

@donaldkibet donaldkibet changed the title (enhancement) bumb styling to carbon 11 for form-entry engine (enhancement) bump styling to carbon 11 for form-entry engine Aug 29, 2022
@donaldkibet donaldkibet force-pushed the enhancement/carbon11 branch from b809f1b to 1a6087a Compare August 29, 2022 13:57
Copy link
Contributor

@makombe makombe left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@ibacher ibacher left a comment

Choose a reason for hiding this comment

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

@donaldkibet Thanks for this! Some nit-picky changes are necessary, but broadly this looks good.

@@ -36,7 +36,7 @@ jobs:
with:
node-version: "16"
cache: "npm"
- run: yarn install --frozen-lockfile
- run: yarn install
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
- run: yarn install
- run: yarn install --frozen-lockfile

.gitignore Outdated
@@ -16,6 +16,7 @@
*.launch
.settings/
*.sublime-workspace
.yarn
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
.yarn

Copy link
Member

Choose a reason for hiding this comment

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

If you're moving this repo over to Yarn 3, please see the Yarn docs for what needs to be in the .gitignore.

@@ -13,7 +13,7 @@
"e2e": "ng e2e"
},
"peerDependencies": {
"carbon-components": "10.x"
"@carbon/styles": "1.x"
Copy link
Member

Choose a reason for hiding this comment

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

This should be a dependency, not a peer dependency (it isn't provided at runtime).

@@ -0,0 +1,9 @@
/* You can add global styles to this file, and also import other style files */
@import '~@carbon/styles/css/styles.min.css';
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
@import '~@carbon/styles/css/styles.min.css';
@import '~@carbon/styles';

@@ -36,7 +36,7 @@ jobs:
with:
node-version: "16"
cache: "npm"
- run: yarn install --frozen-lockfile
- run: yarn install
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
- run: yarn install
- run: yarn install --frozen-lockfile

Or for Yarn v3:

Suggested change
- run: yarn install
- run: yarn install --immutable

Copy link
Member Author

@donaldkibet donaldkibet Aug 30, 2022

Choose a reason for hiding this comment

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

yarn lock files needs to be updated since i am bumping the carbon dependencies

Copy link
Member

Choose a reason for hiding this comment

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

The yarn lock files need to be updated, but that should be part of your commit. By the time CI is running, the yarn lock file shouldn't need to be updated (this is basically the use-case for this flag).

@donaldkibet donaldkibet force-pushed the enhancement/carbon11 branch 7 times, most recently from 88e3da3 to b323c82 Compare August 30, 2022 09:57
@donaldkibet donaldkibet force-pushed the enhancement/carbon11 branch from b323c82 to 06c294c Compare August 31, 2022 08:03
@donaldkibet donaldkibet requested review from makombe and ibacher and removed request for makombe and ibacher August 31, 2022 08:14
denniskigen
denniskigen approved these changes Aug 31, 2022
@ibacher
Copy link
Member

ibacher commented Aug 31, 2022

Thanks @donaldkibet!

@ibacher ibacher merged commit 2ccfc4a into openmrs:main Aug 31, 2022
@donaldkibet donaldkibet deleted the enhancement/carbon11 branch August 31, 2022 17:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants