-
Notifications
You must be signed in to change notification settings - Fork 2k
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.
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
Reimplement gridicons using SVG external content. #32763
Merged
Merged
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
3476e36
Reimplement gridicons using SVG external content.
sgomes 5d892f3
Replace external Gridicon example w/ internal one.
sgomes 934410e
Update `icons.md` with new gridicons info.
sgomes ec9b022
Replace usage of 'gridicons/dist/...'
sgomes 21625f8
Enable SVG file-loader transform in gridicons.
sgomes 508d4eb
Change icon adjustment CSS to use :first-child.
sgomes 01a0103
Remove role=presentation from button.
sgomes 804f39b
Fix scoping bug in updated CSS rules.
sgomes e2e1b63
Make CSS rules more explicit
sgomes File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -74,7 +74,7 @@ | |
| height: 36px; | ||
| width: 36px; | ||
|
|
||
| g { | ||
| use { | ||
| transform: none; | ||
| } | ||
| } | ||
|
|
||
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,233 @@ | ||
| /** | ||
| * External dependencies | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import Gridicon from '../index'; | ||
|
|
||
| const icons = [ | ||
| 'add-image', | ||
| 'add-outline', | ||
| 'add', | ||
| 'align-center', | ||
| 'align-image-center', | ||
| 'align-image-left', | ||
| 'align-image-none', | ||
| 'align-image-right', | ||
| 'align-justify', | ||
| 'align-left', | ||
| 'align-right', | ||
| 'arrow-down', | ||
| 'arrow-left', | ||
| 'arrow-right', | ||
| 'arrow-up', | ||
| 'aside', | ||
| 'attachment', | ||
| 'audio', | ||
| 'bell', | ||
| 'block', | ||
| 'bold', | ||
| 'book', | ||
| 'bookmark-outline', | ||
| 'bookmark', | ||
| 'briefcase', | ||
| 'bug', | ||
| 'calendar', | ||
| 'camera', | ||
| 'caption', | ||
| 'cart', | ||
| 'chat', | ||
| 'checkmark-circle', | ||
| 'checkmark', | ||
| 'chevron-down', | ||
| 'chevron-left', | ||
| 'chevron-right', | ||
| 'chevron-up', | ||
| 'clear-formatting', | ||
| 'clipboard', | ||
| 'cloud-download', | ||
| 'cloud-outline', | ||
| 'cloud-upload', | ||
| 'cloud', | ||
| 'code', | ||
| 'cog', | ||
| 'comment', | ||
| 'computer', | ||
| 'coupon', | ||
| 'create', | ||
| 'credit-card', | ||
| 'crop', | ||
| 'cross-circle', | ||
| 'cross-small', | ||
| 'cross', | ||
| 'custom-post-type', | ||
| 'customize', | ||
| 'domains', | ||
| 'dropdown', | ||
| 'ellipsis-circle', | ||
| 'ellipsis', | ||
| 'external', | ||
| 'filter', | ||
| 'flag', | ||
| 'flip-horizontal', | ||
| 'flip-vertical', | ||
| 'folder-multiple', | ||
| 'folder', | ||
| 'fullscreen-exit', | ||
| 'fullscreen', | ||
| 'gift', | ||
| 'globe', | ||
| 'grid', | ||
| 'heading-h1', | ||
| 'heading-h2', | ||
| 'heading-h3', | ||
| 'heading-h4', | ||
| 'heading-h5', | ||
| 'heading-h6', | ||
| 'heading', | ||
| 'heart-outline', | ||
| 'heart', | ||
| 'help-outline', | ||
| 'help', | ||
| 'history', | ||
| 'house', | ||
| 'image-multiple', | ||
| 'image-remove', | ||
| 'image', | ||
| 'indent-left', | ||
| 'indent-right', | ||
| 'info-outline', | ||
| 'info', | ||
| 'ink', | ||
| 'institution', | ||
| 'italic', | ||
| 'layout-blocks', | ||
| 'layout', | ||
| 'line-graph', | ||
| 'link-break', | ||
| 'link', | ||
| 'list-checkmark', | ||
| 'list-ordered-rtl', | ||
| 'list-ordered', | ||
| 'list-unordered', | ||
| 'location', | ||
| 'lock', | ||
| 'mail', | ||
| 'mention', | ||
| 'menu', | ||
| 'menus', | ||
| 'microphone', | ||
| 'minus-small', | ||
| 'minus', | ||
| 'money', | ||
| 'multiple-users', | ||
| 'my-sites-horizon', | ||
| 'my-sites', | ||
| 'nametag', | ||
| 'next-page', | ||
| 'not-visible', | ||
| 'notice-outline', | ||
| 'notice', | ||
| 'offline', | ||
| 'pages', | ||
| 'pause', | ||
| 'pencil', | ||
| 'phone', | ||
| 'pin', | ||
| 'plans', | ||
| 'play', | ||
| 'plugins', | ||
| 'plus-small', | ||
| 'plus', | ||
| 'popout', | ||
| 'posts', | ||
| 'print', | ||
| 'product-downloadable', | ||
| 'product-external', | ||
| 'product-virtual', | ||
| 'product', | ||
| 'quote', | ||
| 'read-more', | ||
| 'reader-follow-conversation', | ||
| 'reader-follow', | ||
| 'reader-following-conversation', | ||
| 'reader-following', | ||
| 'reader', | ||
| 'reblog', | ||
| 'redo', | ||
| 'refresh', | ||
| 'refund', | ||
| 'reply', | ||
| 'resize', | ||
| 'rotate', | ||
| 'scheduled', | ||
| 'search', | ||
| 'share-computer', | ||
| 'share-ios', | ||
| 'share', | ||
| 'shipping', | ||
| 'shutter', | ||
| 'sign-out', | ||
| 'site', | ||
| 'spam', | ||
| 'speaker', | ||
| 'special-character', | ||
| 'star-outline', | ||
| 'star', | ||
| 'stats', | ||
| 'stats-alt', | ||
| 'stats-down', | ||
| 'stats-down-alt', | ||
| 'stats-up', | ||
| 'stats-up-alt', | ||
| 'status', | ||
| 'strikethrough', | ||
| 'sync', | ||
| 'tablet', | ||
| 'tag', | ||
| 'text-color', | ||
| 'themes', | ||
| 'thumbs-up', | ||
| 'time', | ||
| 'trash', | ||
| 'trophy', | ||
| 'types', | ||
| 'underline', | ||
| 'undo', | ||
| 'user-add', | ||
| 'user-circle', | ||
| 'user', | ||
| 'video-camera', | ||
| 'video-remove', | ||
| 'video', | ||
| 'visible', | ||
| 'zoom-in', | ||
| 'zoom-out', | ||
| ]; | ||
|
|
||
| export default function GridiconExample() { | ||
| function handleClick( icon ) { | ||
| const toCopy = `<Gridicon icon="${ icon }" />`; | ||
| window.prompt( 'Copy component code:', toCopy ); | ||
| } | ||
|
|
||
| return ( | ||
| // eslint-disable-next-line wpcalypso/jsx-classname-namespace | ||
| <div className="design-assets__group"> | ||
| <h2> | ||
| <a href="/devdocs/design/social-logo">Social Logo</a> | ||
| </h2> | ||
| <div> | ||
| { icons.map( icon => ( | ||
| <Gridicon key={ icon } icon={ icon } size={ 48 } onClick={ () => handleClick( icon ) } /> | ||
| ) ) } | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| GridiconExample.displayName = 'Gridicon'; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the
svg4everybodypolyfill is active, there won't be anyuseelements to style. The polyfill will remove them and replace with the SVG markup it downloads with XHR.We need a style that targets both
ganduseelements.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Excellent catch, thanks @jsnajdr !
I have pushed a fix for this using
:first-child. Waiting forcalypso.livebefore testing on IE11.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The fix appears to be working, from what I can tell.