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

New bullet cards specifier, fixed screenfulBlock alignment specifiers, fixed footer gap #43

Merged
merged 4 commits into from
Mar 5, 2024
Merged

New bullet cards specifier, fixed screenfulBlock alignment specifiers, fixed footer gap #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8704f58
added bullet cards specifier, fixed footer and screenful styles
erikrakuscek Mar 5, 2024
74d6384
document new specifier
erikrakuscek Mar 5, 2024
7f84463
renamed specifier, added comment for h-full
erikrakuscek Mar 5, 2024
7af44f8
Merge branch 'main' into ui/style/screenful-vert-center-fix
erikrakuscek Mar 5, 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
3 changes: 2 additions & 1 deletion packages/ui/blocks/components/bullet-cards-block.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const BulletCardsBlockComponent: React.FC<BlockComponentProps> = ({
const specified = (s: string) => (containsToken(b.specifiers, s))

const noBorder = specified('no-card-border') ? 'border-0' : 'md:border'
const mobileTextXs = specified('mobile-small-text') ? 'text-xs' : 'text-sm'

const borderclx = specified('border-muted-3') ?
'md:border-muted-3'
Expand All @@ -35,7 +36,7 @@ const BulletCardsBlockComponent: React.FC<BlockComponentProps> = ({
borderclx
)}>
<InlineIcon icon={card.icon} size={b.iconSize ?? 28} agent={agent} className='shrink-0 mr-2 md:mr-4 '/>
<p className='m-0 text-sm sm:text-base'>{card.text}</p>
<p className={cn('m-0 sm:text-base', mobileTextXs)}>{card.text}</p>
</div>
))}
</GridBlockComponent>
Expand Down
5 changes: 4 additions & 1 deletion packages/ui/blocks/components/screenful-block/content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,11 @@ const ContentColumn: React.FC<{
modifiers += 'typography-headings:text-center '
}

/* ContentComponent's parent div needs h-full class in order for vertical alignment with flexbox to work.
* This affects specifiers: bottom, vert-center, mobile-vert-center
*/
return (
<div className={cn('flex flex-col justify-center ' + modifiers, className)} >
<div className={cn('flex flex-col justify-center h-full', modifiers, className)} >
<ContentComponent blocks={blocks} agent={agent} />
</div>
)
Expand Down
1 change: 1 addition & 0 deletions packages/ui/blocks/def/bullet-cards-block.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ interface BulletCardsBlock extends Block {
blockType: 'bullet-cards'
/**
* no-card-border
* mobile-small-text
* borders-muted-1 / borders-muted-3
* default: 2
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/common/footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const Footer: React.FC<{
const _aboveCopyright = (typeof aboveCopyright === 'undefined') ? legal : aboveCopyright

return (
<footer className={cn('grow flex flex-col justify-between gap-6 pb-[2vh]', className)}>
<footer className={cn('grow flex flex-col justify-end gap-6 pb-[2vh]', className)}>
<div className={
(noHorizPadding ? '' : 'px-5 md:px-8 ') +
'grid grid-cols-2 gap-4 gap-y-6 md:gap-x-6 lg:gap-8 ' + smGridColsClx +
Expand Down
Loading