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.

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

fix(ui): remove gradients from logo svg components #17214

Merged
merged 4 commits into from
Mar 12, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
1. [17161](https://github.com/influxdata/influxdb/pull/17161): Update table custom decimal feature for tables to update table onFocus
1. [17168](https://github.com/influxdata/influxdb/pull/17168): Fixed UI bug that was setting Telegraf config buttons off-center and was resizing config selections when filtering through the data
1. [17208](https://github.com/influxdata/influxdb/pull/17208): Fixed UI bug that was setting causing dashboard cells to error when the a v.bucket was being used and was being configured for the first time
1. [17214](https://github.com/influxdata/influxdb/pull/17214): Fix appearance of client library logos in Safari
1. [17202](https://github.com/influxdata/influxdb/pull/17202): Fixed UI bug that was preventing checks created with the query builder from updating. Also fixed a bug that was preventing dashboard cell queries from working properly when creating group queries using the query builder

## v2.0.0-beta.5 [2020-02-27]
Expand Down
1 change: 1 addition & 0 deletions ui/src/clientLibraries/graphics/GoLogo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ const GoLogo: SFC = () => {
height="100%"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 300 300"
xmlSpace="preserve"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

>
<style>
{`
Expand Down
105 changes: 6 additions & 99 deletions ui/src/clientLibraries/graphics/JSLogo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ const JSLogo: SFC = () => {
.js2{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
.js3{fill-rule:evenodd;clip-rule:evenodd;fill:#699F63;}
.js4{clip-path:url(#XMLID_5_);}
.js5{fill:url(#SVGID_1_);}
.js6{fill:url(#SVGID_2_);}
.js7{fill:url(#SVGID_3_);}
.js8{fill:url(#SVGID_4_);}
.js9{fill:url(#SVGID_5_);}
.js10{fill:url(#SVGID_6_);}
.js5{fill:#699F63;}
.js6{fill:#699F63;}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move these to a stylesheet?

Copy link
Contributor

@russorat russorat Mar 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this matches the format of our other logo files. They are autogenerated, so i don't know how useful this would be.

Copy link
Contributor

@asalem1 asalem1 Mar 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, but we can also make things a little clearer if we wanted to. It's definitely not a deal breaker but something to keep in mind since we are doing it here:

https://github.com/influxdata/influxdb/blob/master/ui/src/clientLibraries/graphics/GoogleLogo.tsx

.js7{fill:#699F63;}
.js8{fill:#699F63;}
.js9{fill:#699F63;}
.js10{fill:#699F63;}
`}
</style>
<rect className="js0" width={300} height={300} />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we rename these classes to be a bit more descriptive?

Copy link
Contributor

@russorat russorat Mar 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this matches the format of our other logo files. They are autogenerated, so i don't know how useful this would be.

Expand Down Expand Up @@ -92,20 +92,6 @@ const JSLogo: SFC = () => {
l25.7,14.9c1,0.6,2.1,0.6,3.1,0l25.7-14.9c1-0.6,1.6-1.6,1.6-2.7v-29.7c0-1.1-0.6-2.1-1.6-2.7L116.2,108.5z"
/>
</defs>
<linearGradient
id="XMLID_4_"
gradientUnits="userSpaceOnUse"
x1="125.1041"
y1="119.5736"
x2="101.8713"
y2="166.9685"
>
<stop offset={0} style={{stopColor: '#41873F'}} />
<stop offset="0.3288" style={{stopColor: '#418B3D'}} />
<stop offset="0.6352" style={{stopColor: '#419637'}} />
<stop offset="0.9319" style={{stopColor: '#3FA92D'}} />
<stop offset={1} style={{stopColor: '#3FAE2A'}} />
</linearGradient>
<use
xlinkHref="#XMLID_143_"
style={{
Expand All @@ -129,19 +115,6 @@ const JSLogo: SFC = () => {
d="M115.5,173.6c0.3-0.1,0.5-0.2,0.7-0.3l25.7-14.9c1-0.6,1.6-1.6,1.6-2.7v-29.7c0-0.8-0.4-1.6-0.9-2.2
L115.5,173.6z"
/>
<linearGradient
id="SVGID_1_"
gradientUnits="userSpaceOnUse"
x1="110.7341"
y1="144.3775"
x2="175.9236"
y2="96.212"
>
<stop offset="0.1376" style={{stopColor: '#41873F'}} />
<stop offset="0.4032" style={{stopColor: '#54A044'}} />
<stop offset="0.7136" style={{stopColor: '#66B848'}} />
<stop offset="0.9081" style={{stopColor: '#6CC04A'}} />
</linearGradient>
<path
className="js5"
d="M142,123.4l-25.8-14.8c-0.3-0.1-0.5-0.3-0.8-0.3l-29,49.5c0.2,0.3,0.5,0.5,0.9,0.7l25.8,14.9
Expand All @@ -159,90 +132,24 @@ const JSLogo: SFC = () => {
d="M87.3,123.4c-1,0.6-1.7,1.6-1.7,2.7v29.7c0,1.1,0.7,2.1,1.7,2.7l25.8,14.9c0.6,0.4,1.3,0.5,2,0.4l-27.7-50.4
L87.3,123.4z"
/>
<linearGradient
id="SVGID_2_"
gradientUnits="userSpaceOnUse"
x1="84.9192"
y1="103.1674"
x2="144.3774"
y2="103.1674"
>
<stop offset="9.191646e-02" style={{stopColor: '#6CC04A'}} />
<stop offset="0.2864" style={{stopColor: '#66B848'}} />
<stop offset="0.5968" style={{stopColor: '#54A044'}} />
<stop offset="0.8624" style={{stopColor: '#41873F'}} />
</linearGradient>
<polygon
className="js6"
points="112.2,103.1 111.9,103.3 112.4,103.3 "
/>
<linearGradient
id="SVGID_3_"
gradientUnits="userSpaceOnUse"
x1="84.9192"
y1="140.8973"
x2="144.3774"
y2="140.8973"
>
<stop offset="9.191646e-02" style={{stopColor: '#6CC04A'}} />
<stop offset="0.2864" style={{stopColor: '#66B848'}} />
<stop offset="0.5968" style={{stopColor: '#54A044'}} />
<stop offset="0.8624" style={{stopColor: '#41873F'}} />
</linearGradient>
<path
className="js7"
d="M142,158.4c0.7-0.4,1.3-1.2,1.5-2l-28.3-48.3c-0.7-0.1-1.5,0-2.2,0.3l-25.6,14.8l27.7,50.4
c0.4-0.1,0.8-0.2,1.1-0.4L142,158.4z"
/>
<linearGradient
id="SVGID_4_"
gradientUnits="userSpaceOnUse"
x1="84.9192"
y1="157.8714"
x2="144.3774"
y2="157.8714"
>
<stop offset="9.191646e-02" style={{stopColor: '#6CC04A'}} />
<stop offset="0.2864" style={{stopColor: '#66B848'}} />
<stop offset="0.5968" style={{stopColor: '#54A044'}} />
<stop offset="0.8624" style={{stopColor: '#41873F'}} />
</linearGradient>
<polygon
className="js8"
points="144.4,158 144.2,157.7 144.2,158.1 "
/>
<linearGradient
id="SVGID_5_"
gradientUnits="userSpaceOnUse"
x1="84.9192"
y1="165.5433"
x2="144.3774"
y2="165.5433"
>
<stop offset="9.191646e-02" style={{stopColor: '#6CC04A'}} />
<stop offset="0.2864" style={{stopColor: '#66B848'}} />
<stop offset="0.5968" style={{stopColor: '#54A044'}} />
<stop offset="0.8624" style={{stopColor: '#41873F'}} />
</linearGradient>
<path
className="js9"
d="M142,158.4l-25.7,14.9c-0.4,0.2-0.7,0.3-1.1,0.4l0.5,0.9l28.6-16.6v-0.4l-0.7-1.2
C143.3,157.3,142.7,158,142,158.4z"
/>
<linearGradient
id="SVGID_6_"
gradientUnits="userSpaceOnUse"
x1="153.0397"
y1="118.1685"
x2="116.3697"
y2="192.9754"
>
<stop offset={0} style={{stopColor: '#41873F'}} />
<stop offset="0.3288" style={{stopColor: '#418B3D'}} />
<stop offset="0.6352" style={{stopColor: '#419637'}} />
<stop offset="0.9319" style={{stopColor: '#3FA92D'}} />
<stop offset={1} style={{stopColor: '#3FAE2A'}} />
</linearGradient>
<path
className="js10"
d="M142,158.4l-25.7,14.9c-0.4,0.2-0.7,0.3-1.1,0.4l0.5,0.9l28.6-16.6v-0.4l-0.7-1.2
Expand Down
28 changes: 2 additions & 26 deletions ui/src/clientLibraries/graphics/PythonLogo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,12 @@ const PythonLogo: SFC = () => {
<style>
{`
.python0{fill:none;}
.python1{fill:url(#path1948_1_);}
.python2{fill:url(#path1950_1_);}
.python1{fill:#5A9FD4;}
.python2{fill:#FFD43B;}
`}
</style>
<rect className="python0" width={300} height={300} />
<g>
<linearGradient
id="path1948_1_"
gradientUnits="userSpaceOnUse"
x1="125.7967"
y1="170.4548"
x2="290.6952"
y2="28.5818"
gradientTransform="matrix(0.5625 0 0 -0.568 -8.9623 166.6543)"
>
<stop offset={0} style={{stopColor: '#5A9FD4'}} />
<stop offset={1} style={{stopColor: '#306998'}} />
</linearGradient>
<path
id="path1948"
className="python1"
Expand All @@ -39,18 +27,6 @@ const PythonLogo: SFC = () => {
c11.3,0,20.3-9.3,20.3-20.6V87.7c0-11-9.3-19.2-20.3-21.1C163.2,65.5,155.9,65,149,65z M127.1,77.4c4.2,0,7.6,3.5,7.6,7.8
c0,4.3-3.4,7.7-7.6,7.7c-4.2,0-7.6-3.4-7.6-7.7C119.5,80.9,122.9,77.4,127.1,77.4z"
/>
<linearGradient
id="path1950_1_"
gradientUnits="userSpaceOnUse"
x1="354.446"
y1="-57.2856"
x2="295.5609"
y2="26.0267"
gradientTransform="matrix(0.5625 0 0 -0.568 -8.9623 166.6543)"
>
<stop offset={0} style={{stopColor: '#FFD43B'}} />
<stop offset={1} style={{stopColor: '#FFE873'}} />
</linearGradient>
<path
id="path1950"
className="python2"
Expand Down
Loading