Permalink
Browse files

Merge branch 'master' of github.com:thethemefoundry/twentytwelve

  • Loading branch information...
lancewillett committed Mar 20, 2012
2 parents b2ac4b7 + 2623761 commit d0adc7ac8a20a6eae9048334a5460137141af4f2
Showing with 8 additions and 4 deletions.
  1. +7 −2 source/assets/stylesheets/_scaffolding.scss
  2. +1 −2 source/templates/footer.php
@@ -29,14 +29,20 @@ a {
Page structure
------------------------------------------------------------ */
#page {
- @include rem('padding', 0 40px);
+ @include rem('padding', 0 $vbase);
background-color: #fff;
@media screen and (min-width: 600px) {
@include clear();
margin: 0 auto;
@include rem('max-width', 960px)
}
}
+body.custom-background #page {
+ @include rem('padding', 0 40px);
+ @include rem('margin-top', $vbase2);
+ @include rem('margin-bottom', $vbase2);
+ @include box-shadow(0 2px 6px rgba( 100, 100, 100, .3));
+}
#primary {
@include rem('margin', $vbase 0);
@media screen and (min-width: 600px) {
@@ -219,7 +225,6 @@ footer[role="contentinfo"] {
@include clear();
@include rem('max-width', 960px);
@include rem('margin-top', $vbase2);
- @include rem('margin-bottom', $vbase2);
margin-left: auto;
margin-right: auto;
@include rem('padding', $vbase 0);
@@ -10,14 +10,13 @@
*/
?>
</div><!-- #main -->
-</div><!-- #page -->
-
<footer id="colophon" role="contentinfo">
<div class="site-info">
<?php do_action( 'twentytwelve_credits' ); ?>
<a href="<?php echo esc_url( __( 'http://wordpress.org/', 'twentytwelve' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentytwelve' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s', 'twentytwelve' ), 'WordPress' ); ?></a>
</div><!-- .site-info -->
</footer><!-- #colophon -->
+</div><!-- #page -->
<?php wp_footer(); ?>
</body>

0 comments on commit d0adc7a

Please sign in to comment.