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

Page building improvements #2144

Merged
merged 59 commits into from
Feb 8, 2024
Merged
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
76fe771
Start implementing page block groups
jimsafley Dec 8, 2023
446fe00
Refactor block group
jimsafley Dec 11, 2023
9861a26
Add block groups to preview
jimsafley Dec 12, 2023
c8e3708
Do not set grid for a block group on normal flow
jimsafley Dec 12, 2023
b80c01b
Begin implementing block groups UI
jimsafley Dec 16, 2023
7af445a
Hide span input; add styles
jimsafley Dec 17, 2023
a9d6aeb
blockGroup blocks use a subset of block layout data
jimsafley Dec 18, 2023
c38854c
Polish block group styles.
kimisgold Dec 19, 2023
e64a82d
Apply classes and inline styles to block group div
jimsafley Dec 19, 2023
4db1691
Fix collapse/expand and remove
jimsafley Dec 20, 2023
a98177c
Preview normal flow layout
jimsafley Dec 20, 2023
c831ebf
Adjust margins for deleted blocks.
kimisgold Dec 20, 2023
7cb777b
Update preview selectors, style block group preview.
kimisgold Dec 21, 2023
ae213e0
Add class
jimsafley Dec 21, 2023
8514ddc
Fix bug that collapsed entire block when contained section collapsed
jimsafley Jan 9, 2024
2ebde6d
Fix grid gap within preview sidebar.
kimisgold Jan 9, 2024
4debc69
Add prompt to drag blocks into group.
kimisgold Jan 9, 2024
978707b
Lessen the Sortable swap threshold
jimsafley Jan 10, 2024
af3ab98
Set min-height on block group blocks container.
kimisgold Jan 10, 2024
f8969fd
Fine tune swap threshold for better DnD behavior
jimsafley Jan 10, 2024
682603a
Consolidate sidebar styles.
kimisgold Jan 10, 2024
5498dc8
Stage "add block group" button.
kimisgold Jan 10, 2024
4a136b5
Enable "add block group" button
jimsafley Jan 10, 2024
ca29787
Fix non-working auto scroll up
jimsafley Jan 10, 2024
f6f82ed
Use condensed block control header styles.
kimisgold Jan 11, 2024
3f6540e
Add icons to expand all, collapse all. Shrink select arrows.
kimisgold Jan 11, 2024
ee05dc8
Change font icon for preview layout.
kimisgold Jan 11, 2024
135baea
Cozify block headers.
kimisgold Jan 11, 2024
4cc5587
Apply actions pattern to page layout controls.
kimisgold Jan 11, 2024
9a35d93
Refactor expand/collapse js
jimsafley Jan 11, 2024
1377c8a
Set correct initial block group span
jimsafley Jan 11, 2024
421a07b
Refactor page block expand/collapse
jimsafley Jan 12, 2024
ddf6672
Use separate expand/collapse buttons for block groups
jimsafley Jan 12, 2024
a295b35
Apply expand/collapse all icons, adjust min height.
kimisgold Jan 12, 2024
637c963
Replace expand/collapse all icon.
kimisgold Jan 16, 2024
04d558d
Switch grid inline styles to classes
jimsafley Jan 16, 2024
8a838ad
Add styles for new grid classes.
kimisgold Jan 17, 2024
1ad03f5
Include other template column styles, fix column end values.
kimisgold Jan 17, 2024
cb3134f
Add max width to block layout config
jimsafley Jan 25, 2024
df5a824
Merge branch 'develop' into block-groups-ui
jimsafley Jan 25, 2024
2dcd45d
Merge branch 'develop' into block-groups-ui
jimsafley Jan 25, 2024
0ac891b
Simplify regex
jimsafley Jan 25, 2024
dc77b71
Remove default file borders.
kimisgold Jan 26, 2024
6a20bc3
Specify background image settings
jimsafley Jan 30, 2024
6db73af
Add background color to block layout config
jimsafley Jan 30, 2024
f159932
Match styles with updated selectors.
kimisgold Jan 30, 2024
df83857
Add padding to block layout config
jimsafley Jan 30, 2024
77122b3
Decouple text alignment from block alignment in block layout config
jimsafley Jan 30, 2024
62c8689
Match styles to updated selectors.
kimisgold Jan 30, 2024
cc5c4cc
Use our color picker
jimsafley Jan 30, 2024
0a5d116
Layer background url and color; update color swatch on sidebar open
jimsafley Jan 30, 2024
30ea566
Draft cozified block layout sidebar.
kimisgold Feb 5, 2024
c85554f
Remove unneeded code
jimsafley Feb 5, 2024
968a684
Open groups with invalid elements during apply all
jimsafley Feb 5, 2024
120a656
Merge branch 'develop' into block-groups-ui
jimsafley Feb 6, 2024
e7631a2
Fix cs
jimsafley Feb 6, 2024
cc447aa
Wrap all blocks with one div with classes and styles
jimsafley Feb 8, 2024
024833c
Minor improvements
jimsafley Feb 8, 2024
459fe21
Provide persistent labels for grid selects.
kimisgold Feb 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use our color picker
  • Loading branch information
jimsafley committed Jan 30, 2024
commit cc5c4ccf476fb1061d533e0d09e245467564541a
2 changes: 1 addition & 1 deletion application/src/Form/BlockLayoutDataForm.php
Original file line number Diff line number Diff line change
@@ -133,7 +133,7 @@ public function init()
]);
$this->add([
'name' => 'background_color',
'type' => 'color',
'type' => 'Omeka\Form\Element\ColorPicker',
'options' => [
'label' => 'Background color', // @translate
],