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 grid layout #2061

Closed
wants to merge 41 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
a62d5b8
Begin implementing page grid layout
jimsafley Jan 24, 2023
fce150d
Work on page grid layout
jimsafley Jan 26, 2023
96419a0
Hide restore button when not needed
jimsafley Jan 27, 2023
38bc682
Refactor page layout for future improvements
jimsafley Feb 3, 2023
8e24449
Add restore page layout feature
jimsafley Feb 4, 2023
346ba10
Clean up layout and styles for grid controls.
kimisgold Feb 6, 2023
fda6577
Redo action and grid option positioning.
kimisgold Feb 6, 2023
772b6d2
Remove unneeded span 1
jimsafley Feb 7, 2023
5a9df60
Refactor page content
jimsafley Feb 7, 2023
f29f396
"Span 1" is more intuitive than "No Span"
jimsafley Feb 8, 2023
a222170
Refactor for future features
jimsafley Feb 10, 2023
ad8a530
Minor style correction
jimsafley Feb 10, 2023
bf00e95
Fix restore button
jimsafley Feb 13, 2023
f04d199
Restore 'restore value' functionality.
kimisgold Feb 16, 2023
918beff
Hide grid controls when marking a block for removal.
kimisgold Feb 16, 2023
37a64d2
Span the entire row by default
jimsafley Feb 16, 2023
7bb0ddf
Minor refactoring of page layout
jimsafley Feb 22, 2023
93a4dd1
Merge branch 'develop' into page-grid-layout
zerocrates Apr 26, 2023
08e99d4
Add grid layout preview
jimsafley May 15, 2023
2c8020a
Add grid preview without highlighting
jimsafley May 16, 2023
0edb433
Improvements to grid layout preview
jimsafley May 18, 2023
653e1bb
Begin implementing block layout configuration sidebar
jimsafley May 19, 2023
80c4f2a
Continue developing block layout data
jimsafley May 22, 2023
0c0529b
Wrap block markup in div if layout declares special styling
jimsafley May 23, 2023
e5ad1f5
Add alignment to block layout data
jimsafley May 24, 2023
56e40b1
Migrate html, media, and asset block data to block layout data
jimsafley May 24, 2023
1d4a29d
Always set an object as block layout data
jimsafley May 25, 2023
5999483
Use new left, right selectors for page blocks.
kimisgold May 25, 2023
5a9d019
Continue updating alignment styles.
kimisgold May 25, 2023
f53f081
Add ability to revert to previous grid state
jimsafley May 25, 2023
3496bd1
Add background image to block layout data form
jimsafley May 26, 2023
a76fb17
Implement background image in public page
jimsafley May 26, 2023
2f1612f
Add background position for block layout
jimsafley May 31, 2023
4d1503a
Provide styles forbackground configuration.
kimisgold Jun 7, 2023
f8964e0
Merge branch 'develop' into page-grid-layout
zerocrates Sep 21, 2023
c4a7e00
Add 'confirm-main' wrapper for markup pattern.
kimisgold Oct 17, 2023
24e91c4
Polish grid preview styles.
kimisgold Oct 17, 2023
e71aabd
Fix indentation; remove logs; add comments
jimsafley Oct 19, 2023
ffe86ad
Remove unused uses
jimsafley Oct 19, 2023
1bef0c2
Provide mobile breakpoint, grid-specific css file.
kimisgold Oct 19, 2023
3d63f7e
Use max-width for breakpoint.
kimisgold Oct 19, 2023
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
2 changes: 1 addition & 1 deletion application/Module.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Module extends AbstractModule
/**
* This Omeka version.
*/
const VERSION = '4.1.0-alpha6';
const VERSION = '4.1.0-alpha7';

/**
* The vocabulary IRI used to define Omeka application data.
Expand Down
2 changes: 1 addition & 1 deletion application/asset/css/page-blocks.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions application/asset/css/page-grid.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion application/asset/css/style.css

Large diffs are not rendered by default.

Loading