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 elastic logo to meet brand guidelines #3613

Merged
merged 5 commits into from
Jun 15, 2020
Merged

Update elastic logo to meet brand guidelines #3613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
813318d
Updating elastic logo icon
miukimiu Jun 15, 2020
10845df
Updating test. Small changes.
miukimiu Jun 15, 2020
aacc734
Changelog
miukimiu Jun 15, 2020
74aed8e
Merge remote-tracking branch 'upstream/master' into update-elasticLogo
miukimiu Jun 15, 2020
e44f5ba
Tests
miukimiu Jun 15, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- Moved all `EuiHeader` SASS variables to `global_styles` ([#3592](https://github.com/elastic/eui/pull/3592))
- Added `side` prop to `EuiGlobalToastList` for choosing which window side to display toasts ([#3600](https://github.com/elastic/eui/pull/3600))
- Default `titleSize` get's implicitly set to 'm' for `EuiEmptyPrompt` ([#3598](https://github.com/elastic/eui/pull/3598))
- Updated `logoElastic` to meet brand guidelines ([#3613](https://github.com/elastic/eui/pull/3613))

**Bug fixes**

Expand Down
57 changes: 29 additions & 28 deletions src/components/icon/__snapshots__/icon.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3947,41 +3947,42 @@ exports[`EuiIcon props type logoElastic is rendered 1`] = `
<svg
aria-hidden="true"
class="euiIcon euiIcon--medium euiIcon-isLoaded"
fill="none"
focusable="false"
height="32"
role="img"
viewBox="0 0 32 32"
width="32"
xmlns="http://www.w3.org/2000/svg"
>
<g
fill="none"
>
<path
d="M11.934 13.152l7.353 3.356 7.42-6.507c.107-.537.16-1.072.16-1.633 0-4.578-3.721-8.303-8.295-8.303a8.288 8.288 0 00-6.84 3.61l-1.234 6.409 1.436 3.068z"
fill="#FDD009"
/>
<path
d="M4.322 20.947a8.461 8.461 0 00-.162 1.657c0 4.59 3.731 8.326 8.317 8.326a8.288 8.288 0 006.873-3.646l1.224-6.387-1.634-3.127-7.383-3.368-7.235 6.545z"
fill="#23BAB1"
/>
<path
d="M4.276 8.208L9.315 9.4l1.104-5.736a3.976 3.976 0 00-2.413-.815 3.978 3.978 0 00-3.971 3.976c0 .484.08.948.24 1.383"
fill="#EE5097"
/>
<path
d="M3.838 9.41c-2.251.747-3.817 2.907-3.817 5.284 0 2.314 1.43 4.38 3.576 5.198l7.07-6.398-1.298-2.776-5.53-1.308z"
fill="#17A7E0"
/>
<path
d="M20.642 27.284a3.945 3.945 0 002.4.822 3.977 3.977 0 003.972-3.975c0-.484-.08-.948-.24-1.383l-5.036-1.18-1.096 5.716z"
fill="#92C73D"
/>
<path
d="M21.667 20.247l5.543 1.298c2.252-.745 3.818-2.907 3.818-5.284a5.553 5.553 0 00-3.583-5.19l-7.25 6.36 1.472 2.816z"
fill="#0678A0"
/>
</g>
<path
d="M32 16.77a6.334 6.334 0 00-1.14-3.641 6.298 6.298 0 00-3.02-2.32 9.098 9.098 0 00-.873-5.965A9.05 9.05 0 0022.56.746a9.007 9.007 0 00-5.994-.419 9.037 9.037 0 00-4.93 3.446 4.789 4.789 0 00-5.78-.07A4.833 4.833 0 004.198 9.26a6.384 6.384 0 00-3.035 2.33A6.42 6.42 0 000 15.242 6.341 6.341 0 001.145 18.9a6.305 6.305 0 003.039 2.321 9.334 9.334 0 00-.16 1.725 9.067 9.067 0 001.727 5.333 9.014 9.014 0 004.526 3.287 8.982 8.982 0 005.587-.023 9.016 9.016 0 004.5-3.322 4.789 4.789 0 005.77.074 4.833 4.833 0 001.672-5.542 6.383 6.383 0 003.032-2.331A6.419 6.419 0 0032 16.77z"
fill="#FFF"
/>
<path
d="M12.58 13.787l7.002 3.211 7.066-6.213a7.854 7.854 0 00.152-1.557 7.944 7.944 0 00-1.54-4.704 7.897 7.897 0 00-4.02-2.869 7.87 7.87 0 00-4.932.086 7.9 7.9 0 00-3.92 3.007l-1.174 6.118 1.367 2.92z"
fill="#FEC514"
/>
<path
d="M5.333 21.228A7.964 7.964 0 006.72 27.53a7.918 7.918 0 004.04 2.874 7.89 7.89 0 004.95-.097 7.921 7.921 0 003.926-3.03l1.166-6.102-1.555-2.985-7.03-3.211-6.885 6.248z"
fill="#00BFB3"
/>
<path
d="M5.288 9.067l4.8 1.137L11.14 4.73a3.785 3.785 0 00-4.538-.023A3.82 3.82 0 005.29 9.065"
fill="#F04E98"
/>
<path
d="M4.872 10.214a5.294 5.294 0 00-2.595 1.882 5.324 5.324 0 00-.142 6.124 5.287 5.287 0 002.505 2l6.733-6.101-1.235-2.65-5.266-1.255z"
fill="#1BA9F5"
/>
<path
d="M20.873 27.277a3.737 3.737 0 002.285.785 3.783 3.783 0 003.101-1.63 3.813 3.813 0 00.451-3.484l-4.8-1.125-1.037 5.454z"
fill="#93C90E"
/>
<path
d="M21.848 20.563l5.28 1.238a5.34 5.34 0 002.622-1.938 5.37 5.37 0 001.013-3.106 5.312 5.312 0 00-.936-3.01 5.283 5.283 0 00-2.475-1.944l-6.904 6.07 1.4 2.69z"
fill="#07C"
/>
</svg>
`;

Expand Down
55 changes: 29 additions & 26 deletions src/components/icon/assets/logo_elastic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,40 @@ const EuiIconLogoElastic = ({ title, titleId, ...props }) => (
<svg
width={32}
height={32}
fill="none"
viewBox="0 0 32 32"
xmlns="http://www.w3.org/2000/svg"
aria-labelledby={titleId}
{...props}>
{title ? <title id={titleId}>{title}</title> : null}
<g fill="none">
<path
fill="#FDD009"
d="M11.934 13.152l7.353 3.356 7.42-6.507c.107-.537.16-1.072.16-1.633 0-4.578-3.721-8.303-8.295-8.303a8.288 8.288 0 00-6.84 3.61l-1.234 6.409 1.436 3.068z"
/>
<path
fill="#23BAB1"
d="M4.322 20.947a8.461 8.461 0 00-.162 1.657c0 4.59 3.731 8.326 8.317 8.326a8.288 8.288 0 006.873-3.646l1.224-6.387-1.634-3.127-7.383-3.368-7.235 6.545z"
/>
<path
fill="#EE5097"
d="M4.276 8.208L9.315 9.4l1.104-5.736a3.976 3.976 0 00-2.413-.815 3.978 3.978 0 00-3.971 3.976c0 .484.08.948.24 1.383"
/>
<path
fill="#17A7E0"
d="M3.838 9.41c-2.251.747-3.817 2.907-3.817 5.284 0 2.314 1.43 4.38 3.576 5.198l7.07-6.398-1.298-2.776-5.53-1.308z"
/>
<path
fill="#92C73D"
d="M20.642 27.284a3.945 3.945 0 002.4.822 3.977 3.977 0 003.972-3.975c0-.484-.08-.948-.24-1.383l-5.036-1.18-1.096 5.716z"
/>
<path
fill="#0678A0"
d="M21.667 20.247l5.543 1.298c2.252-.745 3.818-2.907 3.818-5.284a5.553 5.553 0 00-3.583-5.19l-7.25 6.36 1.472 2.816z"
/>
</g>
<path
fill="#FFF"
d="M32 16.77a6.334 6.334 0 00-1.14-3.641 6.298 6.298 0 00-3.02-2.32 9.098 9.098 0 00-.873-5.965A9.05 9.05 0 0022.56.746a9.007 9.007 0 00-5.994-.419 9.037 9.037 0 00-4.93 3.446 4.789 4.789 0 00-5.78-.07A4.833 4.833 0 004.198 9.26a6.384 6.384 0 00-3.035 2.33A6.42 6.42 0 000 15.242 6.341 6.341 0 001.145 18.9a6.305 6.305 0 003.039 2.321 9.334 9.334 0 00-.16 1.725 9.067 9.067 0 001.727 5.333 9.014 9.014 0 004.526 3.287 8.982 8.982 0 005.587-.023 9.016 9.016 0 004.5-3.322 4.789 4.789 0 005.77.074 4.833 4.833 0 001.672-5.542 6.383 6.383 0 003.032-2.331A6.419 6.419 0 0032 16.77z"
/>
<path
fill="#FEC514"
d="M12.58 13.787l7.002 3.211 7.066-6.213a7.854 7.854 0 00.152-1.557 7.944 7.944 0 00-1.54-4.704 7.897 7.897 0 00-4.02-2.869 7.87 7.87 0 00-4.932.086 7.9 7.9 0 00-3.92 3.007l-1.174 6.118 1.367 2.92z"
/>
<path
fill="#00BFB3"
d="M5.333 21.228A7.964 7.964 0 006.72 27.53a7.918 7.918 0 004.04 2.874 7.89 7.89 0 004.95-.097 7.921 7.921 0 003.926-3.03l1.166-6.102-1.555-2.985-7.03-3.211-6.885 6.248z"
/>
<path
fill="#F04E98"
d="M5.288 9.067l4.8 1.137L11.14 4.73a3.785 3.785 0 00-4.538-.023A3.82 3.82 0 005.29 9.065"
/>
<path
fill="#1BA9F5"
d="M4.872 10.214a5.294 5.294 0 00-2.595 1.882 5.324 5.324 0 00-.142 6.124 5.287 5.287 0 002.505 2l6.733-6.101-1.235-2.65-5.266-1.255z"
/>
<path
fill="#93C90E"
d="M20.873 27.277a3.737 3.737 0 002.285.785 3.783 3.783 0 003.101-1.63 3.813 3.813 0 00.451-3.484l-4.8-1.125-1.037 5.454z"
/>
<path
fill="#07C"
d="M21.848 20.563l5.28 1.238a5.34 5.34 0 002.622-1.938 5.37 5.37 0 001.013-3.106 5.312 5.312 0 00-.936-3.01 5.283 5.283 0 00-2.475-1.944l-6.904 6.07 1.4 2.69z"
/>
</svg>
);

Expand Down
19 changes: 9 additions & 10 deletions src/components/icon/assets/logo_elastic.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.