]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'main' into main-lmp-dark-theme-customization
authorlouismaxime.piton <louismaxime.piton@orange.com>
Tue, 12 Sep 2023 06:59:28 +0000 (08:59 +0200)
committerlouismaxime.piton <louismaxime.piton@orange.com>
Tue, 12 Sep 2023 06:59:28 +0000 (08:59 +0200)
1  2 
scss/_root.scss
scss/_variables-dark.scss
site/content/docs/5.3/utilities/colors.md

diff --cc scss/_root.scss
Simple merge
index e2b38f56ce1d25699928c36b368244ce8dbe934e,79f29a305853db0deb74109e3538be59dcc86c49..05c6c94aab20dda0788f0cebc94115d32ff02d38
@@@ -60,8 -49,8 +60,8 @@@ $body-tertiary-bg-dark:             mix
  $body-emphasis-color-dark:          $white !default;
  $border-color-dark:                 $gray-700 !default;
  $border-color-translucent-dark:     rgba($white, .15) !default;
- $headings-color-dark:               null !default;
+ $headings-color-dark:               inherit !default;
 -$link-color-dark:                   tint-color($primary, 40%) !default;
 +$link-color-dark:                   tint-color($primary-dark, 40%) !default;
  $link-hover-color-dark:             shift-color($link-color-dark, -$link-shade-percentage) !default;
  $code-color-dark:                   tint-color($code-color, 40%) !default;