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.

Sign up for GitHub

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

Jump to bottom

Try additional borders and padding for nested blocks #14961

Merged
merged 38 commits into from
Jul 30, 2019
Merged

Try additional borders and padding for nested blocks #14961

merged 38 commits into from
Jul 30, 2019

Commits on Jun 6, 2019

  1. Add extra padding and borders to child blocks 

    (When their parents are selected.)
    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    d3f8857 View commit details
    Browse the repository at this point in the history

  2. Small tweaks margin/padding of selected Media+Text/Group blocks.

    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    8165e5a View commit details
    Browse the repository at this point in the history

  3. Add has-child-selected class to parent blocks. 

    Props @gziolo
    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    e5d35b1 View commit details
    Browse the repository at this point in the history

  4. Adjust border/padding to also apply when child blocks are selected.

    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    67a7180 View commit details
    Browse the repository at this point in the history

  5. Try an animation when nested blocks are selected.

    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    09bc3a4 View commit details
    Browse the repository at this point in the history

  6. Hide the "Column" block.

    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    879f025 View commit details
    Browse the repository at this point in the history

  7. Try using a scale animation for child blocks.

    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    66e535d View commit details
    Browse the repository at this point in the history

  8. Reduce scale animation to be really tiny.

    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    77dedc1 View commit details
    Browse the repository at this point in the history

  9. Re-add has-child-selected class.

    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    a50aa46 View commit details
    Browse the repository at this point in the history

  10. Selecting parents: Try clickthrough. 

    Clickthrough has you select the parent before you can select the child. This is already in place on the mobile breakpoints, this just expands it to desktop as well.

It is a work in progress, right now it is not working as intended: once you have "unlocked" the deepest level, it becomes immediately locked and you have to click through the layers again to unlock it again. The deepest layer should always be unlocked until you deselect all blocks again.
    @gziolo
    Joen Asmussen authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    66ca27b View commit details
    Browse the repository at this point in the history

  11. Add some visual debugging for nested overlays

    @gziolo
    gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    cd153fc View commit details
    Browse the repository at this point in the history

  12. Add hasChildSelected prop

    @gziolo
    gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    762ab1d View commit details
    Browse the repository at this point in the history

  13. Add borders/padding to direct children + parents only.

    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    869acc7 View commit details
    Browse the repository at this point in the history

  14. Revert "Merge branch 'try/clickthrough' into try/additional-borders-p… 

    …adding-for-child-blocks"

This reverts commit 9a9297b, reversing
changes made to 783708f.
    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    60c849f View commit details
    Browse the repository at this point in the history

  15. Revert "Add borders/padding to direct children + parents only." 

    This reverts commit 783708f.
    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    324d293 View commit details
    Browse the repository at this point in the history

  16. Revert "Add hasChildSelected prop" 

    This reverts commit a3e9dbd.
    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    4f54fd7 View commit details
    Browse the repository at this point in the history

  17. Remove animation, adjust specificity. 

    ... so that only direct children get borders/padding, whereas all parents do too.
    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    e717cfc View commit details
    Browse the repository at this point in the history

  18. Columns block adjustments. 

    Ensures better compatibility with the borders/padding.
    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    e4612ea View commit details
    Browse the repository at this point in the history

  19. Clean up media-text block CSS.

    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    8d27002 View commit details
    Browse the repository at this point in the history

  20. Correct block breadcrumb position for the column block.

    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    84824a0 View commit details
    Browse the repository at this point in the history

  21. Move all block movers up above contextual toolbars.

    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    0a4903e View commit details
    Browse the repository at this point in the history

  22. Clean up block list appender margins.

    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    272fe4a View commit details
    Browse the repository at this point in the history

  23. Clean up block list appender margins for the columns block.

    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    a3e32ce View commit details
    Browse the repository at this point in the history

  24. Reduce specificity for the group block appender overrides.

    @kjellr @gziolo
    kjellr authored and gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    c6462d9 View commit details
    Browse the repository at this point in the history

  25. Resolve merge inconsitencies after rebasing this branch

    @gziolo
    gziolo committed Jun 6, 2019
    Configuration menu
    Copy the full SHA
    9228859 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2019

  1. Merge branch 'master' into try/additional-borders-padding-for-child-b… 

    …locks
    @kjellr
    kjellr committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    8e6705d View commit details
    Browse the repository at this point in the history

  2. Improve compaibiilty with custom inner containers. 

    Like those used for the Group + Cover blocks.
    @kjellr
    kjellr committed Jun 17, 2019
    Configuration menu
    Copy the full SHA
    ce2759a View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2019

  1. Merge branch 'master' into try/additional-borders-padding-for-child-b… 

    …locks
    @kjellr
    kjellr committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    b0e5c99 View commit details
    Browse the repository at this point in the history

  2. Move extra padding to just the columns and group blocks.

    @kjellr
    kjellr committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    f46d338 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2019

  1. Merge branch 'master' into try/additional-borders-padding-for-child-b… 

    …locks
    @kjellr
    kjellr committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    77c5321 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2019

  1. Try fixing e2e test

    @ellatrix
    ellatrix committed Jun 25, 2019
    Configuration menu
    Copy the full SHA
    47f6f44 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2019

  1. Merge branch 'master' into try/additional-borders-padding-for-child-b… 

    …locks
    @kjellr
    kjellr committed Jul 1, 2019
    Configuration menu
    Copy the full SHA
    ac69599 View commit details
    Browse the repository at this point in the history

  2. Clean up columns block placeholder padding.

    @kjellr
    kjellr committed Jul 1, 2019
    Configuration menu
    Copy the full SHA
    2ff9a80 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2019

  1. Modify writing-flow test to pass. 

    Shortens the text inside the column block so that it doesn't wrap into 2 lines.
    @kjellr
    kjellr committed Jul 9, 2019
    Configuration menu
    Copy the full SHA
    82dfc34 View commit details
    Browse the repository at this point in the history

  2. Followup to 82dfc34 

    Modifies writing-flow test to include shorter copy in the columns block.
    @kjellr
    kjellr committed Jul 9, 2019
    Configuration menu
    Copy the full SHA
    45b7bbb View commit details
    Browse the repository at this point in the history

  3. Update snapshots for writing-flow test.

    @kjellr
    kjellr committed Jul 9, 2019
    Configuration menu
    Copy the full SHA
    f67dccf View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2019

  1. Add inline comments about the test adjustment.

    @kjellr
    kjellr committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    1b9d6bb View commit details
    Browse the repository at this point in the history

  2. Remove previous attempt to fix failing tests.

    @kjellr
    kjellr committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    7a0a201 View commit details
    Browse the repository at this point in the history