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

Custom Margin and Paddign Settings #19

Merged
merged 9 commits into from
Nov 26, 2021

Conversation

MuluhGodson
Copy link
Member

@MuluhGodson MuluhGodson commented Nov 23, 2021

Fixes

Fixes https://github.com/creativecommons/project_creativecommons.org/issues/121 by @brylie

Description

This PR adds padding and margin controls to the core/columns block, core/column block and core/group block. Other blocks can easily be added by adding them to the custom-block-settings.js file in the enableSpacingControlOnBlocks array.

I used v2 of theme.json but this didn't work (unsure why) but since v1 is still supported it can be used in the mean time and subsequently update to v2.

Screenshots

image

Checklist

  • My pull request has a descriptive title (not a vague title like Update index.md).
  • My pull request targets the default branch of the repository (main or master).
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no
    visible errors.

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.

@brylie
Copy link
Contributor

brylie commented Nov 24, 2021

Having the padding panels is already a good move :-)

@brylie
Copy link
Contributor

brylie commented Nov 24, 2021

Let me know when this is ready for review.

@MuluhGodson MuluhGodson changed the title Inital theme.json with custom padding settins Custom Margin and Paddign Settings Nov 24, 2021
@MuluhGodson MuluhGodson marked this pull request as ready for review November 24, 2021 22:57
@MuluhGodson MuluhGodson requested review from a team as code owners November 24, 2021 22:57
@MuluhGodson MuluhGodson requested review from JackieBinya and removed request for a team November 24, 2021 22:57
custom-block-settings.js Show resolved Hide resolved
@brylie
Copy link
Contributor

brylie commented Nov 26, 2021

@MuluhGodson, it looks like there is still a minor conflict in functions.php

@brylie brylie merged commit 461fdb9 into creativecommons:main Nov 26, 2021
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.

2 participants