Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions src/editor-extensions/template-part-editing.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { useRegistry, useSelect } from '@wordpress/data';
import { useEffect, useRef } from '@wordpress/element';
import { addFilter } from '@wordpress/hooks';
import { __ } from '@wordpress/i18n';
import { globe as globeIcon } from '@wordpress/icons';
import { symbolFilled as symbolFilledIcon } from '@wordpress/icons';

/**
* Internal dependencies
Expand Down Expand Up @@ -372,8 +372,8 @@ function useTemplatePartEditState( clientId, attributes ) {
*
* It replaces core's "Edit original", which the editor layer's stylesheet
* hides whenever a template part is selected. See src/editor-layer/style.scss.
* A part shows on more than this page, so the button has the globe and the
* purple of everything else that does. See `src/global-scope`.
* A part shows on more than this page, so the button has the filled symbol and
* the purple of everything else that does. See `src/global-scope`.
*
* @param {Object} props Component props.
* @param {Object} props.attributes Template part block attributes.
Expand Down Expand Up @@ -406,7 +406,7 @@ function TemplatePartEditButton( { attributes, clientId, isSelected } ) {
description={ __(
'Changes show on every page that uses it.'
) }
icon={ globeIcon }
icon={ symbolFilledIcon }
label={ label }
onClick={ () =>
unlock(
Expand Down
4 changes: 2 additions & 2 deletions src/global-scope/index.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* What changes more than the page on show, like the header and footer, which
* every page shares, is marked out in purple with a globe. What changes only
* the page on show isn't marked at all.
* every page shares, is marked out in purple with a filled symbol. What changes
* only the page on show isn't marked at all.
*
* The purple is core's own colour for synced blocks and template parts
* (`--wp-block-synced-color`), so ours matches the outlines core draws on them
Expand Down
2 changes: 1 addition & 1 deletion src/site-canvas/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Moving to Browse with unsaved changes asks to save or discard them, because the
| `use-site-canvas.js` | `useSiteCanvas()`: the canvas's state and the rules for moving between modes. |
| `mode.js` | The shared mode: `useCanvasMode()`, `getCanvasMode()`, `setCanvasMode()`. |
| `writing-mode.js` | Which blocks are containers, and how a page's runs of text between them are grouped into sections. |
| `page-switcher.jsx` | The page's name in the middle of the toolbar, which turns into the page finder, and the page's status at its end. Layouts and template parts use the same bar, with their name in purple and a purple globe in place of the status, and a template part's bar doesn't open the finder. |
| `page-switcher.jsx` | The page's name in the middle of the toolbar, which turns into the page finder, and the page's status at its end. Layouts and template parts use the same bar, with their name in purple and a purple filled symbol in place of the status, and a template part's bar doesn't open the finder. |
| `page-settings.jsx` | A page's status as a button that opens its settings in a popover, every detail the Pages screen has for it, where core's editor has them in its sidebar's Page tab. Changes are unsaved edits to the page, saved with Save. Only Layout leads on, to the layouts in the sidebar. |
| `toolbar.jsx` | Edit while viewing and Exit while editing, undo and redo, Document Overview, the preview's history, the View menu (the device, the live page in a new tab and the full-screen editor), and Zoom out (Compose). |
| `zoom-controls.jsx` | Compose from the canvas itself: a zoom in and zoom out pair in its corner, as on a map, and a pinch on a trackpad, or Ctrl or ⌘ with the scroll wheel. One gesture moves one step. |
Expand Down
8 changes: 4 additions & 4 deletions src/site-canvas/page-switcher.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
*
* Layouts and template parts use the same bar. What sets them apart is that
* changing one changes every page that uses it, so in place of a status they
* get a purple globe, the mark Review changes gives site-wide changes, with
* a tooltip saying where changes show, and their name in the same purple.
* get a purple filled symbol, the mark Review changes gives site-wide changes,
* with a tooltip saying where changes show, and their name in the same purple.
* A template part's bar doesn't open the finder: while one is open, going
* to a page isn't what the screen is for.
*/

/**
* WordPress dependencies
*/
import { globe as globeIcon } from '@wordpress/icons';
import { symbolFilled as symbolFilledIcon } from '@wordpress/icons';
import { Icon } from '@wordpress/ui';

/**
Expand Down Expand Up @@ -87,7 +87,7 @@ export function PageSwitcher( {
const [ isFinding, setIsFinding ] = useState( false );
const toggleRef = useRef();
const shouldRefocus = useRef( false );
const statusIcon = shared ? globeIcon : POST_STATUS_ICONS[ status ];
const statusIcon = shared ? symbolFilledIcon : POST_STATUS_ICONS[ status ];
const statusLabel =
shared || ( statusIcon ? getStatusLabel( status ) : '' );
const openFinder = canSwitch ? () => setIsFinding( true ) : undefined;
Expand Down
4 changes: 2 additions & 2 deletions src/site-canvas/section-modes/section-chrome.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ import {
arrowUp as arrowUpIcon,
button as buttonIcon,
copy as copyIcon,
globe as globeIcon,
heading as headingIcon,
image as imageIcon,
layout as layoutIcon,
paragraph as paragraphIcon,
pencil as pencilIcon,
plus as plusIcon,
styles as designIcon,
symbolFilled as symbolFilledIcon,
trash as trashIcon,
} from '@wordpress/icons';

Expand Down Expand Up @@ -212,7 +212,7 @@ export function SectionTab( {
}${ isBelow ? ' is-below' : '' }` }
style={ style }
>
{ isPart && <LegacyIcon icon={ globeIcon } size={ 14 } /> }
{ isPart && <LegacyIcon icon={ symbolFilledIcon } size={ 14 } /> }
{ layout && <LegacyIcon icon={ layoutIcon } size={ 14 } /> }
<span className="cnl-section-modes__tab-title">{ title }</span>
{ isPart && (
Expand Down
13 changes: 8 additions & 5 deletions src/top-bar/review-changes.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*
* Changes come in two groups, each saying what its changes reach. Those that
* show on every page, like the header, come first, under a purple heading
* with a globe and with purple Discard buttons, as the editor marks anything
* shared. Those that change only the page or post they were made on follow,
* unmarked. See `src/global-scope`.
* with a filled symbol and with purple Discard buttons, as the editor marks
* anything shared. Those that change only the page or post they were made on
* follow, unmarked. See `src/global-scope`.
*/

/**
Expand All @@ -26,7 +26,10 @@ import {
useState,
} from '@wordpress/element';
import { __, _n, sprintf } from '@wordpress/i18n';
import { globe as globeIcon, page as pageIcon } from '@wordpress/icons';
import {
page as pageIcon,
symbolFilled as symbolFilledIcon,
} from '@wordpress/icons';
import { store as noticesStore } from '@wordpress/notices';
import { Icon, Stack, Text } from '@wordpress/ui';

Expand All @@ -40,7 +43,7 @@ const GROUPS = [
{
id: 'site-wide',
isSiteWide: true,
icon: globeIcon,
icon: symbolFilledIcon,
title: __( 'Site-wide changes' ),
description: __( 'These change every page of your site.' ),
},
Expand Down
6 changes: 3 additions & 3 deletions src/top-bar/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,9 @@ $save-pulse-color: color-mix(in srgb, var(--wp-admin-theme-color), #fff 40%);
}
}

// Shows on every page, so the heading, its globe and the list's edge are in
// the purple of what every page shares; `GlobalScope` turns the brand tokens
// purple. The rows stay white. See `src/global-scope`.
// Shows on every page, so the heading, its filled symbol and the list's edge
// are in the purple of what every page shares; `GlobalScope` turns the brand
// tokens purple. The rows stay white. See `src/global-scope`.
.cnl-review-changes__group.is-site-wide {
border-color: var(--wpds-color-stroke-surface-brand);
background: var(--wpds-color-background-surface-brand);
Expand Down