Set top margin only on the body element

Błażej Pankowiak · Błażej Pankowiak · commit 255b8c02a2a3 · 2014-08-07T00:15:17.000+02:00
diff --git a/app/assets/stylesheets/conversations.css.scss b/app/assets/stylesheets/conversations.css.scss
@@ -1,6 +1,4 @@
 .conversations_container {
-  padding-top: 40px;
-
   .stream_element {
     border-bottom: 1px solid $border-grey;
     &:first-child {
diff --git a/app/assets/stylesheets/getting-started.css.scss b/app/assets/stylesheets/getting-started.css.scss
@@ -13,7 +13,7 @@
   }
 
   .hero-unit {
-    margin: 58px 42px;
+    margin: 20px 42px;
     padding: 40px 80px;
   }
 
diff --git a/app/assets/stylesheets/header.css.scss b/app/assets/stylesheets/header.css.scss
@@ -3,8 +3,6 @@
   border-bottom: none;
 }
 
-body > #container { margin-top: 50px; } /* to avoid being hidden under the header in the SPV */
-
 body > header {
   @include box-shadow(0,1px,3px,rgba(0,0,0,0.9));
   background: url('header-bg.png') rgb(40,35,35);
diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss
@@ -5,6 +5,7 @@ body {
 }
 
 body {
+  margin-top: 40px;
   padding : none;
 
   &.lock {
@@ -146,12 +147,6 @@ $bring-dark-accent-forward-color: #DDD;
   }
 }
 
-/* padder helper to push content below the header, to be removed when porting to bootstrap is complete */
-.bootstrap_header_padding {
-  padding-top: 40px;
-}
-
-
 #back-to-top {
   display: block;
   color: white;
diff --git a/app/assets/stylesheets/new_styles/_registration.scss b/app/assets/stylesheets/new_styles/_registration.scss
@@ -4,8 +4,6 @@
   min-height: 100%;
   background-color : #afc652;
   color: #fff;
-  
-  .container { margin-top: 50px; }
 
   #create-something-text {
     font-family : Roboto-Light;
diff --git a/app/assets/stylesheets/notifications.css.scss b/app/assets/stylesheets/notifications.css.scss
@@ -1,6 +1,4 @@
 #notifications_container {
-  padding-top: 50px;
-
   .nav.nav-tabs{
     li > a {
       color: $text-dark-grey;
diff --git a/app/assets/templates/help_tpl.jst.hbs b/app/assets/templates/help_tpl.jst.hbs
@@ -1,6 +1,3 @@
-
-<div class="bootstrap_header_padding"></div>
-
 <div class="container">
 
   <div id="section_header">
@@ -78,4 +75,4 @@
     <div class="span9 last" id=faq>
     </div>
   </div>
-</div>
+</div>
diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml
@@ -9,8 +9,6 @@
   = javascript_include_tag :people
   = javascript_include_tag 'contact-list'
 
-.bootstrap_header_padding
-
 .container-fluid#people_search
   .row-fluid
     .page-header
diff --git a/app/views/posts/show.html.haml b/app/views/posts/show.html.haml
@@ -6,4 +6,4 @@
   = post_page_title @post
 
 - content_for :content do
-  #container
+  #container.container-fluid

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`.hero-unit {`
`16`		`- margin: 58px 42px;`
	`16`	`+ margin: 20px 42px;`
`17`	`17`	`padding: 40px 80px;`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`border-bottom: none;`
`4`	`4`	`}`
`5`	`5`
`6`		`-body > #container { margin-top: 50px; } /* to avoid being hidden under the header in the SPV */`
`7`		`-`
`8`	`6`	`body > header {`
`9`	`7`	`@include box-shadow(0,1px,3px,rgba(0,0,0,0.9));`
`10`	`8`	`background: url('header-bg.png') rgb(40,35,35);`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ body {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`body {`
	`8`	`+ margin-top: 40px;`
`8`	`9`	`padding : none;`
`9`	`10`
`10`	`11`	`&.lock {`
`@@ -146,12 +147,6 @@ $bring-dark-accent-forward-color: #DDD;`
`146`	`147`	`}`
`147`	`148`	`}`
`148`	`149`
`149`		`-/* padder helper to push content below the header, to be removed when porting to bootstrap is complete */`
`150`		`-.bootstrap_header_padding {`
`151`		`- padding-top: 40px;`
`152`		`-}`
`153`		`-`
`154`		`-`
`155`	`150`	`#back-to-top {`
`156`	`151`	`display: block;`
`157`	`152`	`color: white;`