Closed Dev-JoyA closed 3 weeks ago
Please update / resolve conflicts since Vocabulary was added in:
@TimidRobot conflicts resolved
It looks like you duplicated
assets/static/vocabulary/css/vocabulary.css
, doubling it's length, instead of resolving conflicts. For example:
- https://github.com/creativecommons/creativecommons.github.io-source/blob/30ba9f3173e2777562122d02efaac92a8d0a3cd0/assets/static/vocabulary/css/vocabulary.css#L1-L4
- https://github.com/creativecommons/creativecommons.github.io-source/blob/30ba9f3173e2777562122d02efaac92a8d0a3cd0/assets/static/vocabulary/css/vocabulary.css#L2061-L2064
@TimidRobot I sincerely apologies for this , it has been resolved
https://github.com/creativecommons/creativecommons.github.io-source/labels/%F0%9F%9A%A7%20status%3A%20blocked because this pull request (PR) overlaps with:
(No further reviews until #827 is merged)
Thank you for this work!!
(target branch changed to vocab-refresh as the various page parts are interdependent)
@TimidRobot Thank you for your kind words and for reviewing my work! I really appreciate your patience, help, and the corrections you provided.
Fixes
Description
This PR addresses inconsistencies in the footer of the website, aligning it with the current Vocabulary design system.
Changes Made:
Updated social media icons to match the design system's specifications.
These changes enhance the overall user experience by ensuring uniformity across the website.
Technical Details
creativecommons/vocabulary: A cohesive system of design for Creative Commons
Screenshots
Before
Now
Checklist
Update index.md
).main
ormaster
).Developer Certificate of Origin
For the purposes of this DCO, "license" is equivalent to "license or public domain dedication," and "open source license" is equivalent to "open content license or public domain dedication."
Developer Certificate of Origin
``` Developer Certificate of Origin Version 1.1 Copyright (C) 2004, 2006 The Linux Foundation and its contributors. 1 Letterman Drive Suite D4700 San Francisco, CA, 94129 Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Developer's Certificate of Origin 1.1 By making a contribution to this project, I certify that: (a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or (b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or (c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it. (d) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved. ```