From 8564113b9c7c35ce20606282a5a74499176449e9 Mon Sep 17 00:00:00 2001 From: David Furnes Date: Thu, 29 Jan 2015 11:42:04 -0500 Subject: [PATCH 1/2] Rename container__body to container__block. --- scss/_regions/_container.scss | 6 +++--- styleguide/index.erb | 4 ++-- styleguide/inventory.erb | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scss/_regions/_container.scss b/scss/_regions/_container.scss index 891dfebe..93225730 100644 --- a/scss/_regions/_container.scss +++ b/scss/_regions/_container.scss @@ -1,5 +1,5 @@ // Standard container for centered 12-column layouts. Collapses to full-width on mobile. -// Modifier classes can be applied to the required `container__body` to use different +// Modifier classes can be applied to the required `container__block` to use different // preset layouts. Optionally, the `container__row` class can be used to align into rows. // // Apply `.-padded` modifier to add extra bottom padding to a container. @@ -24,7 +24,7 @@ @include push(2); } - .container__body { + .container__block { // When inside a container wrapper, increase top/bottom padding // on the container body. padding: $base-spacing gutters(); @@ -50,7 +50,7 @@ // Use container body for all container content, with optional modifiers // to span either half or three-quarters width. - .container__body { + .container__block { padding: gutters(); } } diff --git a/styleguide/index.erb b/styleguide/index.erb index 3bdda003..5c3972c2 100644 --- a/styleguide/index.erb +++ b/styleguide/index.erb @@ -656,11 +656,11 @@ <% styleguide_block 'Container' do %>
-
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse dapibus condimentum aliquet. Maecenas suscipit commodo dui, eu venenatis nisl volutpat vitae.

-
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse dapibus condimentum aliquet. Maecenas suscipit commodo dui, eu venenatis nisl volutpat vitae.

diff --git a/styleguide/inventory.erb b/styleguide/inventory.erb index c324b016..f4a21932 100644 --- a/styleguide/inventory.erb +++ b/styleguide/inventory.erb @@ -1,7 +1,7 @@
-
+

Styleguide Inventory

This is Neue, our interface framework and pattern library. It defines a set of base styles and common patterns shared throughout our website. It's a strong foundation for building beautiful interfaces.

@@ -19,7 +19,7 @@
-
+

Heading Beta

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum eleifend faucibus rutrum. Cras congue tortor nec velit rutrum pharetra in porta dui. Aliquam sit amet enim aliquet orci lobortis scelerisque non quis urna. Nam rutrum, erat vel aliquet auctor, justo nulla bibendum purus, mollis venenatis lectus nisi nec lacus. Fusce et augue convallis, laoreet libero sed, aliquam turpis. Donec volutpat sed ex vel consequat. Aliquam dictum lectus a elit sagittis, non venenatis leo imperdiet. Phasellus nibh sapien, interdum ultricies euismod ut, rutrum non purus.

@@ -37,7 +37,7 @@
-
+

Heading Beta

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum eleifend faucibus rutrum. Cras congue tortor nec velit rutrum pharetra in porta dui. Aliquam sit amet enim aliquet orci lobortis scelerisque non quis urna. Nam rutrum, erat vel aliquet auctor, justo nulla bibendum purus, mollis venenatis lectus nisi nec lacus. Fusce et augue convallis, laoreet libero sed, aliquam turpis. Donec volutpat sed ex vel consequat. Aliquam dictum lectus a elit sagittis, non venenatis leo imperdiet. Phasellus nibh sapien, interdum ultricies euismod ut, rutrum non purus.

@@ -47,19 +47,19 @@

Step 1: Know It

-
+

Cats and dogs are popular pets in the U.S.

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum eleifend faucibus rutrum. Cras congue tortor nec velit rutrum pharetra in porta dui.

-
+
-
+
  • @@ -174,7 +174,7 @@
    -
    +

    Facts About Animals

    • Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum eleifend faucibus rutrum.
      • @@ -197,7 +197,7 @@

      Step 4: Prove It

      -
      +

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum eleifend faucibus rutrum. Cras congue tortor nec velit rutrum pharetra in porta dui. Aliquam sit amet enim aliquet orci lobortis scelerisque non quis urna. Nam rutrum, erat vel aliquet auctor, justo nulla bibendum purus, mollis venenatis lectus nisi nec lacus. Fusce et augue convallis, laoreet libero sed, aliquam turpis. Donec volutpat sed ex vel consequat. Aliquam dictum lectus a elit sagittis, non venenatis leo imperdiet. Phasellus nibh sapien, interdum ultricies euismod ut, rutrum non purus.

      From 6893295b20d8f8c586bf84ca357c3b2c34179cbc Mon Sep 17 00:00:00 2001 From: David Furnes Date: Thu, 29 Jan 2015 11:43:00 -0500 Subject: [PATCH 2/2] Add clearfix to container block. This fixes issues with the container collapsing with floated content & losing correct padding. References DoSomething/dosomething#3838. --- scss/_regions/_container.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/_regions/_container.scss b/scss/_regions/_container.scss index 93225730..6d968930 100644 --- a/scss/_regions/_container.scss +++ b/scss/_regions/_container.scss @@ -51,6 +51,7 @@ // Use container body for all container content, with optional modifiers // to span either half or three-quarters width. .container__block { + @include clearfix; padding: gutters(); } }