chore(merge main): patched commit → 9013c98 (#1842)

Orange-OpenSource · Feb 22, 2023 · 070147c · 070147c
1 parent f64d25f
commit 070147c
Show file tree

Hide file tree

Showing 36 changed files with 142 additions and 107 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2022 Orange SA
-Copyright (c) 2015-2022 The Boosted Authors
+Copyright (c) 2015-2023 Orange SA
+Copyright (c) 2015-2023 The Boosted Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -25,7 +25,7 @@ End of the parts list under Monotype Imaging Inc Copyright
 
 
 Parts list under Orange SA Copyright
-Copyright (C) 2016 - 2022 Orange SA All rights reserved
+Copyright (C) 2016 - 2023 Orange SA All rights reserved
 
 The following parts are proprietary information of Orange.
 You shall not use or display any trade names, trademarks, service marks, products names, illustrations or designs used within the software

diff --git a/README.md b/README.md
@@ -205,7 +205,7 @@ Thanks to [Netlify](https://www.netlify.com/) for providing us with Deploy Previ
 
 ## Copyright and license
 
-Code and documentation copyright 2011-2022 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors). Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
+Code and documentation copyright 2011-2023 the [Bootstrap Authors](https://github.com/twbs/bootstrap/graphs/contributors). Code released under the [MIT License](https://github.com/twbs/bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
 
-Boosted code and documentation copyright 2015-2022 the [Boosted Authors](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/graphs/contributors) and [Orange SA.](https://orange.com) Code released under the [MIT License](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
+Boosted code and documentation copyright 2015-2023 the [Boosted Authors](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/graphs/contributors) and [Orange SA.](https://orange.com) Code released under the [MIT License](https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/main/LICENSE). Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/).
 
diff --git a/build/build-plugins.js b/build/build-plugins.js
@@ -2,7 +2,7 @@
 
 /*!
  * Script to build our plugins to use them separately.
- * Copyright 2020-2022 The Bootstrap Authors
+ * Copyright 2020-2023 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 

diff --git a/build/change-version.js b/build/change-version.js
@@ -2,7 +2,7 @@
 
 /*!
  * Script to update version number references in the project.
- * Copyright 2017-2022 The Bootstrap Authors
+ * Copyright 2017-2023 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 

diff --git a/build/generate-sri.js b/build/generate-sri.js
@@ -5,7 +5,7 @@
  * Remember to use the same vendor files as the CDN ones,
  * otherwise the hashes won't match!
  *
- * Copyright 2017-2022 The Bootstrap Authors
+ * Copyright 2017-2023 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 

diff --git a/build/vnu-jar.js b/build/vnu-jar.js
@@ -2,7 +2,7 @@
 
 /*!
  * Script to run vnu-jar if Java is available.
- * Copyright 2017-2022 The Bootstrap Authors
+ * Copyright 2017-2023 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
 

diff --git a/build/zip-examples.js b/build/zip-examples.js
@@ -3,7 +3,7 @@
 /*!
  * Script to create the built examples zip archive;
  * requires the `zip` command to be present!
- * Copyright 2020-2022 The Bootstrap Authors
+ * Copyright 2020-2023 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/boosted/blob/main/LICENSE)
  */
 

diff --git a/nuget/boosted.nuspec b/nuget/boosted.nuspec
@@ -15,7 +15,7 @@
     <repository type="git" url="https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap.git" branch="main" />
     <icon>boosted.png</icon>
     <license type="expression">MIT</license>
-    <copyright>Copyright 2015-2022</copyright>
+    <copyright>Copyright 2015-2023</copyright>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <tags>css mobile-first responsive front-end framework web bootstrap</tags>
     <contentFiles>

diff --git a/nuget/boosted.sass.nuspec b/nuget/boosted.sass.nuspec
@@ -15,7 +15,7 @@
     <repository type="git" url="https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap.git" branch="main" />
     <icon>boosted.png</icon>
     <license type="expression">MIT</license>
-    <copyright>Copyright 2015-2022</copyright>
+    <copyright>Copyright 2015-2023</copyright>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <tags>css sass mobile-first responsive front-end framework web bootstrap Orange</tags>
     <contentFiles>

diff --git a/scss/_card.scss b/scss/_card.scss
@@ -33,6 +33,7 @@
   flex-direction: column;
   min-width: 0; // See https://github.com/twbs/bootstrap/pull/22740#issuecomment-305868106
   height: var(--#{$prefix}card-height);
+  color: var(--#{$prefix}body-color);
   word-wrap: break-word;
   background-color: var(--#{$prefix}card-bg);
   background-clip: border-box;

diff --git a/scss/_close.scss b/scss/_close.scss
@@ -4,7 +4,7 @@
 // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
 
 .btn-close {
-  // scss-docs-start btn-close-css-vars
+  // scss-docs-start close-css-vars
   --#{$prefix}btn-close-color: #{$btn-close-color};
   --#{$prefix}btn-close-bg: #{$btn-close-bg}; // Boosted mod: don't use escape-svg()
   // Boosted mod: no --#{$prefix}btn-close-opacity
@@ -20,7 +20,7 @@
   --#{$prefix}btn-close-active-color: #{$btn-close-active-color}; // Boosted mod
   --#{$prefix}btn-close-active-border-color: #{$btn-close-active-border-color}; // Boosted mod
   --#{$prefix}btn-close-disabled-color: #{$btn-close-disabled-color}; // Boosted mod
-  // scss-docs-end btn-close-css-vars
+  // scss-docs-end close-css-vars
 
   // Boosted mod: no box-sizing, width nor height
   padding: var(--#{$prefix}btn-close-padding); // Boosted mod

diff --git a/scss/_nav.scss b/scss/_nav.scss
@@ -39,7 +39,7 @@
     text-decoration: if($link-hover-decoration == underline, none, null);
   }
 
-  // Boosted mod: no `&:focus`
+  // Boosted mod: no `&:focus-visible`
 
   // Disabled state lightens text
   &.disabled {

diff --git a/scss/mixins/_banner.scss b/scss/mixins/_banner.scss
@@ -1,12 +1,12 @@
 @mixin bsBanner($file) {
   /*!
    * Boosted #{$file} v5.3.0-alpha1 (https://boosted.orange.com/)
-   * Copyright 2014-2022 The Boosted Authors
-   * Copyright 2014-2022 Orange SA
+   * Copyright 2014-2023 The Boosted Authors
+   * Copyright 2014-2023 Orange SA
    * Licensed under MIT (https://github.com/Orange-OpenSource/Orange-Boosted-Bootstrap/blob/main/LICENSE)
    * This a fork of Bootstrap: Initial license below
    * Bootstrap #{$file} v5.3.0-alpha1 (https://getbootstrap.com/)
-   * Copyright 2011-2022 The Bootstrap Authors
+   * Copyright 2011-2023 The Bootstrap Authors
    * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
    */
 }
diff --git a/site/assets/js/application.js b/site/assets/js/application.js
@@ -4,8 +4,7 @@
 
 /*!
  * JavaScript for Bootstrap's docs (https://getbootstrap.com/)
- * Copyright 2011-2022 The Bootstrap Authors
- * Copyright 2011-2022 Twitter, Inc.
+ * Copyright 2011-2023 The Bootstrap Authors
  * Licensed under the Creative Commons Attribution 3.0 Unported License.
  * For details, see https://creativecommons.org/licenses/by/3.0/.
  */

diff --git a/site/assets/js/code-examples.js b/site/assets/js/code-examples.js
@@ -4,8 +4,7 @@
 
 /*!
  * JavaScript for Bootstrap's docs (https://getbootstrap.com/)
- * Copyright 2011-2022 The Bootstrap Authors
- * Copyright 2011-2022 Twitter, Inc.
+ * Copyright 2011-2023 The Bootstrap Authors
  * Licensed under the Creative Commons Attribution 3.0 Unported License.
  * For details, see https://creativecommons.org/licenses/by/3.0/.
  */

diff --git a/site/assets/js/snippets.js b/site/assets/js/snippets.js
@@ -6,8 +6,7 @@
 
 /*!
  * JavaScript for Bootstrap's docs (https://getbootstrap.com/)
- * Copyright 2011-2022 The Bootstrap Authors
- * Copyright 2011-2022 Twitter, Inc.
+ * Copyright 2011-2023 The Bootstrap Authors
  * Licensed under the Creative Commons Attribution 3.0 Unported License.
  * For details, see https://creativecommons.org/licenses/by/3.0/.
  */
@@ -20,7 +19,7 @@
   // --------
   // Tooltips
   // --------
-  // Instantiate all tooltips in a docs or StackBlitz page
+  // Instantiate all tooltips in a docs or StackBlitz
   document.querySelectorAll('[data-bs-toggle="tooltip"]')
     .forEach(tooltip => {
       new boosted.Tooltip(tooltip)
@@ -29,7 +28,7 @@
   // --------
   // Popovers
   // --------
-  // Instantiate all popovers in a docs or StackBlitz page
+  // Instantiate all popovers in docs or StackBlitz
   document.querySelectorAll('[data-bs-toggle="popover"]')
     .forEach(popover => {
       new boosted.Popover(popover)
@@ -50,7 +49,7 @@
     })
   }
 
-  // Instantiate all toasts in a docs page only
+  // Instantiate all toasts in docs pages only
   document.querySelectorAll('.bd-example .toast')
     .forEach(toastNode => {
       const toast = new boosted.Toast(toastNode, {
@@ -60,14 +59,14 @@
       toast.show()
     })
 
-  // Instantiate all toasts in a docs page only
+  // Instantiate all toasts in docs pages only
   const toastTrigger = document.getElementById('liveToastBtn')
   const toastLiveExample = document.getElementById('liveToast')
+
   if (toastTrigger) {
+    const toastBoosted = boosted.Toast.getOrCreateInstance(toastLiveExample)
     toastTrigger.addEventListener('click', () => {
-      const toast = new boosted.Toast(toastLiveExample)
-
-      toast.show()
+      toastBoosted.show()
     })
   }
 
@@ -96,7 +95,7 @@
   // --------
   // Carousels
   // --------
-  // Instantiate all non-autoplaying carousels in a docs or StackBlitz page
+  // Instantiate all non-autoplaying carousels in docs or StackBlitz
   document.querySelectorAll('.carousel:not([data-bs-ride="carousel"])')
     .forEach(carousel => {
       boosted.Carousel.getOrCreateInstance(carousel)

diff --git a/site/assets/scss/_callouts.scss b/site/assets/scss/_callouts.scss
@@ -4,6 +4,7 @@
 
 .bd-callout {
   // Boosted mod: no `--#{$prefix}link-color-rgb` to keep our links black
+  // Boosted mod: no `--#{$prefix}code-color` to keep our text black
 
   padding: $spacer; // Boosted mod
   margin-top: $spacer; // Boosted mod

diff --git a/site/assets/scss/_clipboard-js.scss b/site/assets/scss/_clipboard-js.scss
@@ -23,7 +23,7 @@
   padding: .5em;
   line-height: 1;
   color: var(--bs-body-color);
-  background-color: transparent; // Boosted mod: so that the focus-visible outline in the source code area is rendered behind this surface
+  background-color: transparent; // Boosted mod: instead of `var(--bd-pre-bg)` so that the focus-visible outline in the source code area is rendered behind this surface
   border: 0;
   @include border-radius(.25rem);
 

diff --git a/site/assets/scss/_component-examples.scss b/site/assets/scss/_component-examples.scss
@@ -344,7 +344,7 @@
   position: relative;
   padding: .75rem ($bd-gutter-x * .5);
   margin-bottom: 1rem;
-  background-color: var(--bs-tertiary-bg);
+  background-color: var(--bd-pre-bg);
 
   @include media-breakpoint-up(md) {
     padding: .75rem 1.25rem;
@@ -388,7 +388,7 @@
 }
 
 .highlight-toolbar {
-  background-color: $gray-100; // Boosted mod: instead of `var(--bs-tertiary-bg)`
+  background-color: $gray-100; // Boosted mod: instead of `var(--bd-pre-bg)`
   border: solid $gray-400; // Boosted mod: instead of `solid var(--bs-border-color)`
   border-width: 1px 0;
 

diff --git a/site/assets/scss/_syntax.scss b/site/assets/scss/_syntax.scss
@@ -27,22 +27,22 @@
 // TODO: these values will need to be modified in order to work with Boosted dark mode
 // Right now, values are from Bootstrap from `--base00` to `--baseOF` and the 4 remaining one are copied from Boosted's light mode
 @include color-mode(dark, true) {
-  --base00: #282c34;
-  --base01: #353b45;
+  // --base00: #282c34;
+  // --base01: #353b45;
   --base02: #3e4451;
   --base03: #868e96;
-  --base04: #565c64;
+  --base04: #868e96;
   --base05: #abb2bf;
   --base06: #b6bdca;
-  --base07: #d19a66;
-  --base08: #{$red-300};
-  --base09: #d19a66;
-  --base0A: #e5c07b;
-  --base0B: #98c379;
-  --base0C: #56b6c2;
-  --base0D: #61afef;
-  --base0E: #c678dd;
-  --base0F: #be5046;
+  --base07: #{$orange-300}; // #d19a66
+  --base08: #{$cyan-300};
+  --base09: #{$orange-300}; // #d19a66
+  --base0A: #{$yellow-200}; // #e5c07b
+  --base0B: #{$teal-300}; // #98c379
+  --base0C: #{$teal-300}; // #56b6c2
+  --base0D: #{$blue-300}; // #61afef
+  --base0E: #{$indigo-200}; // #c678dd
+  --base0F: #{$red-300}; // #be5046
   --base10: #{$gray-400};
   --base11: #{$yellow-800};
   --base12: #{$cyan-900};

diff --git a/site/assets/scss/_variables.scss b/site/assets/scss/_variables.scss
@@ -22,6 +22,8 @@ $bd-callout-variants: info, warning, danger !default;
   --bd-toc-color: var(--bs-emphasis-color); // Boosted mod: instead of `var(--bd-violet)`
   // Boosted mod: no --bd-sidebar-link-bg
   // Boosted mod: no --bd-callout-link
+  // Boosted mod: no --bd-callout-code-color
+  --bd-pre-bg: var(--bs-tertiary-bg);
   --bd-toc-active-border-left-color: var(--bd-purple); // Boosted mod
 }
 
@@ -31,6 +33,8 @@ $bd-callout-variants: info, warning, danger !default;
   // Boosted mod: no --bd-toc-color
   // Boosted mod: no --bd-sidebar-link-bg
   // Boosted mod: no --bd-callout-link
+  // Boosted mod: no --bd-callout-code-color
+  --bd-pre-bg: #{adjust-color($gray-900, $lightness: -2.5%)}; // stylelint-disable-line scss/at-function-named-arguments
 }
 
 // Boosted mod

diff --git a/site/assets/scss/docs.scss b/site/assets/scss/docs.scss
@@ -1,6 +1,6 @@
 /*!
  * Bootstrap Docs (https://getbootstrap.com/)
- * Copyright 2011-2022 The Bootstrap Authors
+ * Copyright 2011-2023 The Bootstrap Authors
  * Licensed under the Creative Commons Attribution 3.0 Unported License.
  * For details, see https://creativecommons.org/licenses/by/3.0/.
  */