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

Revert "Apache, Nginx, MySQL logos" #272

Closed
wants to merge 3 commits into from
Closed

Revert "Apache, Nginx, MySQL logos" #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ddb82d
Revert "Add missing changelog entry (#271)"
snide Jan 8, 2018
ff92fb5
Revert "Apache, Nginx, MySQL logos (#270)"
snide Jan 8, 2018
7bcc1fa
Merge branch 'master' into revert-270-icons/solutions
snide Jan 8, 2018
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: 0 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# [`master`](https://github.com/elastic/eui/tree/master)

- Added Apache, Nginx, MySQL logos [(#270)](https://github.com/elastic/eui/pull/270)
- Fixed `<EuiContextMenu>` to pass the `event` argument to a `<EuiContextMenuItem>`'s `onClick` handler even when a panel is defined. [(#265)](https://github.com/elastic/eui/pull/265)

# [`0.0.11`](https://github.com/elastic/eui/tree/v0.0.11)
Expand Down
3 changes: 0 additions & 3 deletions src-docs/src/views/icon/logos.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
} from '../../../../src/components';

const iconTypes = [
'logoApache',
'logoBeats',
'logoCloud',
'logoElastic',
Expand All @@ -18,8 +17,6 @@ const iconTypes = [
'logoGmail',
'logoKibana',
'logoLogstash',
'logoMySQL',
'logoNginx',
'logoSlack',
'logoWebhook',
'logoXpack',
Expand Down
292 changes: 0 additions & 292 deletions src/components/icon/__snapshots__/icon.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1339,238 +1339,6 @@ exports[`EuiIcon renders type loggingApp 1`] = `
</svg>
`;

exports[`EuiIcon renders type logoApache 1`] = `
<svg
class="euiIcon euiIcon--medium"
height="32"
viewBox="0 0 32 32"
width="32"
xmlns="http://www.w3.org/2000/svg"
>
<defs>
<linearGradient
id="logo_apache-a"
x1="83.946%"
x2="-54.341%"
y1="39.21%"
y2="93.091%"
>
<stop
offset="0%"
stop-color="#282662"
/>
<stop
offset="9.548%"
stop-color="#662E8D"
/>
<stop
offset="78.82%"
stop-color="#9F2064"
/>
<stop
offset="94.87%"
stop-color="#CD2032"
/>
</linearGradient>
<linearGradient
id="logo_apache-b"
x1="76.264%"
x2="-38.571%"
y1="83.275%"
y2="-12.192%"
>
<stop
offset="0%"
stop-color="#F69923"
/>
<stop
offset="31.23%"
stop-color="#F79A23"
/>
<stop
offset="83.83%"
stop-color="#E97826"
/>
</linearGradient>
<linearGradient
id="logo_apache-c"
x1="424.145%"
x2="13.08%"
y1="-170.194%"
y2="82.017%"
>
<stop
offset="32.33%"
stop-color="#9E2064"
/>
<stop
offset="63.02%"
stop-color="#C92037"
/>
<stop
offset="75.14%"
stop-color="#CD2335"
/>
<stop
offset="100%"
stop-color="#E97826"
/>
</linearGradient>
<linearGradient
id="logo_apache-d"
x1="186.182%"
x2="-55.105%"
y1="-16.929%"
y2="107.746%"
>
<stop
offset="32.33%"
stop-color="#9E2064"
/>
<stop
offset="63.02%"
stop-color="#C92037"
/>
<stop
offset="75.14%"
stop-color="#CD2335"
/>
<stop
offset="100%"
stop-color="#E97826"
/>
</linearGradient>
<linearGradient
id="logo_apache-e"
x1="168.562%"
x2="-36.487%"
y1="-25.193%"
y2="95.315%"
>
<stop
offset="32.33%"
stop-color="#9E2064"
/>
<stop
offset="63.02%"
stop-color="#C92037"
/>
<stop
offset="75.14%"
stop-color="#CD2335"
/>
<stop
offset="100%"
stop-color="#E97826"
/>
</linearGradient>
<linearGradient
id="logo_apache-f"
x1="361.539%"
x2="24.407%"
y1="-112.855%"
y2="62.315%"
>
<stop
offset="32.33%"
stop-color="#9E2064"
/>
<stop
offset="63.02%"
stop-color="#C92037"
/>
<stop
offset="75.14%"
stop-color="#CD2335"
/>
<stop
offset="100%"
stop-color="#E97826"
/>
</linearGradient>
<linearGradient
id="logo_apache-g"
x1="173.271%"
x2="-94.406%"
y1="-9.428%"
y2="109.132%"
>
<stop
offset="0%"
stop-color="#282662"
/>
<stop
offset="9.548%"
stop-color="#662E8D"
/>
<stop
offset="78.82%"
stop-color="#9F2064"
/>
<stop
offset="94.87%"
stop-color="#CD2032"
/>
</linearGradient>
</defs>
<g
fill="none"
fill-rule="evenodd"
>
<path
d="M20.879 5.561a17.073 17.073 0 0 0 1.856-1.017l.063-.04c-.24.61-.123 1.68-.12 1.676.378-1.109.847-2.084 1.556-2.704.271.242.477.697.646 1.273.084-.793-.06-1.237-.13-1.399.35.414.982.645 1.663.846-.765-.465-1.271-.923-1.47-1.372A163.25 163.25 0 0 0 31.969.46a.664.664 0 0 0-.62-.102c-.449.163-3.393 1.224-7.398 2.435l-.344.104-.097.028a147.737 147.737 0 0 1-1.6.47l-1.102 2.201c.023-.01.048-.023.072-.035z"
fill="url(#logo_apache-a)"
fill-rule="nonzero"
transform="translate(0 12)"
/>
<path
d="M.645 7.922c.61.23 1.265.29 1.908.36.378.036.758.06 1.138.08l.782-1.64A20.782 20.782 0 0 1 1.46 6.61c.988.099 1.984.059 2.974.005-.714-.852-1.498-1.642-2.297-2.414-.751.378-1.478.905-1.873 1.668-.2.465-.317 1.008-.154 1.5.088.253.29.453.536.553z"
fill="url(#logo_apache-b)"
fill-rule="nonzero"
transform="translate(0 12)"
/>
<path
d="M20.374 15.509l-.074.021a130.412 130.412 0 0 1-3.08.83 110.237 110.237 0 0 1-3.144.757 93.225 93.225 0 0 1-2.98.615l-.215.04-.035.007.071.077-.082.164.053-.01a66.427 66.427 0 0 0 1.558-.288 85.733 85.733 0 0 0 3.202-.689 115.733 115.733 0 0 0 4.684-1.194l.349-.097c.416-.116.825-.231 1.228-.347l.13-.26-.08-.085a143.279 143.279 0 0 1-1.585.46v-.001z"
/>
<path
d="M9.297 6.267c-.542.08-1.077.15-1.604.212-.547.063-1.084.116-1.61.156l-.093.008c-.518.039-1.024.065-1.517.08L3.69 8.36l.307.013c.392.015.807.024 1.243.026a47.395 47.395 0 0 0 3.079-.087c.447-.027.904-.059 1.368-.099l.051-.004c.426-.708.731-1.46 1.097-2.19-.517.089-1.03.171-1.538.247z"
fill="url(#logo_apache-c)"
fill-rule="nonzero"
transform="translate(0 12)"
/>
<path
d="M20.331 3.84a121.172 121.172 0 0 1-4.683 1.194 98.998 98.998 0 0 1-3.202.689 91.241 91.241 0 0 1-1.558.288l-.053.009-1.097 2.19.104-.009a51.719 51.719 0 0 0 3.029-.36 45.924 45.924 0 0 0 1.562-.26 32.292 32.292 0 0 0 1.544-.33 28.995 28.995 0 0 0 2.46-.701c.245-.085.487-.173.726-.263a22.904 22.904 0 0 0 1.645-.691c.371-.722.755-1.456 1.102-2.202a155.908 155.908 0 0 1-1.579.445z"
fill="url(#logo_apache-d)"
fill-rule="nonzero"
transform="translate(0 12)"
/>
<path
d="M10.881 5.772l.215-.04.66-.127c.242-.047.49-.097.741-.15.127-.025.255-.052.384-.079a93.043 93.043 0 0 0 2.757-.623 109.962 109.962 0 0 0 3.173-.81c.485-.132.981-.27 1.49-.413l.073-.021a134.8 134.8 0 0 0 1.548-.45l.036-.01-.611-.66.024.048c-.744-.78-2.233-1.446-3.573-1.597a8.482 8.482 0 0 0-1.993.03c-.533.066-1.097.175-1.699.326-.525.133-1.08.296-1.666.493.25.12.494.29.732.5a5.345 5.345 0 0 1 .249.235l-.002-.001c-.902-.573-1.872-.637-2.874-.464.3.104.743.307 1.137.65.054.048.106.098.157.149l.039.038h-.002a4.06 4.06 0 0 0-.932-.42 3.132 3.132 0 0 0-.693-.12 3.474 3.474 0 0 0-.835.053 10.591 10.591 0 0 0-1.119.263 6.997 6.997 0 0 0-.388.132c-.119.046-.21.088-.273.122.041.01.086.026.133.046.324.134.763.452 1.073.74l-.562-.605.562.606.014.013.091.09c-.007-.005-.014-.006-.02-.01l1.92 2.071.034-.005z"
fill="url(#logo_apache-e)"
fill-rule="nonzero"
transform="translate(0 12)"
/>
<path
d="M4.433 6.614c.457-.028.97-.068 1.54-.126l.091-.01c.494-.05 1.032-.113 1.613-.191a69.437 69.437 0 0 0 3.17-.51l-1.9-2.062c-.79-.433-1.303-.536-1.91-.528a13.93 13.93 0 0 0-.51.025c-.534.037-1.102.105-1.649.195-.528.088-1.036.196-1.476.317-.28.077-.533.16-.745.244-.188.075-.36.153-.52.233.801.768 1.743 1.738 2.297 2.413z"
fill="url(#logo_apache-f)"
fill-rule="nonzero"
transform="translate(0 12)"
/>
<path
d="M30.685 19.708v.083h.193v.544h.09l-.001-.544h.194v-.083h-.476zm1.114 0l-.215.438-.217-.438h-.108v.627h.083v-.497l.213.43h.057l.213-.43v.497h.083v-.627h-.11z"
fill="#6D6E71"
fill-rule="nonzero"
/>
<path
d="M22.19 2.981c.41-.122.826-.248 1.25-.378l.02-.006.179-.056c.286-.088.541-.17 1.123-.355-.074-.35.084-.794.293-1.257a1.784 1.784 0 0 0-.64 1.194c-.9-1.334-2.05-2.204-3.42-2.08-.122.012-.245.03-.371.058.525.015.906.235 1.324.87l.004.003-.004-.002C20.88.372 20.16.207 19.226.283a8.42 8.42 0 0 0-.709.092c1.389.187 2.293.927 2.83 2.014l.024.048.587.613.231-.069z"
fill="url(#logo_apache-g)"
fill-rule="nonzero"
transform="translate(0 12)"
/>
</g>
</svg>
`;

exports[`EuiIcon renders type logoBeats 1`] = `
<svg
class="euiIcon euiIcon--medium"
Expand Down Expand Up @@ -1860,66 +1628,6 @@ exports[`EuiIcon renders type logoLogstash 1`] = `
</svg>
`;

exports[`EuiIcon renders type logoMySQL 1`] = `
<svg
class="euiIcon euiIcon--medium"
height="32"
viewBox="0 0 32 32"
width="32"
xmlns="http://www.w3.org/2000/svg"
>
<g
fill="none"
fill-rule="evenodd"
>
<path
d="M.06 23.045h1.051v-4.15a35146213408608490 35146213408608490 0 0 0 3.557 3.617l1.627-3.618v4.15h1.051v-4.143c0-.404-.161-.6-.495-.7-.798-.25-1.334-.034-1.576.505l-1.597 3.57-1.546-3.57c-.233-.54-.778-.755-1.577-.506-.333.101-.495.297-.495.701v4.144zM8.22 19.667h1.05v2.287c-.009.124.04.415.616.424.294.005 2.267 0 2.286 0v-2.722h1.053c.005 0-.001 3.713-.001 3.728.006.916-1.136 1.115-1.662 1.13H8.243v-.707h3.324c.677-.071.597-.407.597-.52v-.276H9.93c-1.04-.01-1.701-.463-1.71-.985 0-.049.023-2.336 0-2.359z"
fill="#00618A"
fill-rule="nonzero"
/>
<path
d="M14.035 23.045h3.022c.353 0 .697-.074.97-.202.455-.21.677-.492.677-.863v-.768c0-.303-.253-.586-.748-.774a2.583 2.583 0 0 0-.9-.155h-1.273c-.424 0-.626-.128-.677-.411-.01-.034-.01-.061-.01-.095V19.3c0-.027 0-.054.01-.088.05-.215.162-.276.536-.31.03 0 .07-.006.1-.006h3.002v-.701h-2.95c-.425 0-.647.027-.85.087-.626.196-.899.506-.899 1.045v.613c0 .472.536.876 1.435.97.101.007.202.014.303.014h1.092c.04 0 .08 0 .11.006.334.027.476.088.577.21.06.06.08.12.08.188v.613c0 .074-.05.168-.15.25-.092.08-.243.134-.445.147-.04 0-.071.007-.112.007h-2.9v.7zM25.26 21.825c0 .721.536 1.126 1.617 1.206.1.007.202.014.303.014h2.739v-.7h-2.76c-.616 0-.848-.156-.848-.526v-3.625H25.26v3.631zM19.375 21.862v-2.498c0-.634.446-1.02 1.327-1.14.09-.014.192-.021.283-.021h1.995c.101 0 .193.007.294.02.88.122 1.326.507 1.326 1.141v2.498c0 .515-.189.79-.625.97l1.035.935h-1.22l-.838-.756-.843.053h-1.124a2.33 2.33 0 0 1-.618-.088c-.668-.182-.992-.533-.992-1.114zm1.134-.06c0 .033.01.067.02.108.061.29.335.452.75.452h.955l-.877-.792h1.22l.765.69a.498.498 0 0 0 .266-.337c.01-.034.01-.067.01-.101v-2.397c0-.027 0-.06-.01-.095-.06-.27-.334-.425-.74-.425H21.28c-.466 0-.77.203-.77.52v2.376z"
fill="#E48E00"
fill-rule="nonzero"
/>
<path
d="M30.845 17.032c-.646-.017-1.14.043-1.562.22-.12.051-.311.053-.33.203.065.069.076.172.128.257.1.163.27.382.423.496.165.125.336.26.514.368.316.192.67.302.974.496.179.113.357.257.532.385.087.064.145.163.257.202v-.018c-.059-.075-.074-.179-.128-.257l-.239-.239a3.919 3.919 0 0 0-.845-.808c-.251-.18-.814-.424-.919-.717l-.018-.018c.178-.02.387-.085.551-.129.276-.074.523-.055.809-.128l.385-.11v-.074c-.144-.148-.247-.344-.404-.478-.411-.35-.86-.7-1.323-.992-.256-.162-.573-.267-.845-.404-.09-.046-.252-.07-.312-.147-.143-.182-.22-.413-.33-.624-.231-.445-.458-.93-.662-1.397-.14-.318-.23-.632-.404-.918-.834-1.372-1.732-2.2-3.123-3.013-.296-.173-.652-.241-1.029-.33l-.606-.037c-.123-.052-.252-.203-.367-.276-.461-.291-1.643-.924-1.984-.092-.216.526.322 1.038.514 1.305.135.186.308.396.404.606.064.138.075.276.129.422.133.36.25.752.422 1.084.088.168.184.346.294.496.068.092.184.133.202.276-.113.158-.12.405-.183.606-.287.905-.18 2.03.238 2.7.129.206.43.647.845.478.364-.148.282-.606.386-1.01.024-.092.01-.16.055-.22v.018l.331.66c.245.395.68.807 1.047 1.085.191.144.341.393.588.478v-.019h-.018c-.048-.074-.123-.105-.184-.165a4.21 4.21 0 0 1-.423-.478c-.334-.454-.63-.952-.9-1.47-.128-.247-.24-.52-.349-.771-.042-.097-.041-.244-.128-.294-.12.184-.294.333-.386.551-.147.348-.166.772-.22 1.213-.033.011-.018.003-.037.018-.256-.062-.346-.325-.441-.551-.24-.572-.285-1.492-.074-2.15.055-.17.303-.706.202-.863-.047-.157-.205-.248-.294-.367a2.89 2.89 0 0 1-.294-.515c-.196-.445-.288-.946-.495-1.396-.1-.215-.267-.433-.405-.625-.152-.212-.322-.368-.44-.624-.042-.091-.1-.237-.037-.33.02-.064.047-.09.11-.111.107-.082.403.027.514.073.295.123.54.24.79.405.12.079.241.233.386.275h.165c.259.06.549.019.79.092.427.13.81.332 1.158.551a7.165 7.165 0 0 1 2.516 2.756c.096.183.137.357.22.55.17.392.383.794.552 1.177.168.381.332.766.57 1.083.124.167.607.257.826.35.154.064.406.132.551.22.278.168.548.367.809.551.13.092.53.293.55.46z"
fill="#00618A"
fill-rule="nonzero"
/>
<path
d="M22.633 10.032a1.314 1.314 0 0 0-.331.037v.019h.018c.065.132.178.217.258.33.06.129.122.257.183.386l.019-.018c.113-.08.166-.209.165-.404-.046-.048-.052-.109-.092-.166-.052-.076-.154-.12-.22-.184z"
fill="#00618A"
/>
<path
d="M30.413 22.324c0 .463.366.775.775.775a.764.764 0 0 0 .774-.775.764.764 0 0 0-.774-.774.764.764 0 0 0-.775.774zm1.376 0a.6.6 0 0 1-.601.614.597.597 0 0 1-.601-.614c0-.35.264-.613.6-.613a.6.6 0 0 1 .602.613zm-.393.442h.174l-.254-.388c.136-.014.24-.08.24-.241 0-.18-.114-.254-.333-.254h-.345v.883h.148v-.382h.139l.231.382zm-.37-.506v-.254h.172c.089 0 .196.017.196.12 0 .124-.097.134-.208.134h-.16z"
fill="#E48E00"
/>
</g>
</svg>
`;

exports[`EuiIcon renders type logoNginx 1`] = `
<svg
class="euiIcon euiIcon--medium"
height="32"
viewBox="0 0 32 32"
width="32"
xmlns="http://www.w3.org/2000/svg"
>
<g
fill="#090"
>
<path
d="M.853 14.45v3.722a.714.714 0 1 1-1.429 0v-5.447c0-.636.77-.955 1.22-.505l4.227 4.228v-3.723a.714.714 0 0 1 1.428 0v5.447c0 .637-.769.955-1.219.505L.853 14.45zm8.04-2.432l-.197.366-1.517 2.76-.197.347.197.349 1.518 2.67.205.365H12.875l.197-.402 1.133-2.285.51-1.036h-1.152l-2.902.009a.743.743 0 0 0-.725.714c0 .378.347.72.725.715l1.75-.01-.429.867h-2.25l-1.116-1.965 1.125-2.035h2.394l.558 1.145h1.437l-.906-2.172-.197-.402H8.893zm7.236-.009a.742.742 0 0 0-.705.723v1.862h1.428v-1.862a.743.743 0 0 0-.723-.723zM23.152 14.464v3.722a.714.714 0 0 0 1.429 0V12.74a.714.714 0 0 0-1.22-.505l-4.227 4.228v-3.723a.714.714 0 0 0-1.428 0v5.447c0 .637.769.956 1.219.506l4.227-4.228zM25.626 13.243a.714.714 0 0 1 1.008-1.012l5.453 5.434a.714.714 0 0 1-1.009 1.012l-5.452-5.434z"
/>
<path
d="M32.093 13.243a.714.714 0 0 0-1.008-1.012l-5.453 5.434a.714.714 0 0 0 1.009 1.012l5.452-5.434zM16.129 18.88a.742.742 0 0 1-.705-.723v-2.99h1.428v2.99a.743.743 0 0 1-.723.723z"
/>
</g>
</svg>
`;

exports[`EuiIcon renders type logoSlack 1`] = `
<svg
class="euiIcon euiIcon--medium"
Expand Down
Loading