scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 01:25:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'hotfix/update-conference-2018-3' into release/june-2018

Browse source
This commit is contained in:
Ray Schamp 2018-07-09 16:35:50 -04:00
commit ae5d825c37
9 changed files with 67 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/components/footer/conference/2018/footer.jsx
View file

@ -47,14 +47,13 @@ const ConferenceFooter = props => (
</a>
</li>
<li className="lego">
<a href="http://education.lego.com/">
<a href="http://www.legofoundation.com/">
<img
alt="LEGO Education"
src="/images/conference/footer/2018/lego-education.png"
alt="The LEGO Foundation"
src="/images/conference/footer/2018/lego-foundation.png"
/>
</a>
</li>
<li className="siegel">
<a href="http://www.siegelendowment.org/">
<img
@ -63,6 +62,14 @@ const ConferenceFooter = props => (
/>
</a>
</li>
<li className="cartoon-network">
<a href="https://www.cartoonnetwork.com/">
<img
alt="Cartoon Network"
src="/images/conference/footer/2018/cartoon-network.png"
/>
</a>
</li>
<li className="scratchfoundation">
<a href="http://www.scratchfoundation.org/">
<img

5
src/components/footer/conference/footer.scss
View file

@ -39,6 +39,11 @@
max-height: 60px;
}
}
.cartoon-network {
img {
min-height: 50px;
}
}
}
.scratch-links {

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

@ -66,6 +66,13 @@ class ConferenceDetails extends React.Component {
src="/svgs/conference/schedule/event-icon.svg"
/>
{this.props.conferenceDetails.Type}
</li>,
<li key="location">
<img
alt="location icon"
src="/svgs/conference/schedule/location-icon.svg"
/>
{this.props.conferenceDetails.Location}
</li>
]}
</ul>,

40
src/views/conference/2018/expect/expect.jsx
View file

@ -182,37 +182,37 @@ const ConferenceExpectations = () => (
</tr>
<tr>
<td>
<b>8:30a</b>
<b>8:30a-9:30a</b>
<p>Breakfast (provided)</p>
</td>
</tr>
<tr>
<td>
<b>9:30a</b>
<b>9:30a-10:30a</b>
<p>Keynote Presentation</p>
</td>
</tr>
<tr>
<td>
<b>11:00a</b>
<b>11:00a-12:30p</b>
<p>Morning Workshops</p>
</td>
</tr>
<tr>
<td>
<b>12:30p</b>
<b>12:30p-1:30p</b>
<p>Lunch (provided)</p>
</td>
</tr>
<tr>
<td>
<b>2:00p</b>
<b>2:00p-3:30p</b>
<p>Afternoon Workshops</p>
</td>
</tr>
<tr>
<td>
<b>4:00p</b>
<b>4:00p-5:30p</b>
<p>Poster Sessions</p>
</td>
</tr>
@ -231,50 +231,50 @@ const ConferenceExpectations = () => (
</tr>
<tr>
<td>
<b>8:30a</b>
<b>8:30a-9:30a</b>
<p>Breakfast (provided)</p>
</td>
</tr>
<tr>
<td>
<b>9:30a</b>
<b>9:30a-10:30a</b>
<p>Keynote Presentation</p>
</td>
</tr>
<tr>
<td>
<b>11:00a</b>
<b>11:00a-12:00p</b>
<p>Morning Workshops, Panels, and Ignite Talks</p>
</td>
</tr>
<tr>
<td>
<b>12:00p</b>
<b>12:00p-1:00p</b>
<p>Lunch (provided)</p>
</td>
</tr>
<tr>
<td>
<b>1:30p</b>
<b>1:30p-2:30p</b>
<p>Early Afternoon Workshops, Panels, and Ignite Talks</p>
</td>
</tr>
<tr>
<td>
<b>3:00p</b>
<b>3:00p-4:00p</b>
<p>Late Afternoon Workshops, Panels, and Ignite Talks</p>
</td>
</tr>
<tr>
<td>
<b>4:30p</b>
<b>4:30p-6:00p</b>
<p>Poster Sessions</p>
</td>
</tr>
<tr>
<td>
<b>6:30p</b>
<p>Conference Dinner</p>
<b>6:00p-7:30p</b>
<p>Conference Dinner (provided)</p>
</td>
</tr>
</tbody>
@ -292,26 +292,26 @@ const ConferenceExpectations = () => (
</tr>
<tr>
<td>
<b>8:30a</b>
<b>8:30a-9:30a</b>
<p>Breakfast (provided)</p>
</td>
</tr>
<tr>
<td>
<b>9:30a</b>
<b>9:30a-10:30a</b>
<p>Keynote Presentation</p>
</td>
</tr>
<tr>
<td>
<b>11:00a</b>
<b>11:00a-12:00p</b>
<p>Morning Workshops, Panels and Ignite Talks</p>
</td>
</tr>
<tr>
<td>
<b>12:00p</b>
<p>Lunch (provided) and Wrap-up Session</p>
<b>12:00p-1:30p</b>
<p>Closing Ceremony and Lunch (provided)</p>
</td>
</tr>
<tr>

5
src/views/conference/2018/expect/expect.scss
View file

@ -151,13 +151,14 @@
align-items: center;
b {
width: 30%;
width: 40%;
line-height: 1.7em;
}
p {
margin: 0;
width: 70%;
padding-left: 20px;
width: 60%;
}
}
}

23
src/views/conference/2018/schedule/schedule.jsx
View file

@ -53,6 +53,13 @@ class ConferenceSchedule extends React.Component {
/>
{item.Start} &ndash; {item.End}
</p>
<p>
<img
alt="location icon"
src="/svgs/conference/schedule/location-icon.svg"
/>
{item.Location}
</p>
</FlexRow>
<FlexRow>
<p>
@ -81,8 +88,20 @@ class ConferenceSchedule extends React.Component {
>
<h3>{item.Title}</h3>
<FlexRow>
<p>{item.Start} &ndash; {item.End}</p>
<p>{item.Location}</p>
<p>
<img
alt="time icon"
src="/svgs/conference/schedule/time-icon.svg"
/>
{item.Start} &ndash; {item.End}
</p>
<p>
<img
alt="location icon"
src="/svgs/conference/schedule/location-icon.svg"
/>
{item.Location}
</p>
</FlexRow>
</div>
);

BIN
static/images/conference/footer/2018/cartoon-network.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
static/images/conference/footer/2018/lego-education.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 50 KiB

BIN
static/images/conference/footer/2018/lego-foundation.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 47 KiB