From f00cb631bc6570fa6126816c30d36135854de23a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Mon, 5 Jul 2021 23:36:03 +0200 Subject: [PATCH] Remove all grid-row Sass rules We were using these rules in order to set the maximum width of an element to `$global-width`. However, since we now do so in the element, there's no need to apply these rules to "rows". Note we're adding `overflow: hidden` to the budget subheader. That's because it only contains `float` element inside, and we're now missing the `.row::before` and `.row::after` rules which make sure float elements are rendered properly. --- app/assets/stylesheets/budgets/investments-list.scss | 3 ++- app/assets/stylesheets/budgets/investments/new.scss | 1 - app/assets/stylesheets/budgets/subheader.scss | 2 +- app/assets/stylesheets/layout.scss | 1 - app/assets/stylesheets/legislation_process.scss | 1 - app/assets/stylesheets/sdg/goals/index.scss | 6 +++--- app/assets/stylesheets/sdg/goals/show.scss | 1 - 7 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/budgets/investments-list.scss b/app/assets/stylesheets/budgets/investments-list.scss index 5d19f4a45..ba53a02c5 100644 --- a/app/assets/stylesheets/budgets/investments-list.scss +++ b/app/assets/stylesheets/budgets/investments-list.scss @@ -1,5 +1,6 @@ .investments-list { - @include flex-grid-row; + display: flex; + flex-wrap: wrap; margin-top: $line-height; > header { diff --git a/app/assets/stylesheets/budgets/investments/new.scss b/app/assets/stylesheets/budgets/investments/new.scss index 82e16744a..bda89bd63 100644 --- a/app/assets/stylesheets/budgets/investments/new.scss +++ b/app/assets/stylesheets/budgets/investments/new.scss @@ -2,7 +2,6 @@ $border-width: 4px; > * { - @include grid-row; @include grid-column-gutter; } diff --git a/app/assets/stylesheets/budgets/subheader.scss b/app/assets/stylesheets/budgets/subheader.scss index ba51bd3bc..ee27b48f2 100644 --- a/app/assets/stylesheets/budgets/subheader.scss +++ b/app/assets/stylesheets/budgets/subheader.scss @@ -1,7 +1,7 @@ .budget-subheader { - @include grid-row; margin-bottom: $line-height; margin-top: $line-height; + overflow: hidden; .current-phase { text-transform: uppercase; diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index c857d782b..1cfc13007 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -2068,7 +2068,6 @@ table { } a > * { - @include grid-row; padding: 0 rem-calc(16); &:empty { diff --git a/app/assets/stylesheets/legislation_process.scss b/app/assets/stylesheets/legislation_process.scss index b911a8c7b..a52e6c362 100644 --- a/app/assets/stylesheets/legislation_process.scss +++ b/app/assets/stylesheets/legislation_process.scss @@ -966,7 +966,6 @@ .process-summary { > section { - @include grid-row; margin-top: $line-height * 1.5; padding: 0 rem-calc(16); } diff --git a/app/assets/stylesheets/sdg/goals/index.scss b/app/assets/stylesheets/sdg/goals/index.scss index 5c0ea1553..96571a148 100644 --- a/app/assets/stylesheets/sdg/goals/index.scss +++ b/app/assets/stylesheets/sdg/goals/index.scss @@ -3,13 +3,13 @@ .section-header { h1 { - @include grid-row; @include grid-column-gutter; &::before { @extend %font-icon; background: image-url("sdg.svg"); + content: ""; display: inline-block; height: 1.5em; width: 1.5em; @@ -21,9 +21,10 @@ $spacing: 1.5%; @include sdg-goal-list($spacing); - @include grid-row; @include grid-column-gutter; + margin-left: auto; + margin-right: auto; max-width: 60rem; width: 100%; @@ -40,7 +41,6 @@ } .sdg-phase { - @include grid-row; @include grid-column-gutter; .cards-container { diff --git a/app/assets/stylesheets/sdg/goals/show.scss b/app/assets/stylesheets/sdg/goals/show.scss index 3e266bfb5..3501730c2 100644 --- a/app/assets/stylesheets/sdg/goals/show.scss +++ b/app/assets/stylesheets/sdg/goals/show.scss @@ -1,5 +1,4 @@ .sdg-goal-show { - @include grid-row; > :not(.feeds-participation) { @include grid-column-gutter;