Skip to content

Global styles: move custom CSS to ellipsis menu if no custom CSS present yet #47371

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

Merged
glendaviesnz merged 7 commits into from
Jan 29, 2023
Merged

Global styles: move custom CSS to ellipsis menu if no custom CSS present yet #47371

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0cd31c2
Initial commit
glendaviesnz Jan 24, 2023
3fe5ebf
fix conflict
glendaviesnz Jan 24, 2023
ea23a82
Don't show custom css option if no custom css entered yet
glendaviesnz Jan 24, 2023
37b5b3f
Fix duplicate style entries, and keep custom css in menu at all times
glendaviesnz Jan 25, 2023
43dba78
Change order of menu items
glendaviesnz Jan 26, 2023
e39c5ad
Coerce the customCSS value to boolean
glendaviesnz Jan 29, 2023
2556a9b
Rename the menu for clarity
glendaviesnz Jan 29, 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
Prev Previous commit
Rename the menu for clarity
  • Loading branch information
@glendaviesnz
glendaviesnz committed Jan 29, 2023
commit 2556a9b32748983ca36f959d030208ccf816c8dd
4 changes: 2 additions & 2 deletions packages/edit-site/src/components/global-styles/ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const SLOT_FILL_NAME = 'GlobalStylesMenu';
const { Slot: GlobalStylesMenuSlot, Fill: GlobalStylesMenuFill } =
createSlotFill( SLOT_FILL_NAME );

function GlobalStylesMenu() {
function GlobalStylesActionMenu() {
const { toggle } = useDispatch( preferencesStore );
const { useGlobalStylesReset } = unlock( blockEditorExperiments );
const [ canReset, onReset ] = useGlobalStylesReset();
Expand Down Expand Up @@ -332,7 +332,7 @@ function GlobalStylesUI( { isStyleBookOpened, onCloseStyleBook } ) {
<GlobalStylesStyleBook onClose={ onCloseStyleBook } />
) }

<GlobalStylesMenu />
<GlobalStylesActionMenu />
</NavigatorProvider>
);
}
Expand Down