From 6fd7100d14b373572b4c84c945053be323b992a4 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Sat, 17 Aug 2019 12:21:10 -0500 Subject: [PATCH] Add venue logo, fix layouts, fix sponsor images --- frontend/app/components/Footer/index.js | 18 +++++++++++++- frontend/app/components/Footer/styles.css | 27 ++++++++++++++------- frontend/app/components/Header/index.js | 11 ++++++++- frontend/app/components/Header/styles.css | 12 ++++++--- frontend/app/shared/css/global.css | 5 ++++ frontend/app/shared/images/logo-codeup.png | Bin 0 -> 1525 bytes 6 files changed, 59 insertions(+), 14 deletions(-) create mode 100644 frontend/app/shared/images/logo-codeup.png diff --git a/frontend/app/components/Footer/index.js b/frontend/app/components/Footer/index.js index 0721a61..cd5b0c5 100644 --- a/frontend/app/components/Footer/index.js +++ b/frontend/app/components/Footer/index.js @@ -5,6 +5,7 @@ import Sponsor from 'Sponsor'; import withSponsorsQuery from 'Sponsors/withSponsorsQuery'; import styles from './styles.css'; import logo from '../../shared/images/texas-camp-logo-blue.png'; +import logoCodeup from '../../shared/images/logo-codeup.png'; import twitter from '../../shared/images/twitter-grey.png'; import facebook from '../../shared/images/facebook-grey.png'; import sponsorsHeading from '../../shared/images/sponsors-heading-grey.png'; @@ -20,7 +21,6 @@ const Footer = ({ loading, sponsors }): React.Element | null =>   ·   San Antonio, TX -
CodeUp
@@ -32,6 +32,9 @@ const Footer = ({ loading, sponsors }): React.Element | null =>
+
+ +
+ venue + + ); +} + export default withSponsorsQuery(Footer); diff --git a/frontend/app/components/Footer/styles.css b/frontend/app/components/Footer/styles.css index 8f100d6..0039c74 100644 --- a/frontend/app/components/Footer/styles.css +++ b/frontend/app/components/Footer/styles.css @@ -11,7 +11,7 @@ } .info { color: $grey; - margin: 20px 0 40px; + margin: 20px 0 20px; .social { img { height: 14px; @@ -32,14 +32,16 @@ .heading { width: 140px; } -.sponsorsContainer { - display: flex; - justify-content: center; - img { - filter: grayscale(100%) brightness(240%); - -webkit-filter: grayscale(100%) brightness(240%); - margin: 20px 10px; - max-width: 160px; +.sponsors { + .sponsorsContainer { + display: flex; + justify-content: center; + img { + filter: grayscale(100%) brightness(240%); + -webkit-filter: grayscale(100%) brightness(240%); + margin: 20px 0; + max-width: 160px; + } } } .credits { @@ -47,8 +49,15 @@ color: $blue; font-size: 10px; padding: 20px; + padding-top: 0; + margin-top: -1em; text-align: center; a { color: $blue; } } +.venue { + img { + width: 160px; + } +} diff --git a/frontend/app/components/Header/index.js b/frontend/app/components/Header/index.js index f9b1b30..67f2ed7 100644 --- a/frontend/app/components/Header/index.js +++ b/frontend/app/components/Header/index.js @@ -58,7 +58,16 @@ const Header = ({ image = 'snake', isHome }) => {   ·   San Antonio, TX
-
CodeUp
+
+ + Codeup + +
diff --git a/frontend/app/components/Header/styles.css b/frontend/app/components/Header/styles.css index c40bf15..5ee9eb9 100644 --- a/frontend/app/components/Header/styles.css +++ b/frontend/app/components/Header/styles.css @@ -93,6 +93,12 @@ padding-top: 8px; } } + .venue { + a:hover { + border-bottom: 1px solid; + padding-top: 8px; + } + } } .logo { position: relative; @@ -225,7 +231,7 @@ :global .home { .snake { @media screen and (max-width: 500px) { - left: 50%; + left: 0; overflow: visible !important; position: absolute; } @@ -235,11 +241,11 @@ img { @media screen and (max-width: 500px) { background-color: $orange; - left: -50%; + left: 0; position: relative; } @media $tabletDown { - max-width: 500px !important; + max-width: 100vw !important; padding-top: 156px; } @media $tabletOnly { diff --git a/frontend/app/shared/css/global.css b/frontend/app/shared/css/global.css index d4613cc..5a9e04c 100644 --- a/frontend/app/shared/css/global.css +++ b/frontend/app/shared/css/global.css @@ -95,6 +95,11 @@ body { } } } +#app { + position: relative; + overflow: hidden; + width: 100vw; +} .title { font-size: 30px; line-height: 40px; diff --git a/frontend/app/shared/images/logo-codeup.png b/frontend/app/shared/images/logo-codeup.png new file mode 100644 index 0000000000000000000000000000000000000000..b3e1a434010e47cae4586b83879d3ce57d5e44d7 GIT binary patch literal 1525 zcmZWpYcvxK7+x%yLSy6}8xr~=go#`><~B1D`jXp-xlQB}pN82AA%=7awS1(l$+fgx zQeSCuj}alvWvI4D)VFi`**VYqJn#FQ=e$3kYZ$bHq=b?L005A5L?N(3ofVFkxTuil zsZX+mq8Nwtj`N5PiAxBG#Q|)BqXTj3j*$VOI4mw8IEnBYcS;y?#<+MQ9b#O9h^G_p zI-&iHg}~?930Zjl#_#=4=g)wDiY0!h`=Icxd>j_-0noc;*L^U>`Z;lFy>!|iaij?jityy=smK8_z@zuWTu~Uj0B8(gra(z}!rug+dN>RbP(a4Ul*03THRUq*1d# zqG|M0d(zhh_QbEyfQHC%9_TfGf;Bh+leeIx9{!-poPw=B4qf4|+3t#o!EGbN1n;C#!boD!=9I@(pxGWnm7N z2~SPOw*5e@R#Xkg>JeahnDAEWsAnEVciL%EP3S#fmDa93^lV0&EgElng?FyX*LiYd zY1LICTahDISCyUZ35rnFOhnpuXX|gOz1dqnlmg!)5=q26q^%aGXJX7B&NROaarE^E z)MQEM+pxd9mQ5%IHErIthcrZJUhj1UPz16z7_N2PV;M<#fCX28YQBWO0;VpKhT(R; zC%mwWtu3`h4H}&8D(=t2L#@tzE^tc zyArC3@%-$P_c62IdvEgOwD%R8BZBLU)aP1^$zW>RSy-@yZPQDI!(*>~+mv+@Do@>^zw|N9&d$;3 zTkHkaMW|nH0hWW2epfrs+c*njh{J$s(MGgo&Wc(BP7G}Uw3qO z{AaZB3epJXV2K*n&t*IzncD>M*n7_>N=3vIG?%Dm@M^$~z0dR?O(|$d$Ti9V+HBBK z*R?)WK8fW6HD!JL^n$2BKUHbut1{^xG=$d?_%G+4Og9s2ZK|KV92S>F2i{;@k;mv- zDD;d)gal)1mj-fbO@^C&A2LkTtwZ!r?gfuWS>&LsY&Am+!G#%_vDG&g4c8R5$&93m z;sQNryh(ClhDDurmyuv_k#e`h>|k#yB1JARRchdji}{2=ut@nZjc|_unK1b)OAZ#x zNmcU76i%J|w0HK~?+>SQq3{gvsGY#8K7LIly_3fr-dsnG#xL5sJSTdWFIj`W0>~u9 z#nxwF@1n-;W0?b(u5*+Vu-(=XkBjr^ngm>x z3#j~iOqZN{yM9tPXRKeAS3hmLie?>QyV{o-(TWYi{j2=yMRAU1>(+0-aK)J=Qo#26 z;(VoQ_>bmuu^aN}GX)b*YW^F%*-18vu4~+*#jJl?G$EEr5Gyi$g$tA8tn_T{^scof zfu#y%X*o#xa0laF;yyH_p+35i{8hqPCcj}+S=qx)JsNi&EA=cFxAf)_jQ~N8Y$f1o zw;xl0wxc_i+MUt{>1dfVD=8yNvr+h5X<~S4-kwWs`!m=jagqE$Q80h3kL5>ZcWAI> zI3nltHTyA(eTQw2%9MBngm3S9qRD)tcBU-~t{b&3(7v zVyRu-(~E{3$vk}=5s(z@q_JOH1#vtJxSP>W-F1v^#E6>utFpb5pH=e7c$@qofE1vnzn2)eC*`v0!7+3WxS literal 0 HcmV?d00001