From b96d745e0edb852f16c59d8e6e5b049186b092a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sun, 9 Oct 2022 22:21:51 +0200 Subject: [PATCH] Use $body-font-color instead of $text This is consistent with the usage of `$body-background`. This way Foundation elements using `$body-font-color`, like the `` tag, will be changed when changing this variable, which wouldn't happen when using `$text`. --- app/assets/stylesheets/_consul_settings.scss | 5 ++--- app/assets/stylesheets/admin.scss | 2 +- app/assets/stylesheets/layout.scss | 2 +- app/assets/stylesheets/mixins/colors.scss | 2 +- app/assets/stylesheets/participation.scss | 6 +++--- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/_consul_settings.scss b/app/assets/stylesheets/_consul_settings.scss index 3fb21ba36..b32848839 100644 --- a/app/assets/stylesheets/_consul_settings.scss +++ b/app/assets/stylesheets/_consul_settings.scss @@ -16,6 +16,8 @@ $white: #fdfdfd !default; $body-font-family: "Source Sans Pro", "Helvetica", "Arial", sans-serif !important !default; +$closebutton-color: $black !default; + $global-radius: rem-calc(3) !default; $global-width: rem-calc(1200) !default; @@ -64,7 +66,6 @@ $brand: #004a83 !default; $brand-secondary: darken($brand, 10%) !default; $dark: $brand-secondary !default; -$text: $black !default; $text-medium: #515151 !default; $text-light: #bfbfbf !default; @@ -154,8 +155,6 @@ $tab-item-font-size: $base-font-size !default; $tab-item-padding: $line-height / 2 0 !default; $tab-content-border: $border !default; -$closebutton-color: $text !default; - $tooltip-background-color: $brand !default; // 4. Foundation fixes diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 01a7d0dcc..37bd2f7cd 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -515,7 +515,7 @@ code { } .number { - color: $text; + color: $body-font-color; font-size: rem-calc(30); font-weight: bold; } diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 8193cd87e..e29345fcf 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -2439,7 +2439,7 @@ table { p { &.description { - color: $text; + color: $body-font-color; word-wrap: break-word; } } diff --git a/app/assets/stylesheets/mixins/colors.scss b/app/assets/stylesheets/mixins/colors.scss index 6bd835fb8..35bdb211c 100644 --- a/app/assets/stylesheets/mixins/colors.scss +++ b/app/assets/stylesheets/mixins/colors.scss @@ -18,7 +18,7 @@ @mixin body-colors { background-color: $body-background; - color: $text; + color: $body-font-color; } @mixin normal-selection { diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index d7833a58a..3d1507b1a 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -326,7 +326,7 @@ } .bullet { - color: $text; + color: $body-font-color; } .budget-investment-show p { @@ -893,7 +893,7 @@ a, .info { - color: lighten($text, 15%); + color: lighten($body-font-color, 15%); font-size: $small-font-size; } } @@ -926,7 +926,7 @@ } .button-support { - background: $text; + background: $body-font-color; color: $featured; margin-top: 0;