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

fix: restore non-API version of the editor styles #2062

Merged
merged 2 commits into from
Feb 27, 2025
Merged

fix: restore non-API version of the editor styles #2062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58e8190
fix: restore non-API version of the editor styles
laurelfulford Feb 26, 2025
5dcc36f
fix: tweak CSS selectors
laurelfulford Feb 26, 2025
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
14 changes: 0 additions & 14 deletions includes/class-newspack-blocks-api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,20 +387,6 @@ public static function add_post_title_wildcard_search( $where, $query ) {
$where .= ' AND post_title LIKE "%' . $search . '%" ';
return $where;
}

/**
* Return CSS for the Homepage Articles block, when rendered in the editor.
*
* @return WP_REST_Response.
*/
public static function css_endpoint() {
return newspack_blocks_get_homepage_articles_css_string(
[
'typeScale' => range( 1, 10 ),
'showSubtitle' => [ 1 ],
]
);
}
}

add_action( 'rest_api_init', array( 'Newspack_Blocks_API', 'register_video_playlist_endpoint' ) );
13 changes: 0 additions & 13 deletions src/blocks/homepage-articles/class-wp-rest-newspack-articles-controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,19 +107,6 @@ public function register_routes() {
},
]
);

// Endpoint to get styles in the editor.
register_rest_route(
$this->namespace,
'/homepage-articles-css',
[
'methods' => \WP_REST_Server::READABLE,
'callback' => [ 'Newspack_Blocks_API', 'css_endpoint' ],
'permission_callback' => function() {
return current_user_can( 'edit_posts' );
},
]
);
}

/**
Expand Down
11 changes: 0 additions & 11 deletions src/blocks/homepage-articles/editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
* WordPress dependencies
*/
import { registerBlockType } from '@wordpress/blocks';
import apiFetch from '@wordpress/api-fetch';

/**
* Internal dependencies
Expand All @@ -15,13 +14,3 @@ const BLOCK_NAME = `newspack-blocks/${ name }`;

registerBlockType( BLOCK_NAME, settings );
registerQueryStore( [ BLOCK_NAME, `newspack-blocks/${ carouselBlockName }` ] );

// Fetch CSS and insert it in a style tag.
apiFetch( {
path: '/newspack-blocks/v1/homepage-articles-css',
} ).then( css => {
const style = document.createElement( 'style' );
style.innerHTML = css;
style.id = 'newspack-blocks-homepage-articles-styles';
document.head.appendChild( style );
} );
121 changes: 113 additions & 8 deletions src/blocks/homepage-articles/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,34 @@
@use "../../shared/sass/mixins";

.wpnbha {
article .entry-title {
margin: 0 0 0.25em;
.editor-rich-text {
width: 100%;
}

@include mixins.media( tablet ) {
&.ts-4 article .entry-title {
font-size: 1.6em;
/* Image styles */
.post-thumbnail {
margin: 0;
margin-bottom: 0.25em;

img {
height: auto;
width: 100%;
}
}

.editor-rich-text {
width: 100%;
figcaption {
margin-bottom: 0.5em;
}
}

/* Article meta */
.entry-meta {
display: flex;
font-size: 0.8em;
flex-wrap: wrap;
align-items: center;
margin-top: 0.5em;
}

.cat-links {
font-size: variables.$font__size-xs;
}
Expand All @@ -36,7 +49,99 @@
margin: 0.5em 0;
}

/* Typescale */
// Default typescale:
.entry-title {
font-size: 1.2em;
margin: 0 0 0.25em;
}

.avatar {
height: 25px;
width: 25px;
}

@include mixins.media( tablet ) {
&.ts-4 article .entry-title {
font-size: 1.6em;
}
}

.newspack-post-subtitle {
&--in-homepage-block {
margin-top: 0.3em;
margin-bottom: 0;
line-height: 1.4;
font-style: italic;
}
}

// Different typescales:
&.ts-10,
&.ts-9,
&.ts-8 {
.entry-title {
line-height: 1.1;
}
}

$typescales: (
"ts-10" (
".entry-title": "2.6em",
".newspack-post-subtitle": "1.4em",
),
"ts-9" (
".entry-title": "2.4em",
".newspack-post-subtitle": "1.4em",
),
"ts-8" (
".entry-title": "2.2em",
".newspack-post-subtitle": "1.4em",
),
"ts-7" (
".entry-title": "2em",
".newspack-post-subtitle": "1.4em",
),
"ts-6" (
".entry-title": "1.7em",
".newspack-post-subtitle": "1.4em",
),
"ts-5" (
".entry-title": "1.4em",
".newspack-post-subtitle": "1.2em",
),
"ts-3" (
".entry-title": "1em",
".newspack-post-subtitle": "0.8em",
".entry-wrapper p": "0.8em",
".entry-wrapper .more-link": "0.8em",
),
"ts-2" (
".entry-title": "0.9em",
"article .newspack-post-subtitle": "0.8em",
"article .entry-wrapper p": "0.8em",
"article .entry-wrapper .more-link": "0.8em",
),
"ts-1" (
".entry-title": "0.9em",
"article .newspack-post-subtitle": "0.8em",
"article .entry-wrapper p": "0.8em",
"article .entry-wrapper .more-link": "0.8em",
),
);

// Loop through all our $typescales and generate font size CSS:
@each $type, $selectors in $typescales {
@each $selector, $values in $selectors {
@each $value in $values {
&.#{$type} {
#{$selector} {
font-size: #{$value};
}
}
}
}
}
}

.editor-styles-wrapper.wpnbha__wp-block-button__wrapper {
Expand Down