scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-03-25 12:20:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions4

Merge pull request from mewtaylor/bugfix/mobile-nav-conference

Browse source 
[Master] hotfix: mobile nav conference
This commit is contained in:
Matthew Taylor 2016-06-06 14:42:35 -04:00
commit ad5b534f5e
2 changed files with 6 additions and 6 deletions
src
components/navigation/conference
navigation.scss
views/conference/expect
expect.jsx

6
src/components/navigation/conference/navigation.scss
View file

@ -44,7 +44,7 @@
@media only screen and (max-width: $mobile - 1) {
.inner > ul {
li {
&.right {
&.right {
ul {
flex-flow: row nowrap;
@ -67,8 +67,8 @@
.inner {
> ul {
justify-content: space-between;
flex-flow: column nowrap;
justify-content: center;
flex-flow: row wrap;
li {
align-self: center;

6
src/views/conference/expect/expect.jsx
View file

@ -91,9 +91,9 @@ var ConferenceExpectations = React.createClass({
<b>Friday</b>
</div>
<h3>Pathways to Participation</h3>
<img src="/images/conference/expect/mimi-nichole.jpg" alt="Mimi and Nicole" />
<img src="/images/conference/expect/mimi-nichole.jpg" alt="Mimi and Nichole" />
<p>
<b>Mimi Ito &amp; Nicole Pinkard</b>
<b>Mimi Ito &amp; Nichole Pinkard</b>
<br />
<b>Ricarose Roque (moderator)</b>
</p>
@ -108,7 +108,7 @@ var ConferenceExpectations = React.createClass({
<b>Saturday</b>
</div>
<h3>Creative Computing For All</h3>
<img src="/images/conference/expect/karen.jpg" alt="Mimi and Nicole" />
<img src="/images/conference/expect/karen.jpg" alt="Karen" />
<p>
<b>Karen Brennan (moderator)</b>
</p>