scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-30 10:58:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/develop' into studio-modal-benwheeler

Browse source
This commit is contained in:
Ben Wheeler 2018-08-01 10:14:09 -04:00
commit 5fab657fad
4 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/footer/www/footer.jsx
View file

@ -108,7 +108,7 @@ const Footer = props => (
</a> </a>
</dd> </dd>
<dd> <dd>
<a href="https://wiki.scratch.mit.edu/"> <a href="https://en.scratch-wiki.info/">
<FormattedMessage id="general.wiki" /> <FormattedMessage id="general.wiki" />
</a> </a>
</dd> </dd>

7
src/views/conference/2018/index/index.jsx
View file

@ -18,10 +18,9 @@ const ConferenceSplash = () => (
July 26-28, 2018 | Cambridge, MA, USA July 26-28, 2018 | Cambridge, MA, USA
</h3> </h3>
<h3> <h3>
(Opening Reception on Evening of July 25) <a href="http://www.media.mit.edu/events/medialabtalk/">
</h3> Watch the keynotes live 7/26-7/28 at 9:30 a.m. EDT
<h3> </a>
Scratch@MIT is sold out!
</h3> </h3>
<p> <p>
<a href="/conference/2018/schedule"> <a href="/conference/2018/schedule">

7
src/views/conference/2018/index/index.scss
View file

@ -27,6 +27,13 @@
font-size: 4rem; font-size: 4rem;
} }
h3 {
a {
text-decoration: underline;
color: $type-white;
}
}
p { p {
margin-top: 1rem; margin-top: 1rem;

16
src/views/credits/credits.jsx
View file

@ -174,6 +174,14 @@ const Credits = () => (
<span className="name">Tracy Tang</span> <span className="name">Tracy Tang</span>
</li> </li>
<li>
<img
alt="Bryce Avatar"
src="//cdn.scratch.mit.edu/get_image/user/2029640_170x170.png"
/>
<span className="name">Bryce Taylor</span>
</li>
<li> <li>
<img <img
alt="Matthew Avatar" alt="Matthew Avatar"
@ -198,6 +206,14 @@ const Credits = () => (
<span className="name">Chris Willis-Ford</span> <span className="name">Chris Willis-Ford</span>
</li> </li>
<li>
<img
alt="Kathy Avatar"
src="//cdn.scratch.mit.edu/get_image/user/26779669_170x170.png"
/>
<span className="name">Kathy Wu</span>
</li>
<li> <li>
<img <img
alt="Julia Avatar" alt="Julia Avatar"