From a2c032573f8c45f0a342dcdf9629352d4e6ea225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 29 Oct 2022 14:30:29 +0200 Subject: [PATCH] Rename brand-text mixin to brand-color This is consistent with the `body-colors` mixin and with other mixins we're about to add, like `anchor-color`. --- app/assets/stylesheets/admin.scss | 2 +- .../stylesheets/budgets/ballot/investment.scss | 2 +- .../budgets/groups_and_headings.scss | 2 +- app/assets/stylesheets/dashboard.scss | 8 ++++---- app/assets/stylesheets/layout.scss | 18 +++++++++--------- app/assets/stylesheets/layout/social.scss | 2 +- .../stylesheets/legislation_process.scss | 8 ++++---- app/assets/stylesheets/mixins/colors.scss | 6 +++--- app/assets/stylesheets/pages.scss | 2 +- app/assets/stylesheets/participation.scss | 8 ++++---- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 37bd2f7cd..0eae30b8b 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -633,7 +633,7 @@ code { display: block; &.is-active { - @include brand-text; + @include brand-color; font-weight: bold; text-decoration: underline; } diff --git a/app/assets/stylesheets/budgets/ballot/investment.scss b/app/assets/stylesheets/budgets/ballot/investment.scss index 19c490bdf..1685f7eb5 100644 --- a/app/assets/stylesheets/budgets/ballot/investment.scss +++ b/app/assets/stylesheets/budgets/ballot/investment.scss @@ -20,7 +20,7 @@ } .ballot-list-price { - @include brand-text; + @include brand-color; display: block; font-weight: bold; margin-top: $line-height / 2; diff --git a/app/assets/stylesheets/budgets/groups_and_headings.scss b/app/assets/stylesheets/budgets/groups_and_headings.scss index ba0cd030e..6372debb0 100644 --- a/app/assets/stylesheets/budgets/groups_and_headings.scss +++ b/app/assets/stylesheets/budgets/groups_and_headings.scss @@ -8,7 +8,7 @@ } .heading { - @include brand-text; + @include brand-color; border: 2px solid $border; border-radius: rem-calc(6); box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.1); diff --git a/app/assets/stylesheets/dashboard.scss b/app/assets/stylesheets/dashboard.scss index a42f5047a..33b05414d 100644 --- a/app/assets/stylesheets/dashboard.scss +++ b/app/assets/stylesheets/dashboard.scss @@ -332,7 +332,7 @@ } .is-active { - @include brand-text; + @include brand-color; position: relative; &::before { @@ -347,11 +347,11 @@ } a { - @include brand-text; + @include brand-color; } [class^="icon-"] { - @include brand-text; + @include brand-color; } } @@ -365,7 +365,7 @@ border-bottom: 2px solid; .has-tip { - @include brand-text; + @include brand-color; font-weight: bold; } } diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index fd81a2c16..2933e1550 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -260,7 +260,7 @@ button, } &.is-active { - @include brand-text; + @include brand-color; border-bottom: 2px solid; padding-bottom: rem-calc(1); } @@ -287,7 +287,7 @@ button, padding: 0; &.is-active { - @include brand-text; + @include brand-color; font-weight: bold; } } @@ -297,7 +297,7 @@ button, } &.is-active { - @include brand-text; + @include brand-color; border-bottom: 2px solid; } } @@ -359,14 +359,14 @@ button, position: relative; &:hover { - @include brand-text; + @include brand-color; background: none; text-decoration: none; } &[aria-selected="true"], &.is-active { - @include brand-text; + @include brand-color; border-bottom: 0; font-weight: bold; @@ -519,7 +519,7 @@ body > header, padding: rem-calc(6); [type="submit"] { - @include brand-text; + @include brand-color; background: none; border: 0; cursor: pointer; @@ -599,7 +599,7 @@ body > header, text-align: left; @include breakpoint(medium) { - @include brand-text; + @include brand-color; background: $body-background; text-align: center; } @@ -774,7 +774,7 @@ body > header, } &.is-active { - @include brand-text; + @include brand-color; border-bottom: 2px solid; margin-bottom: 1px; } @@ -846,7 +846,7 @@ body > header, } .is-active { - @include brand-text; + @include brand-color; border-bottom: 2px solid; &:hover { diff --git a/app/assets/stylesheets/layout/social.scss b/app/assets/stylesheets/layout/social.scss index 5590d633e..69f44a5d2 100644 --- a/app/assets/stylesheets/layout/social.scss +++ b/app/assets/stylesheets/layout/social.scss @@ -20,7 +20,7 @@ text-decoration: none; &:hover { - @include brand-text; + @include brand-color; } } } diff --git a/app/assets/stylesheets/legislation_process.scss b/app/assets/stylesheets/legislation_process.scss index 2592c59e3..44a199688 100644 --- a/app/assets/stylesheets/legislation_process.scss +++ b/app/assets/stylesheets/legislation_process.scss @@ -134,7 +134,7 @@ margin-bottom: rem-calc(40); .debate-type { - @include brand-text; + @include brand-color; text-transform: uppercase; font-weight: 700; font-size: $small-font-size; @@ -145,7 +145,7 @@ } .debate-title a { - @include brand-text; + @include brand-color; } } @@ -194,7 +194,7 @@ } h4 a { - @include brand-text; + @include brand-color; &:hover { text-decoration: none; @@ -211,7 +211,7 @@ } .quiz-next { - @include brand-text; + @include brand-color; background: #ccdbe5; font-size: $small-font-size; font-weight: bold; diff --git a/app/assets/stylesheets/mixins/colors.scss b/app/assets/stylesheets/mixins/colors.scss index c7811bbbf..2771e05ed 100644 --- a/app/assets/stylesheets/mixins/colors.scss +++ b/app/assets/stylesheets/mixins/colors.scss @@ -11,7 +11,7 @@ @include background-with-text-contrast($brand); } -@mixin brand-text { +@mixin brand-color { @include normal-selection; color: $brand; } @@ -43,8 +43,8 @@ @include brand-background; } -%brand-text { - @include brand-text; +%brand-color { + @include brand-color; } %body-colors { diff --git a/app/assets/stylesheets/pages.scss b/app/assets/stylesheets/pages.scss index c279698cf..27a09576b 100644 --- a/app/assets/stylesheets/pages.scss +++ b/app/assets/stylesheets/pages.scss @@ -57,7 +57,7 @@ .more-info-content { h3 { - @include brand-text; + @include brand-color; } .additional-info { diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index a388687be..94dbead22 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -830,7 +830,7 @@ } .is-active { - @include brand-text; + @include brand-color; &::after { content: "\6c"; @@ -1082,7 +1082,7 @@ } .current-phase { - @include brand-text; + @include brand-color; } .progress-votes { @@ -1119,7 +1119,7 @@ } span { - @include brand-text; + @include brand-color; font-size: $base-font-size; } } @@ -1144,7 +1144,7 @@ } span { - @include brand-text; + @include brand-color; font-size: rem-calc(24); } }