-
Notifications
You must be signed in to change notification settings - Fork 668
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 Kolibri Design System guidelines #12630
Conversation
Hi @MisRob, I opened the draft pull request for asking:
|
Hi @Suraj-kumar00, thanks! So from the code, you grasped the task overall, so all good in that regard. To answer
|
Build Artifacts
|
Thanks @Suraj-kumar00! Would you fill in the PR template before I invite someone for review? |
Hi @MisRob, how have you been? |
Hi @Suraj-kumar00, I will invite reviewers. I'm sorry for delay - I am not getting notifications about PR template update, better to ping us next time :) |
@marcellamaki @akolson would you please review some time this week? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @Suraj-kumar00 - thanks very much for your work on this! And I apologize for the delayed review. I had done the review last week and then never saved my comments.
I added a few small requests for adjustments, but overall the work looks great. There are some scenarios which are either not covered by the documentation or are ambiguous, so I've tried to make some best-guesses for the sake of consistency. If you would be able to make those changes, that would be great, and then we will go ahead and approve and merge 🎉
Thanks again for your contribution!
kolibri/plugins/learn/assets/src/views/HybridLearningLessonCard.vue
Outdated
Show resolved
Hide resolved
kolibri/plugins/learn/assets/src/views/SearchFiltersPanel/index.vue
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you @Suraj-kumar00 for your contributions and updates! Approved. The last thing to resolve before merge is you will see that there is a conflict. Please rebase your PR off of develop
and resolve the conflict, and then we can merge. Thank you
Hi @marcellamaki, tried but I never saw the confilct! |
Hi @Suraj-kumar00 -- it looks like you are up to date with You'll want to make sure you also have a remote set for the learning equality upstream, if you haven't done so already. This allows you to keep your fork up to date with the main learning equality repo One you have both
From there, you should be able to see the conflicts, in your terminal, and resolve them in your IDE. |
Can you check now? |
Hi @MisRob @marcellamaki, how have you been? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi again @Suraj-kumar00 -- in my review I missed that there were still a few places with %dropshadow-4dp
which should have been updated to use 1, 2, or 6. This is why the build is breaking for the .whl file which is resulting in a failing check. I've indicated those with comments. Could you update each of these places to 2dp? thank you!
kolibri/plugins/learn/assets/src/views/TopicsPage/TopicsPanelModal.vue
Outdated
Show resolved
Hide resolved
packages/kolibri-common/components/SearchFiltersPanel/index.vue
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like the build failures are related to learningequality/kolibri-design-system#725 being merged which is still in progress. So we might have to wait to merge it in once ready. Adding a little blocker here! Thanks @Suraj-kumar00 for the changes this far!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey @akolson. I jumped into the code and I saw the failures are because the shadows are exposed by kolibri-design-system/lib/styles/definitions
, so we need to import @import '~kolibri-design-system/lib/styles/definitions';
to be able to use the @extend %dropshadow-2dp;
statement. In these fles we are using @extend %dropshadow-2dp;
without importing the kds definitions:
- https://github.com/Suraj-kumar00/kolibri/blob/2dbced371d59eeb798ae9f4851e6737041f9a1b4/kolibri/plugins/learn/assets/src/views/TopicsPage/TopicsPanelModal.vue#L109
- https://github.com/Suraj-kumar00/kolibri/blob/2dbced371d59eeb798ae9f4851e6737041f9a1b4/kolibri/plugins/pdf_viewer/assets/src/views/SideBar/index.vue#L149
- https://github.com/Suraj-kumar00/kolibri/blob/2dbced371d59eeb798ae9f4851e6737041f9a1b4/packages/kolibri-common/components/SearchFiltersPanel/index.vue#L374
@Suraj-kumar00 Could you please add the import @import '~kolibri-design-system/lib/styles/definitions';
at the top of the styles block to fix the failure please? :)
Sure @AlexVelezLl, So I have to add this import in all of the three file you mentioned right? |
Yes! @Suraj-kumar00 👐 |
|
In the |
Thanks updating soon. |
Hi @AlexVelezLl, I have updated the changes. Let me know if there any other changes required. |
Changes addressed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! There are no more failing checks and code changes makes sense, I hanvent found any of the removed dropshadow values. Thank you @Suraj-kumar00!!!
Summary
This PR updates the dropshadow styles in the codebase to align with the latest Kolibri Design System guidelines.
I used only
%dropshadow-1dp, %dropshadow-2dp, and %dropshadow-6dp
to update the dropshadow from%dropshadow-4dp, %dropshadow-8dp, and %dropshadow-16dp
.References
Related issue: #12552
Kolibri Design System guideline: Dropshadow Spec
Reviewer guidance
Testing checklist
PR process
Reviewer checklist
yarn
andpip
)