]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'main' into main-lmp-dark-theme-customization-full
authorLouis-Maxime Piton <louismaxime.piton@orange.com>
Wed, 28 Feb 2024 14:44:54 +0000 (15:44 +0100)
committerLouis-Maxime Piton <louismaxime.piton@orange.com>
Wed, 28 Feb 2024 14:44:54 +0000 (15:44 +0100)
1  2 
scss/_buttons.scss
scss/_root.scss
scss/_variables-dark.scss
site/content/docs/5.3/customize/color.md
site/content/docs/5.3/migration.md
site/content/docs/5.3/utilities/background.md

Simple merge
diff --cc scss/_root.scss
Simple merge
index 1da81a93e7a3ad758e15dbb06013dd0b96015ede,6422b387441384c8153d37eab485f9edf0f199d9..243ef75958f4684b61d6515f4a6d9e74b4bcf233
@@@ -61,9 -50,11 +61,11 @@@ $body-emphasis-color-dark:          $wh
  $border-color-dark:                 $gray-700 !default;
  $border-color-translucent-dark:     rgba($white, .15) !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;
+ $mark-color-dark:                   $body-color-dark !default;
+ $mark-bg-dark:                      $yellow-800 !default;
  
  
  //
Simple merge