From 54988561abba0ffdb44cc0baf0c2042ba9770b18 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Tue, 31 May 2016 09:09:43 +0100 Subject: Consolidate CSS clearfix handling. Remove duplicate/alternate definitions, and settle on the name clearfix. --- templates/web/base/report/_main.html | 2 +- templates/web/base/report/update-form.html | 2 +- templates/web/bromley/header_logo.html | 2 +- templates/web/zurich/admin/report_edit-sdm.html | 2 +- templates/web/zurich/report/_main.html | 2 +- web/cobrands/eastsussex/layout.scss | 7 ------- web/cobrands/fixmystreet.com/base.scss | 6 +++--- web/cobrands/greenwich/layout.scss | 7 ------- web/cobrands/hart/hart.scss | 8 -------- web/cobrands/sass/_dropzone.scss | 2 +- web/cobrands/sass/_h5bp.scss | 8 +++----- web/cobrands/sass/_mixins.scss | 14 +++----------- 12 files changed, 15 insertions(+), 47 deletions(-) diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html index c079b9ebd..aaa167108 100644 --- a/templates/web/base/report/_main.html +++ b/templates/web/base/report/_main.html @@ -1,6 +1,6 @@ [% moderating = c.user && c.user.has_permission_to('moderate', problem.bodies_str) %] -
+
[% IF moderating %] [% original = problem_original %] diff --git a/templates/web/base/report/update-form.html b/templates/web/base/report/update-form.html index 29529e5a1..f6ce265bf 100644 --- a/templates/web/base/report/update-form.html +++ b/templates/web/base/report/update-form.html @@ -21,7 +21,7 @@ [% END %] [% IF c.user_exists %] [% INCLUDE 'report/update/form_name.html' %] -
+
[% ELSIF oauth_need_email %] [% INCLUDE 'report/update/form_user_loggedout_email.html' required = 1 %]
diff --git a/templates/web/bromley/header_logo.html b/templates/web/bromley/header_logo.html index 92ff771f9..8c49d9145 100644 --- a/templates/web/bromley/header_logo.html +++ b/templates/web/bromley/header_logo.html @@ -1,4 +1,4 @@ -
+
    diff --git a/templates/web/zurich/admin/report_edit-sdm.html b/templates/web/zurich/admin/report_edit-sdm.html index a0ff1038d..63c6b5e6f 100644 --- a/templates/web/zurich/admin/report_edit-sdm.html +++ b/templates/web/zurich/admin/report_edit-sdm.html @@ -133,7 +133,7 @@

    -

    +

    diff --git a/templates/web/zurich/report/_main.html b/templates/web/zurich/report/_main.html index d80eeb9a4..34aa71590 100644 --- a/templates/web/zurich/report/_main.html +++ b/templates/web/zurich/report/_main.html @@ -1,4 +1,4 @@ -
    +

    [% tprintf( loc('Reported in the %s category'), problem.category ) %]

    [% prettify_dt( problem.created, 'zurich' ) %] diff --git a/web/cobrands/eastsussex/layout.scss b/web/cobrands/eastsussex/layout.scss index d90a617f1..20be807a6 100644 --- a/web/cobrands/eastsussex/layout.scss +++ b/web/cobrands/eastsussex/layout.scss @@ -1,13 +1,6 @@ @import "_colours";; @import "../sass/layout"; -/* from http://nicolasgallagher.com/micro-clearfix-hack/ */ -.clearfix:before, -.clearfix:after { content: " "; display: table; } -.clearfix:after { clear: both; } -/* For IE 6/7 only */ -.clearfix { *zoom: 1; } - #front-main { // Undo the top margin added in base.scss margin-top: 0; diff --git a/web/cobrands/fixmystreet.com/base.scss b/web/cobrands/fixmystreet.com/base.scss index 8e52bc853..366ebc451 100644 --- a/web/cobrands/fixmystreet.com/base.scss +++ b/web/cobrands/fixmystreet.com/base.scss @@ -73,7 +73,7 @@ } .next-steps__step__cta { - @include pie-clearfix; + @include clearfix; padding-top: 0.4em; // extra padding between buttons and previous paragraph a { @@ -97,7 +97,7 @@ } .next-steps__step--goodies { - @include pie-clearfix; + @include clearfix; .goodies-preview { float: $right; @@ -286,7 +286,7 @@ $grid-breakpoint-sm: $mysoc-footer-breakpoint-sm; } .row { - @include clearfix(); + @include clearfix; margin-left: $grid-gutter / -2; margin-right: $grid-gutter / -2; } diff --git a/web/cobrands/greenwich/layout.scss b/web/cobrands/greenwich/layout.scss index eff3f854e..a60313de3 100644 --- a/web/cobrands/greenwich/layout.scss +++ b/web/cobrands/greenwich/layout.scss @@ -5,13 +5,6 @@ $fixed_page_width: 990px; -/* from http://nicolasgallagher.com/micro-clearfix-hack/ */ -.clearfix:before, .clearfix:after { content: " "; display: table; } -.clearfix:after { clear: both; } -/* For IE 6/7 only */ -.clearfix { *zoom: 1; } - - #site-logo, .ie6 #site-logo, body.frontpage #site-logo, diff --git a/web/cobrands/hart/hart.scss b/web/cobrands/hart/hart.scss index e7f80d14b..ac833934d 100644 --- a/web/cobrands/hart/hart.scss +++ b/web/cobrands/hart/hart.scss @@ -7,14 +7,6 @@ @import "../sass/mixins"; @import "_colours"; -/* from http://nicolasgallagher.com/micro-clearfix-hack/ */ -.clearfix:before, -.clearfix:after { content: " "; display: table; } -.clearfix:after { clear: both; } -/* For IE 6/7 only */ -.clearfix { *zoom: 1; } - - // Taken from Bromley's form css input[type=text], input[type=password], diff --git a/web/cobrands/sass/_dropzone.scss b/web/cobrands/sass/_dropzone.scss index 8c482d0cf..3e5fc8058 100644 --- a/web/cobrands/sass/_dropzone.scss +++ b/web/cobrands/sass/_dropzone.scss @@ -9,7 +9,7 @@ $dropzone-background-color--awakened: mix($dropzone-link-color, $dropzone-backgr $dropzone-background-color--full: mix($dropzone-border-color--full, $dropzone-background-color, 10%); .dropzone { - @include clearfix(); + @include clearfix; border: 0.125em solid $dropzone-border-color; background-color: $dropzone-background-color; border-radius: $dropzone-border-radius; diff --git a/web/cobrands/sass/_h5bp.scss b/web/cobrands/sass/_h5bp.scss index f2074532c..b41effa1b 100644 --- a/web/cobrands/sass/_h5bp.scss +++ b/web/cobrands/sass/_h5bp.scss @@ -247,11 +247,9 @@ td { vertical-align: top; } .invisible { visibility: hidden; } /* Contain floats: h5bp.com/q */ -/* mySociety change: rename to cf */ -.cf:before, .cf:after { content: ""; display: table; } -.cf:after { clear: both; } -.cf { *zoom: 1; } - +.clearfix:before, .clearfix:after { content: " "; display: table; } +.clearfix:after { clear: both; } +.clearfix { *zoom: 1; } /* ==|== print styles ======================================================= diff --git a/web/cobrands/sass/_mixins.scss b/web/cobrands/sass/_mixins.scss index 294b69c8a..71f9b95a3 100644 --- a/web/cobrands/sass/_mixins.scss +++ b/web/cobrands/sass/_mixins.scss @@ -92,17 +92,9 @@ $right: right; } @mixin clearfix { - overflow: hidden; - *zoom: 1; -} - -@mixin pie-clearfix { - &:after { - content: ""; - display: table; - clear: both; - } - *zoom: 1; + &:before, &:after { content: " "; display: table; } + &:after { clear: both; } + & { *zoom: 1; } } @mixin linear-gradient($stops...) { -- cgit v1.2.3