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

Jump to bottom

Update media and video icons #49523

Merged
merged 8 commits into from
Apr 5, 2023
Merged

Update media and video icons #49523

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
789c77a
Use media icon in core/media-text Media Container
richtabor Mar 31, 2023
ccec4e4
Update media.js icon with new media icon (image + video display)
richtabor Mar 31, 2023
eacf387
Use video icon for existing media icon implementations
richtabor Mar 31, 2023
ed7f508
Update media icon
richtabor Apr 4, 2023
049457c
Use media icon for media library
richtabor Apr 4, 2023
7f2fb26
Trigger test
richtabor Apr 5, 2023
78787b4
Trigger test
richtabor Apr 5, 2023
a27a264
Update media-container.native.js
richtabor Apr 5, 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
12 changes: 0 additions & 12 deletions packages/block-library/src/media-text/media-container-icon.js
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions packages/block-library/src/media-text/media-container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@ import { useDispatch } from '@wordpress/data';
import { forwardRef } from '@wordpress/element';
import { isBlobURL } from '@wordpress/blob';
import { store as noticesStore } from '@wordpress/notices';

/**
* Internal dependencies
*/
import icon from './media-container-icon';
import { media as icon } from '@wordpress/icons';

/**
* Constants
Expand Down
7 changes: 6 additions & 1 deletion packages/icons/src/library/media.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ import { SVG, Path } from '@wordpress/primitives';

const media = (
<SVG xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
<Path d="M18.7 3H5.3C4 3 3 4 3 5.3v13.4C3 20 4 21 5.3 21h13.4c1.3 0 2.3-1 2.3-2.3V5.3C21 4 20 3 18.7 3zm.8 15.7c0 .4-.4.8-.8.8H5.3c-.4 0-.8-.4-.8-.8V5.3c0-.4.4-.8.8-.8h13.4c.4 0 .8.4.8.8v13.4zM10 15l5-3-5-3v6z" />
<Path d="m7 6.5 4 2.5-4 2.5z" />
<Path
fillRule="evenodd"
clipRule="evenodd"
d="m5 3c-1.10457 0-2 .89543-2 2v14c0 1.1046.89543 2 2 2h14c1.1046 0 2-.8954 2-2v-14c0-1.10457-.8954-2-2-2zm14 1.5h-14c-.27614 0-.5.22386-.5.5v10.7072l3.62953-2.6465c.25108-.1831.58905-.1924.84981-.0234l2.92666 1.8969 3.5712-3.4719c.2911-.2831.7545-.2831 1.0456 0l2.9772 2.8945v-9.3568c0-.27614-.2239-.5-.5-.5zm-14.5 14.5v-1.4364l4.09643-2.987 2.99567 1.9417c.2936.1903.6798.1523.9307-.0917l3.4772-3.3806 3.4772 3.3806.0228-.0234v2.5968c0 .2761-.2239.5-.5.5h-14c-.27614 0-.5-.2239-.5-.5z"
/>
</SVG>
);

Expand Down