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

Add changes regarding issue #68092 #68093

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

Add changes regarding issue #68092 #68093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16146ba
Add changes regarding issue #68092
ronakganatra-multidots Dec 18, 2024
0348d3f
Add changes regarding editor style merge and remove unused ?raw query…
ronakganatra-multidots Dec 27, 2024
904dd87
Add changes regarding editor style merge and remove unused ?raw query…
ronakganatra-multidots Dec 27, 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
4 changes: 2 additions & 2 deletions packages/block-library/src/post-template/block.json
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes in this file are unrelated to the issue. Let's remove them.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't make any changes in this files, may be any autofixer like eslint or something ? Also, It removed additional spaces so it is good. Do you want me to add extra space again and re-commit the changes ?

Copy link
Contributor

@stokesman stokesman Jan 22, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It’s showing up as part of this commit 904dd87. Maybe that was a merge of trunk into this branch? The file is already that way on trunk so it should not be showing up in the diff here anyway. I’ve seen GitHub do some strange stuff like this every once in a while and it be resolved after another push. You might try a amending one of the commit messages and then force pushing.

Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
},
"__experimentalDefaultControls": {
"blockGap": true,
"padding" : false,
"margin" : false
"padding": false,
"margin": false
}
},
"interactivity": {
Expand Down
20 changes: 19 additions & 1 deletion storybook/stories/playground/box/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,28 @@ import {
BlockToolbar,
} from '@wordpress/block-editor';

/**
* External dependencies
*/
import componentsStyles from '!!raw-loader!@wordpress/components/build-style/style.css';
import blockEditorContentStyles from '!!raw-loader!@wordpress/block-editor/build-style/content.css';
import blocksStyles from '!!raw-loader!@wordpress/block-library/build-style/style.css';
import blocksEditorStyles from '!!raw-loader!@wordpress/block-library/build-style/editor.css';

/**
* Internal dependencies
*/
import { editorStyles } from '../editor-styles';

//Base styles for the content within the block canvas iframe.
const contentStyles = [
{ css: componentsStyles },
{ css: blockEditorContentStyles },
{ css: blocksStyles },
{ css: blocksEditorStyles },
...editorStyles,
];

import './style.css';

export default function EditorBox() {
Expand All @@ -37,7 +55,7 @@ export default function EditorBox() {
} }
>
<BlockToolbar hideDragHandle />
<BlockCanvas height="500px" styles={ editorStyles } />
<BlockCanvas height="500px" styles={ contentStyles } />
</BlockEditorProvider>
</div>
);
Expand Down
Loading