Commit c6b967a6 authored by Karishma Chadha's avatar Karishma Chadha

Fix 4ps being out of order on smaller screens, fix responsiveness issues,...

Fix 4ps being out of order on smaller screens, fix responsiveness issues, initiatives tools hero images now scale along with page width. Fix #view width at 100% like some other pages do.
parent 99d89970
...@@ -415,16 +415,16 @@ class AnnualReport extends React.Component { ...@@ -415,16 +415,16 @@ class AnnualReport extends React.Component {
<p><FormattedMessage id="annualReport.missionProjectsDescription" /></p> <p><FormattedMessage id="annualReport.missionProjectsDescription" /></p>
<img src="/images/annual-report/mission/Projects Illustration.svg" /> <img src="/images/annual-report/mission/Projects Illustration.svg" />
</div> </div>
<div className="one-p four-ps-peers">
<h3><FormattedMessage id="annualReport.missionPeersTitle" /></h3>
<p><FormattedMessage id="annualReport.missionPeersDescription" /></p>
<img src="/images/annual-report/mission/Peers Illustration.svg" />
</div>
<div className="one-p four-ps-passion"> <div className="one-p four-ps-passion">
<h3><FormattedMessage id="annualReport.missionPassionTitle" /></h3> <h3><FormattedMessage id="annualReport.missionPassionTitle" /></h3>
<p><FormattedMessage id="annualReport.missionPassionDescription" /></p> <p><FormattedMessage id="annualReport.missionPassionDescription" /></p>
<img src="/images/annual-report/mission/Passion Illustration.svg" /> <img src="/images/annual-report/mission/Passion Illustration.svg" />
</div> </div>
<div className="one-p four-ps-peers">
<h3><FormattedMessage id="annualReport.missionPeersTitle" /></h3>
<p><FormattedMessage id="annualReport.missionPeersDescription" /></p>
<img src="/images/annual-report/mission/Peers Illustration.svg" />
</div>
<div className="one-p four-ps-play"> <div className="one-p four-ps-play">
<h3><FormattedMessage id="annualReport.missionPlayTitle" /></h3> <h3><FormattedMessage id="annualReport.missionPlayTitle" /></h3>
<p><FormattedMessage id="annualReport.missionPlayDescription" /></p> <p><FormattedMessage id="annualReport.missionPlayDescription" /></p>
......
...@@ -6,6 +6,7 @@ $base-bg: $ui-white; ...@@ -6,6 +6,7 @@ $base-bg: $ui-white;
#view { #view {
background-color: $ui-white; background-color: $ui-white;
padding: 0; padding: 0;
width: 100%;
} }
h1 { h1 {
...@@ -314,12 +315,13 @@ p { ...@@ -314,12 +315,13 @@ p {
.four-ps { .four-ps {
height: 940px; height: 940px;
display: flex; display: flex;
flex-direction: column; flex-direction: row;
flex-wrap: wrap; flex-wrap: wrap;
align-items: flex-start; align-items: flex-start;
@media #{$intermediate-and-smaller} { @media #{$intermediate-and-smaller} {
height: auto; height: auto;
align-items: center; align-items: center;
justify-content: center;
} }
} }
...@@ -336,10 +338,14 @@ p { ...@@ -336,10 +338,14 @@ p {
font-size: 1.25rem; font-size: 1.25rem;
margin-top: 1.5rem; margin-top: 1.5rem;
} }
@media #{$intermediate-and-smaller} { @media #{$intermediate-and-smaller} {
margin-right: 0;
padding: 0; padding: 0;
} }
@media #{$medium} {
margin-right: 0;
}
} }
.four-ps-projects { .four-ps-projects {
...@@ -354,7 +360,12 @@ p { ...@@ -354,7 +360,12 @@ p {
background-image: url("/images/annual-report/mission/Passion Splash.svg"); background-image: url("/images/annual-report/mission/Passion Splash.svg");
margin-top: 72px; margin-top: 72px;
margin-right: 0; margin-right: 0;
@media #{$intermediate-and-smaller} {
@media #{$intermediate} {
margin-top: 72px;
}
@media #{$medium-and-smaller} {
margin-top: 20px; margin-top: 20px;
} }
} }
...@@ -362,8 +373,13 @@ p { ...@@ -362,8 +373,13 @@ p {
.four-ps-play { .four-ps-play {
background-image: url("/images/annual-report/mission/Play Splash.svg"); background-image: url("/images/annual-report/mission/Play Splash.svg");
margin-right: 0; margin-right: 0;
margin-top: 44px; margin-top: 72px;
@media #{$intermediate-and-smaller} {
@media #{$intermediate} {
margin-top: 72px;
}
@media #{$medium-and-smaller} {
margin-top: 20px; margin-top: 20px;
} }
} }
...@@ -682,15 +698,18 @@ p { ...@@ -682,15 +698,18 @@ p {
.reach-scratch-jr { .reach-scratch-jr {
.scratch-jr-transition-img { .scratch-jr-transition-img {
width: 100%;
margin-bottom: -156px; margin-bottom: -156px;
margin-right: 48px; margin-right: 48px;
display: flex; display: flex;
flex-direction: row-reverse; // flex-direction: row-reverse;
overflow: hidden; overflow: hidden;
@media #{$medium-and-smaller} { justify-content: flex-end;
margin-right: -28px;
} // @media #{$medium-and-smaller} {
// margin-right: -28px;
// }
} }
} }
...@@ -958,7 +977,7 @@ p { ...@@ -958,7 +977,7 @@ p {
@media #{$big} { @media #{$big} {
max-width: 940px; max-width: 940px;
padding: 72px; padding: 72px 0;
} }
@media #{$medium-and-intermediate} { @media #{$medium-and-intermediate} {
...@@ -1392,20 +1411,15 @@ p { ...@@ -1392,20 +1411,15 @@ p {
.hero { .hero {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
}
.hero img { .right {
@media #{$big} { width: 58%;
height: 560px; max-width: 740px;
}
@media #{$intermediate} {
height: 336px;
}
@media #{$medium} {
height: 244px;
} }
@media #{$small} {
height: 156px; .left {
width: 42%;
max-width: 520px;
} }
} }
...@@ -1473,7 +1487,7 @@ p { ...@@ -1473,7 +1487,7 @@ p {
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
align-content: center; align-content: center;
width: 780px; max-width: 780px;
margin-top: 80px; margin-top: 80px;
img { img {
...@@ -1499,7 +1513,7 @@ p { ...@@ -1499,7 +1513,7 @@ p {
} }
.tools-tutorials { .tools-tutorials {
width: 780px; max-width: 780px;
text-align: center; text-align: center;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -1882,6 +1896,12 @@ p { ...@@ -1882,6 +1896,12 @@ p {
} }
} }
@media #{$intermediate} {
.community-moderation, .community-guidelines, .community-engagement {
width: 620px;
}
}
@media #{$intermediate-and-smaller} { @media #{$intermediate-and-smaller} {
.inner { .inner {
max-width: 620px; max-width: 620px;
...@@ -1893,7 +1913,6 @@ p { ...@@ -1893,7 +1913,6 @@ p {
.community-moderation, .community-guidelines, .community-engagement { .community-moderation, .community-guidelines, .community-engagement {
margin: 32px 0; margin: 32px 0;
width: 620px;
text-align: left; text-align: left;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment