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

Update dropshadows to the latest guidelines #736

Closed
wants to merge 24 commits into from
Closed

Update dropshadows to the latest guidelines #736

wants to merge 24 commits into from

Conversation

lokesh-sagi125
Copy link
Contributor

@lokesh-sagi125 lokesh-sagi125 commented Aug 20, 2024

Description

updating dropshadow according to the latest guidelines and replacing box-shadow eith appropriate dropshadow

updated the elemnts in the kds repo to use the dropshadows according to the latest guidelines and replace other elements like boxshadows with appropriate dropshadow.

Addresses #724

Changelog

replaced redundant dropshadows with most relavent version out of dropshadow(1,2,6)
switched out the box shadow with appropriate drop-shadows
added the import functions to the files missing them
@MisRob MisRob added the TODO: needs review Waiting for review label Aug 21, 2024
@MisRob
Copy link
Member

MisRob commented Aug 21, 2024

Thanks @lokesh-sagi125. Did very brief skim and overall it seems to me it does what it's supposed to :) I will invite my colleagues for a full review. Meanwhile, please run yarn lint-fix and commit to resolve linting issues.

@lokesh-sagi125
Copy link
Contributor Author

yes @MisRob on it

@lokesh-sagi125
Copy link
Contributor Author

hey , just ran yarn-fix and updated the change log, sorry for the inconvenience i am new to contributing

@MisRob
Copy link
Member

MisRob commented Aug 21, 2024

@lokesh-sagi125 Sure, no problem at all, we're happy to provide guidance to new contributors :) Thanks!

@MisRob
Copy link
Member

MisRob commented Aug 21, 2024

@lokesh-sagi125 would you be able to resolve the conflict? I think you updated the styling page but I also updated it as part of the writing styling guidance that you followed. I just merged my PR to develop and it caused conflict here. You can resolve by (1) merging the latest upstream develop branch to this branch and (2) accept changes incoming from the upstream develop in docs/pages/styling/index.vue_ file. As a result, your PR will contain no changes to docs/pages/styling/index.vue.

Thanks for taking care of the file too and sorry I have forgotten to mention this when you picked up the issue.

@lokesh-sagi125
Copy link
Contributor Author

@MisRob done with including the changes, can you try merging again?

@MisRob
Copy link
Member

MisRob commented Aug 21, 2024

I already merged my work @lokesh-sagi125, that's why you saw the conflict. But I see you resolved that now! Looking good, thanks.

@lokesh-sagi125
Copy link
Contributor Author

hey @MisRob is there sth wrong with the pr or can i move on to another issue?

@MisRob
Copy link
Member

MisRob commented Aug 27, 2024

Hi @lokesh-sagi125, I don't think that anything is wrong :) Seems nobody got to do the review yet. You don't need to wait for a review to be finished to work on another task, so you're welcome to pick something.

@marcellamaki marcellamaki added this to the KDS Priority Triage milestone Aug 27, 2024
Copy link
Member

@akolson akolson left a comment

Choose a reason for hiding this comment

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

Hi @lokesh-sagi125! great work on the clean up. As opposed to commenting out the old code, It makes more sense to remove it altogether, as we wont need it :). Based on the acceptance criteria,

However, the unused %dropshadow-...s shouldn’t be deleted from definitions.scss yet (they are still being referenced from some non-KDS components in the products).

we can safely delete them save for the aforementioned exception.

@lokesh-sagi125 lokesh-sagi125 requested a review from akolson August 28, 2024 16:55
CHANGELOG.md Outdated
Copy link
Member

Choose a reason for hiding this comment

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

Leaving a note here that before merging it'd be good to revert CHANGELOG.md changes since the new GH action will now update the CHANGELOG.md after merging this PR by pasting the changelog from the PR description. Otherwise we'd have duplicate entries.

@MisRob
Copy link
Member

MisRob commented Aug 29, 2024

Thanks for following-up @lokesh-sagi125. cc @akolson will leave the final approve on you, just leaving a note that I already updated the changelog description in the PR.

yarn.lock Outdated
Copy link
Member

@MisRob MisRob Aug 29, 2024

Choose a reason for hiding this comment

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

Would you revert this file @lokesh-sagi125?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

Copy link
Member

Choose a reason for hiding this comment

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

Ideally this file shouldn't be a part of the pr. Could you please do this and the revert should be complete. Thanks again @lokesh-sagi125

Copy link
Member

@akolson akolson Aug 30, 2024

Choose a reason for hiding this comment

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

Hi @lokesh-sagi125 apologies on the back and forth, but this latest change would now cause breakages as yargs-parser... dependency has been removed. Could you please do this as suggested by my colleague @MisRob

Copy link
Member

@akolson akolson left a comment

Choose a reason for hiding this comment

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

After the revert of the yarn.lock, we should be good with this. Leaving a blocker here to prevent accidental merge. But all is good. Thanks @lokesh-sagi125 for your contribution!

@nucleogenesis nucleogenesis removed their request for review August 29, 2024 18:48
yarn.lock Outdated
@@ -15372,4 +15372,4 @@ yargs@^16.2.0:
require-directory "^2.1.1"
string-width "^4.2.0"
y18n "^5.0.5"
yargs-parser "^20.2.2"
yargs-parser "^20.2.2"
Copy link
Member

Choose a reason for hiding this comment

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

Please remove this added new line that is causing the diff in this file.

@MisRob
Copy link
Member

MisRob commented Aug 30, 2024

Hi @lokesh-sagi125, another way to formulate what we're trying to say with @akolson regarding yarn.lock is that when you go to the Files tab in this pull request https://github.com/learningequality/kolibri-design-system/pull/736/files, there should be no yarn.lock file present at all. This would cause issues with dependencies.

This is a nice technique for removing file from a pull request https://stackoverflow.com/a/46571620

@lokesh-sagi125
Copy link
Contributor Author

the yarn.lock is not getting exclude through git commands , let me re-open the pr , sorry for the inconvenience

@akolson
Copy link
Member

akolson commented Aug 30, 2024

@lokesh-sagi125 no need to go through the trouble, we'll fix this on our side. Your pull request almost ready for the merge. Re-opening and reverting the yarn.lock. Thanks Again!

@akolson akolson reopened this Aug 30, 2024
@akolson
Copy link
Member

akolson commented Aug 30, 2024

@lokesh-sagi125 I have already made the revert and will be pushing shortly. :)

@lokesh-sagi125
Copy link
Contributor Author

hey @akolson @MisRob sorry i couldn't of much help while fixing the issue, i will make sure to keep these issues in mind for my future contributions , thank you for being supportive :) .

@lokesh-sagi125 lokesh-sagi125 closed this by deleting the head repository Aug 30, 2024
@MisRob
Copy link
Member

MisRob commented Aug 30, 2024

No problem @lokesh-sagi125, it was just 1 file out of 13 ;)

However I'm sorry to say you've just closed it by deleting your fork, and we can't re-open in this case.

@lokesh-sagi125
Copy link
Contributor Author

oh im really sorry about that ; i was on the wrong user let me reopen it

@MisRob
Copy link
Member

MisRob commented Aug 30, 2024

@lokesh-sagi125 I am pretty sure that was accidental. Just let us know if you wish to open a new PR ;)

@MisRob
Copy link
Member

MisRob commented Aug 30, 2024

No worries.

@akolson
Copy link
Member

akolson commented Aug 30, 2024

@lokesh-sagi125 in case it's much of trouble, please let me know as I can create a branch with your changes if necessary. Thanks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
TODO: needs review Waiting for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants