From 7f42a0e4c2f88c3c2ba793b89d7b62547052f3e4 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Wed, 23 Mar 2016 16:33:21 -0400 Subject: [PATCH] Fix collapsing floats --- _includes/comments.html | 24 +++++++++++++----------- assets/_scss/_page.scss | 14 ++++++++++++++ 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/_includes/comments.html b/_includes/comments.html index 66536d25..0e33033e 100644 --- a/_includes/comments.html +++ b/_includes/comments.html @@ -1,11 +1,13 @@ -

{{ site.data.ui-text[site.locale].comments_label }}

-{% case site.comments.provider %} -{% when "disqus" %} -
-{% when "facebook" %} -
-{% when "google-plus" %} -
Loading Google+ Comments ...
-{% when "custom" %} -
-{% endcase %} \ No newline at end of file +
+

{{ site.data.ui-text[site.locale].comments_label }}

+ {% case site.comments.provider %} + {% when "disqus" %} +
+ {% when "facebook" %} +
+ {% when "google-plus" %} +
Loading Google+ Comments ...
+ {% when "custom" %} +
+ {% endcase %} +
\ No newline at end of file diff --git a/assets/_scss/_page.scss b/assets/_scss/_page.scss index 581bd7cf..e2349eda 100644 --- a/assets/_scss/_page.scss +++ b/assets/_scss/_page.scss @@ -35,6 +35,15 @@ @include prefix(0.5 of 12); padding-right: $right-sidebar-width-wide; } + + .page__inner-wrap { + .page__content, + .page__meta, + .page__share { + @include clearfix(); + @include full(); + } + } } .page__title { @@ -161,6 +170,11 @@ Comments ========================================================================== */ +.page__comments { + @include clearfix(); + @include full(); +} + .page__comments-title { font-size: 14px; margin-top: 2rem;