From 1a3593c9cae98440fa9123e4efff02f368e50af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81rgio=20Ramos?= Date: Fri, 13 Oct 2017 20:45:58 +0100 Subject: [PATCH] feat: update triton logo --- .../my-joy-beta/src/assets/triton_logo.png | Bin 3271 -> 0 bytes .../src/assets/triton_logo_dark.png | Bin 1534 -> 0 bytes .../src/components/navigation/header.js | 17 +++++++---------- packages/ui-toolkit/src/header/brand.js | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 packages/my-joy-beta/src/assets/triton_logo.png delete mode 100644 packages/my-joy-beta/src/assets/triton_logo_dark.png diff --git a/packages/my-joy-beta/src/assets/triton_logo.png b/packages/my-joy-beta/src/assets/triton_logo.png deleted file mode 100644 index a4ec2e7522003c6ff2579cd78a518660d9466a9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3271 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 diff --git a/packages/my-joy-beta/src/assets/triton_logo_dark.png b/packages/my-joy-beta/src/assets/triton_logo_dark.png deleted file mode 100644 index ccf801cc9bf3bc1a780cf2a573a8b3924883c607..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1534 zcmd^9`#X~h0N%xBV?3G8aT)f_7Uq76omSE|HlO7z%`JvhD=`kOICNCIXwvmVCtXA? z<%uO{Cv}t*s`JHT3yH){oySP7lc@t*_$B{2#ZiK zScpI%!4)5kL$C0qoy&=_|72>%zfX$b-gwv5FuN7|;~lGCjB5h!R^Pr*n^Ka?8k?H<-1gyh z!Mx9_s1xtIUvvx^{3PyM9%zCh$H)kTNkV8aJ2D43JYX6#zL)TH|LliQ@B0^eX!_Z0Re3%WmId*AWqe}n z;f!?0mZj74J%g!Te>fkKSU;=FrBpMs&Fe*P(r0@3gPm_D>L)EBPczlvPx7#Vw6k%# z&k1*|3+;1(J#R}-`uKk}lo;eYeg-=6xhyY9LmxV^G*EAn^WCn#HWHy=P^VhW+r0o4 z&~21=Z7pLNvKne*-2(Ji(rICpb)%qz(&H-&KyM{$2)gj{0~C_KjJ6JzNoF|h4pJDe zS0lx-+CUdE6|FBv>c5z(0rgwkZpypL~i1tH8n_D9><<#*_`hubI8W0An;i* zy%w_RhceA_Q_YxqQ)1B?8dFi$d#vT4IX(fL5+ty_Q#f;qm;;#HYq&!3mIh#(uQ)6t zp{wNRL73F|^yINmqe~m%)Xjlnv|5OS*j!7XKIsVqs(_Jt{C0m5Xhhh_lTplZRPkKf zhIO)dS2C2Gbb2(Xp~M#D{=+h<$dd;^8;ouOq6co zinIPV9}tys+ZW#63ft+ew$F1}8lM;Fr0xYpndvQG7+ctpeVASBLX(dWq(W;AN~iXL zL2DyYy=e#3Ta62S!&H{(@;{-++ihqm9D%awBf%JNRs84x)=t9lR`^ev7yD7jZ5y(% zu`!Bsfm(pd1;>z*0UMf^J0}~HmnLHKPgSOMZE|Dtufk4ib8H(O=o}$lot_N6JOO1j z^5>xGqj+Yu3H_LJ6f7f0zP|(9P@B-Tbs|>uqcOonM{(k0u$7dk)?oCwoGsmF9kneh z5n7oIi4_QJ>+P-d*eI?b)?6Uivv?rG$jISncyq(r)f7omlm#$cn%{B!xGtZ4W*D>( z=B1HXI;-AHC-@Sv#`dNii-)T#N^Z8}!jdThFuDpkG!l1)e+c@$j2=WpRpmiv+(YMj00Y*I9u4h@_Fz4s{z_S~Foc2cu{swCi3vCe)A6>)A)v ier#TTex2%Gvl&tD2E@%{E~{6L3=zr|1UGP!6#oHmPJJ~1 diff --git a/packages/my-joy-beta/src/components/navigation/header.js b/packages/my-joy-beta/src/components/navigation/header.js index a7d23053..4a00634a 100644 --- a/packages/my-joy-beta/src/components/navigation/header.js +++ b/packages/my-joy-beta/src/components/navigation/header.js @@ -1,22 +1,19 @@ import React from 'react'; import { Link } from 'react-router-dom'; -import { Img } from 'normalized-styled-components'; -import remcalc from 'remcalc'; -import Logo from '@assets/triton_logo.png'; -import { Header, HeaderBrand, ViewContainer } from 'joyent-ui-toolkit'; - -const StyledLogo = Img.extend` - width: ${remcalc(87)}; - height: ${remcalc(25)}; -`; +import { + Header, + HeaderBrand, + ViewContainer, + TritonIcon +} from 'joyent-ui-toolkit'; export default () => (
- + diff --git a/packages/ui-toolkit/src/header/brand.js b/packages/ui-toolkit/src/header/brand.js index 52687763..5698f16e 100644 --- a/packages/ui-toolkit/src/header/brand.js +++ b/packages/ui-toolkit/src/header/brand.js @@ -16,7 +16,7 @@ const Box = styled.div` align-self: stretch; order: 0; - padding: ${remcalc(13.5)} 0; + padding: ${remcalc(11)} 0; `; export default ({ children, ...rest }) => (