From 47580ff9ba0faa7fca7ed69b8219e9bcda17d922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20D=C3=A9ramond?= Date: Wed, 11 Jan 2023 15:36:00 +0100 Subject: [PATCH] Drop duplicate `--bs-body-bg-rgb` declaration + reorder props --- scss/_root.scss | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/scss/_root.scss b/scss/_root.scss index 901a6a84da..a0efc0e656 100644 --- a/scss/_root.scss +++ b/scss/_root.scss @@ -36,8 +36,6 @@ --#{$prefix}white-rgb: #{to-rgb($white)}; --#{$prefix}black-rgb: #{to-rgb($black)}; - --#{$prefix}body-color-rgb: #{to-rgb($body-color)}; - --#{$prefix}body-bg-rgb: #{to-rgb($body-bg)}; // Fonts @@ -56,7 +54,14 @@ @include rfs($font-size-base, --#{$prefix}body-font-size); --#{$prefix}body-font-weight: #{$font-weight-base}; --#{$prefix}body-line-height: #{$line-height-base}; + @if $body-text-align != null { + --#{$prefix}body-text-align: #{$body-text-align}; + } + --#{$prefix}body-color: #{$body-color}; + --#{$prefix}body-color-rgb: #{to-rgb($body-color)}; + --#{$prefix}body-bg: #{$body-bg}; + --#{$prefix}body-bg-rgb: #{to-rgb($body-bg)}; --#{$prefix}emphasis-color: #{$body-emphasis-color}; --#{$prefix}emphasis-color-rgb: #{to-rgb($body-emphasis-color)}; @@ -70,12 +75,6 @@ --#{$prefix}tertiary-color-rgb: #{to-rgb($body-tertiary-color)}; --#{$prefix}tertiary-bg: #{$body-tertiary-bg}; --#{$prefix}tertiary-bg-rgb: #{to-rgb($body-tertiary-bg)}; - - @if $body-text-align != null { - --#{$prefix}body-text-align: #{$body-text-align}; - } - --#{$prefix}body-bg: #{$body-bg}; - --#{$prefix}body-bg-rgb: #{to-rgb($body-bg)}; // scss-docs-end root-body-variables @if $headings-color != null {