Skip to content

Commit

Permalink
undo some css rules
Browse files Browse the repository at this point in the history
  • Loading branch information
mmmavis committed May 28, 2015
1 parent 26068a0 commit 57b7799
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 45 deletions.
2 changes: 1 addition & 1 deletion components/hero-unit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var HeroUnit = React.createClass({
}

return (
<div className="row hero-unit-row">
<div className="row">
<div className="col-md-12 hero-unit" style={{
backgroundImage: 'url(' + this.state.image + ')'
}}>
Expand Down
9 changes: 2 additions & 7 deletions less/common.less
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ main {
}

section {
padding: 1.5rem;
padding: 1.5rem 0;
@media screen and (min-width: @screen-md-min) {
padding: 2.5rem;
padding: 2.5rem 0;
}
}

Expand Down Expand Up @@ -125,11 +125,6 @@ html.no-js .no-js-warning {
border-top: 0.2rem solid @white;
}

#content {
padding-left: 0;
padding-right: 0;
}

.video-container {
position: relative;
width: 100%;
Expand Down
5 changes: 0 additions & 5 deletions less/components/hero-unit.less
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
.hero-unit-row {
margin-left: 0;
margin-right: 0;
}

.hero-unit {
background-position: right top;
background-repeat: no-repeat;
Expand Down
2 changes: 0 additions & 2 deletions less/components/page.less
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,12 @@ a.skip-to-content:focus {
@media screen and (min-width: @screen-md-min) {
margin: 0px 0px 0px 2.5rem;
max-width: 1200px;
padding: 0 (@grid-gutter-width / 2);
}
@media screen and (min-width: 1800px) {
margin: 0 auto;
}

.intro {
padding: 0 2.5rem;
h1 {
margin-bottom: 3rem;
}
Expand Down
3 changes: 3 additions & 0 deletions less/pages/home.less
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,8 @@

.quote {
background: @paleBlue;
margin-left: -(@grid-gutter-width / 2);
margin-right: -(@grid-gutter-width / 2);
padding-left: (@grid-gutter-width / 2);
}

56 changes: 26 additions & 30 deletions pages/home.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -179,39 +179,35 @@ var HomePage = React.createClass({
</section>
</div>
<div className="quote">
<div className="inner-container">
<section>
<CaseStudies/>
</section>
</div>
</div>
<div className="inner-container">
<section>
<IconLinks>
<IconLink
href={config.TWITTER_LINK}
imgSrc="/img/pages/about/svg/icon-twitter-blue.svg"
imgAlt=""
head="Follow Us"
subhead="Start a conversation on Twitter"
/>
<IconLink
href="mailto:[email protected]"
imgSrc="/img/pages/about/svg/icon-get-help-blue.svg"
imgAlt=""
head="Get Help"
subhead="Email us anytime"
/>
<IconLink
href="http://discourse.webmaker.org/category/meet"
imgSrc="/img/pages/about/svg/icon-connect-blue.svg"
imgAlt=""
head="Say Hello"
subhead="Connect on the Discourse forum"
/>
</IconLinks>
<CaseStudies/>
</section>
</div>
<section>
<IconLinks>
<IconLink
href={config.TWITTER_LINK}
imgSrc="/img/pages/about/svg/icon-twitter-blue.svg"
imgAlt=""
head="Follow Us"
subhead="Start a conversation on Twitter"
/>
<IconLink
href="mailto:[email protected]"
imgSrc="/img/pages/about/svg/icon-get-help-blue.svg"
imgAlt=""
head="Get Help"
subhead="Email us anytime"
/>
<IconLink
href="http://discourse.webmaker.org/category/meet"
imgSrc="/img/pages/about/svg/icon-connect-blue.svg"
imgAlt=""
head="Say Hello"
subhead="Connect on the Discourse forum"
/>
</IconLinks>
</section>
</div>
);
}
Expand Down

0 comments on commit 57b7799

Please sign in to comment.