Skip to content

Fixed lesson progression button layout and text alignment in the block editor #3332

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

Open
brianhogg wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fixed lesson progression button layout and text alignment in the block editor #3332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 0 deletions .changelogs/fix-lesson-progression-editor-buttons.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
significance: patch
type: fixed
entry: Fixed lesson progression button layout and text alignment in the block editor.
11 changes: 8 additions & 3 deletions assets/scss/_includes/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,17 @@ $llms-buttons-theme-inherit: true !default;
.llms-button-danger,
.llms-button-primary,
.llms-button-secondary {
align-items: center;
box-sizing: border-box;
cursor: pointer;
display: inline-block;
display: inline-flex;
justify-content: center;
line-height: 1;
margin: 0;
max-width: 100%;
position: relative;
text-decoration: none;
vertical-align: middle;
white-space: nowrap;

&:disabled {
Expand All @@ -72,7 +77,7 @@ $llms-buttons-theme-inherit: true !default;
}

&.full {
display: block;
display: flex;
text-align: center;
width: 100%;
}
Expand Down Expand Up @@ -226,7 +231,7 @@ a.llms-button-secondary {
}

&.full {
display: block;
display: flex;
text-align: center;
width: 100%;
}
Expand Down
8 changes: 6 additions & 2 deletions assets/scss/frontend/_main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,10 +269,14 @@ input[type="text"].cc_cvv,
}

.llms-lesson-button-wrapper {
width: 100%;
display: block;
align-items: center;
clear: both;
display: flex;
flex-wrap: wrap;
gap: 10px;
justify-content: center;
text-align: center;
width: 100%;
}
.llms-template-wrapper {
width: 100%;
Expand Down
12 changes: 11 additions & 1 deletion libraries/lifterlms-blocks/src/js/blocks/lesson-progression/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
.wp-block[data-type="llms/lesson-progression"] {
text-align: center;

.llms-lesson-button-wrapper {
align-items: center;
display: flex;
flex-wrap: wrap;
gap: 8px;
justify-content: center;
}

button {
margin: 0 2px;
box-sizing: border-box;
line-height: 1;
margin: 0;
}
}
39 changes: 25 additions & 14 deletions libraries/lifterlms-blocks/src/js/blocks/lesson-progression/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
* @since 1.5.0 Add supported post type settings.
* @since 1.8.0 Use imports in favor of "wp." variables.
* Convert "edit" function from using ServerSideRender.
* @version 2.5.0
* @since [version] Use native buttons with `wp-element-button` and an `extraButtons` filter so add-ons can render inside the wrapper.
* @version [version]
*/

// WP Deps.
import { Button } from '@wordpress/components';
import { select } from '@wordpress/data';
import { applyFilters } from '@wordpress/hooks';
import { Fragment } from '@wordpress/element';
import { __ } from '@wordpress/i18n';

// Internal dependencies.
Expand Down Expand Up @@ -56,7 +55,7 @@ export const settings = {
*
* @since 1.0.0
*
* @return {Fragment} Edit component fragment.
* @return {JSX.Element} Edit component.
*/
edit() {
const currentPost = select( 'core/editor' ).getCurrentPost(),
Expand All @@ -76,23 +75,35 @@ export const settings = {
showMainBtn
);

/**
* Additional buttons rendered inside the lesson progression wrapper in the editor.
*
* Return an array of React elements. Used by add-ons (e.g. Assignments) so their
* buttons sit in the same row as Take Quiz / Mark Complete.
*
* @since [version]
*
* @param {Array} buttons Extra button elements.
*/
const extraButtons = applyFilters(
'llms.lessonProgressBlock.extraButtons',
[]
);

return (
<>
<div className="llms-lesson-button-wrapper">
<Fragment>
{ extraButtons }
{ !! quiz && (
<Button className="llms-prog-btn--quiz llms-button-action auto button">
{__('Take Quiz', 'lifterlms')}
</Button>
<button type="button" className="llms-prog-btn--quiz llms-button-action auto button wp-element-button">
{ __( 'Take Quiz', 'lifterlms' ) }
</button>
) }
{ showMainBtn && (
<Button className="llms-prog-btn--complete llms-field-button llms-button-primary auto button">
{__('Mark Complete', 'lifterlms')}
</Button>
<button type="button" className="llms-prog-btn--complete llms-field-button llms-button-primary auto button wp-element-button">
{ __( 'Mark Complete', 'lifterlms' ) }
</button>
) }
</Fragment>
</div>
</>
);
},

Expand Down
Loading