Merge branch 'v5'

thomaspark · Jul 28, 2023 · c7d7f84 · c7d7f84
2 parents 8d803f5 + cd608c8
commit c7d7f84
Show file tree

Hide file tree

Showing 479 changed files with 618,453 additions and 5,203 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -48,6 +48,7 @@ module.exports = grunt => {
  grunt.loadNpmTasks('grunt-contrib-watch');
  grunt.loadNpmTasks('grunt-sass');
  grunt.loadNpmTasks('grunt-html');
+ grunt.loadNpmTasks('grunt-shell');
 
  // Force use of Unix newlines
  grunt.util.linefeed = '\n';
@@ -94,7 +95,8 @@ module.exports = grunt => {
  cwd: 'dist',
  src: [
  '**/*.css',
- '**/*.scss'
+ '**/*.scss',
+ '**/*.map'
  ],
  dest: DOCS_DEST
  }]
@@ -138,11 +140,16 @@ module.exports = grunt => {
  1: {
  specialComments: 'all'
  }
- }
+ },
+ sourceMap: true
  },
  dist: {
  src: [],
  dest: ''
+ },
+ rtl: {
+ src: [],
+ dest: ''
  }
  },
  htmllint: {
@@ -183,9 +190,23 @@ module.exports = grunt => {
  ],
  tasks: 'build'
  }
+ },
+ shell: { 
+ options: {
+ stderr: false
+ },
+ rtlcss: {
+ command: function (theme) {
+ return `rtlcss dist/${theme}/bootstrap.css dist/${theme}/bootstrap.rtl.css`;
+ }
+ }
  }
  });
 
+ grunt.registerTask('rtlcss', function (theme) {
+ grunt.task.run('shell:rtlcss:' + theme);
+ });
+
  grunt.registerTask('build', 'build a regular theme from scss', theme => {
  theme = theme ? theme : buildTheme;
 
@@ -202,6 +223,8 @@ module.exports = grunt => {
  const concatDest = path.join(themeDir, '/build.scss');
  const cssDest = path.join(themeDir, '/bootstrap.css');
  const cssDestMin = path.join(themeDir, '/bootstrap.min.css');
+ const cssDestRtl = path.join(themeDir, '/bootstrap.rtl.css');
+ const cssDestRtlMin = path.join(themeDir, '/bootstrap.rtl.min.css');
 
  const banner = `/*!
  * Bootswatch v${pkg.version} (${pkg.homepage})
@@ -231,13 +254,19 @@ module.exports = grunt => {
  src: cssDest,
  dest: cssDestMin
  });
+ grunt.config.set('cssmin.rtl', {
+ src: cssDestRtl,
+ dest: cssDestRtlMin
+ });
 
  grunt.task.run([
  'concat',
  'sass:dist',
  'postcss:dist',
  'clean:build',
  'cssmin:dist',
+ `rtlcss:${theme}`,
+ 'cssmin:rtl',
  'copy:css'
  ]);
  });

diff --git a/dist/cerulean/_bootswatch.scss b/dist/cerulean/_bootswatch.scss
@@ -1,15 +1,11 @@
-// Cerulean 5.3.0
+// Cerulean 5.3.1
 // Bootswatch
 
 
 // Variables
 
 $text-shadow: 0 1px 0 rgba(0, 0, 0, .05) !default;
 
-:root {
- color-scheme: light;
-}
-
 // Mixins
 
 @mixin btn-shadow($color){

diff --git a/dist/cerulean/_variables.scss b/dist/cerulean/_variables.scss
@@ -1,4 +1,4 @@
-// Cerulean 5.3.0
+// Cerulean 5.3.1
 // Bootswatch
 
 $theme: "cerulean" !default;

diff --git a/dist/cerulean/bootstrap.css b/dist/cerulean/bootstrap.css
@@ -1,13 +1,13 @@
 @charset "UTF-8";
 /*!
- * Bootswatch v5.3.0 (https://bootswatch.com)
+ * Bootswatch v5.3.1 (https://bootswatch.com)
  * Theme: cerulean
  * Copyright 2012-2023 Thomas Park
  * Licensed under MIT
  * Based on Bootstrap
 */
 /*!
- * Bootstrap v5.3.0 (https://getbootstrap.com/)
+ * Bootstrap v5.3.1 (https://getbootstrap.com/)
  * Copyright 2011-2023 The Bootstrap Authors
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
  */
@@ -133,18 +133,18 @@
 
 [data-bs-theme=dark] {
  color-scheme: dark;
- --bs-body-color: #adb5bd;
- --bs-body-color-rgb: 173, 181, 189;
+ --bs-body-color: #dee2e6;
+ --bs-body-color-rgb: 222, 226, 230;
  --bs-body-bg: #212529;
  --bs-body-bg-rgb: 33, 37, 41;
  --bs-emphasis-color: #fff;
  --bs-emphasis-color-rgb: 255, 255, 255;
- --bs-secondary-color: rgba(173, 181, 189, 0.75);
- --bs-secondary-color-rgb: 173, 181, 189;
+ --bs-secondary-color: rgba(222, 226, 230, 0.75);
+ --bs-secondary-color-rgb: 222, 226, 230;
  --bs-secondary-bg: #343a40;
  --bs-secondary-bg-rgb: 52, 58, 64;
- --bs-tertiary-color: rgba(173, 181, 189, 0.5);
- --bs-tertiary-color-rgb: 173, 181, 189;
+ --bs-tertiary-color: rgba(222, 226, 230, 0.5);
+ --bs-tertiary-color-rgb: 222, 226, 230;
  --bs-tertiary-bg: #2b3035;
  --bs-tertiary-bg-rgb: 43, 48, 53;
  --bs-primary-text-emphasis: #82c8f1;
@@ -547,8 +547,8 @@ legend + * {
 }
 
 [type=search] {
- outline-offset: -2px;
  -webkit-appearance: textfield;
+ outline-offset: -2px;
 }
 
 /* rtl:raw:
@@ -2123,12 +2123,12 @@ progress {
  font-weight: 400;
  line-height: 1.5;
  color: var(--bs-body-color);
- background-color: var(--bs-body-bg);
- background-clip: padding-box;
- border: var(--bs-border-width) solid var(--bs-border-color);
  -webkit-appearance: none;
  -moz-appearance: none;
  appearance: none;
+ background-color: var(--bs-body-bg);
+ background-clip: padding-box;
+ border: var(--bs-border-width) solid var(--bs-border-color);
  border-radius: var(--bs-border-radius);
  transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
 }
@@ -2317,6 +2317,9 @@ textarea.form-control-lg {
  font-weight: 400;
  line-height: 1.5;
  color: var(--bs-body-color);
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ appearance: none;
  background-color: var(--bs-body-bg);
  background-image: var(--bs-form-select-bg-img), var(--bs-form-select-bg-icon, none);
  background-repeat: no-repeat;
@@ -2325,9 +2328,6 @@ textarea.form-control-lg {
  border: var(--bs-border-width) solid var(--bs-border-color);
  border-radius: var(--bs-border-radius);
  transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
- -webkit-appearance: none;
- -moz-appearance: none;
- appearance: none;
 }
 @media (prefers-reduced-motion: reduce) {
  .form-select {
@@ -2368,7 +2368,7 @@ textarea.form-control-lg {
 }
 
 [data-bs-theme=dark] .form-select {
- --bs-form-select-bg-img: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23adb5bd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e");
+ --bs-form-select-bg-img: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='none' stroke='%23dee2e6' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/%3e%3c/svg%3e");
 }
 
 .form-check {
@@ -2399,15 +2399,15 @@ textarea.form-control-lg {
  height: 1em;
  margin-top: 0.25em;
  vertical-align: top;
+ -webkit-appearance: none;
+ -moz-appearance: none;
+ appearance: none;
  background-color: var(--bs-form-check-bg);
  background-image: var(--bs-form-check-bg-image);
  background-repeat: no-repeat;
  background-position: center;
  background-size: contain;
  border: var(--bs-border-width) solid var(--bs-border-color);
- -webkit-appearance: none;
- -moz-appearance: none;
- appearance: none;
  -webkit-print-color-adjust: exact;
  color-adjust: exact;
  print-color-adjust: exact;
@@ -2508,10 +2508,10 @@ textarea.form-control-lg {
  width: 100%;
  height: 1.5rem;
  padding: 0;
- background-color: transparent;
  -webkit-appearance: none;
  -moz-appearance: none;
  appearance: none;
+ background-color: transparent;
 }
 .form-range:focus {
  outline: 0;
@@ -2529,13 +2529,13 @@ textarea.form-control-lg {
  width: 1rem;
  height: 1rem;
  margin-top: -0.25rem;
+ -webkit-appearance: none;
+ appearance: none;
  background-color: #2fa4e7;
  border: 0;
  border-radius: 1rem;
  -webkit-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
- -webkit-appearance: none;
- appearance: none;
 }
 @media (prefers-reduced-motion: reduce) {
  .form-range::-webkit-slider-thumb {
@@ -2558,13 +2558,13 @@ textarea.form-control-lg {
 .form-range::-moz-range-thumb {
  width: 1rem;
  height: 1rem;
+ -moz-appearance: none;
+ appearance: none;
  background-color: #2fa4e7;
  border: 0;
  border-radius: 1rem;
  -moz-transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
- -moz-appearance: none;
- appearance: none;
 }
 @media (prefers-reduced-motion: reduce) {
  .form-range::-moz-range-thumb {
@@ -2694,10 +2694,12 @@ textarea.form-control-lg {
 .form-floating > .form-control-plaintext ~ label {
  border-width: var(--bs-border-width) 0;
 }
-.form-floating > :disabled ~ label {
+.form-floating > :disabled ~ label,
+.form-floating > .form-control:disabled ~ label {
  color: #868e96;
 }
-.form-floating > :disabled ~ label::after {
+.form-floating > :disabled ~ label::after,
+.form-floating > .form-control:disabled ~ label::after {
  background-color: var(--bs-secondary-bg);
 }
 
@@ -3849,7 +3851,7 @@ textarea.form-control-lg {
  outline: 0;
  box-shadow: 0 0 0 0.25rem rgba(47, 164, 231, 0.25);
 }
-.nav-link.disabled {
+.nav-link.disabled, .nav-link:disabled {
  color: var(--bs-nav-link-disabled-color);
  pointer-events: none;
  cursor: default;
@@ -3875,11 +3877,6 @@ textarea.form-control-lg {
  isolation: isolate;
  border-color: var(--bs-nav-tabs-link-hover-border-color);
 }
-.nav-tabs .nav-link.disabled, .nav-tabs .nav-link:disabled {
- color: var(--bs-nav-link-disabled-color);
- background-color: transparent;
- border-color: transparent;
-}
 .nav-tabs .nav-link.active,
 .nav-tabs .nav-item.show .nav-link {
  color: var(--bs-nav-tabs-link-active-color);
@@ -3900,11 +3897,6 @@ textarea.form-control-lg {
 .nav-pills .nav-link {
  border-radius: var(--bs-nav-pills-border-radius);
 }
-.nav-pills .nav-link:disabled {
- color: var(--bs-nav-link-disabled-color);
- background-color: transparent;
- border-color: transparent;
-}
 .nav-pills .nav-link.active,
 .nav-pills .show > .nav-link {
  color: var(--bs-nav-pills-link-active-color);
@@ -6864,42 +6856,42 @@ textarea.form-control-lg {
 
 .text-bg-primary {
  color: #fff !important;
- background-color: RGBA(47, 164, 231, var(--bs-bg-opacity, 1)) !important;
+ background-color: RGBA(var(--bs-primary-rgb), var(--bs-bg-opacity, 1)) !important;
 }
 
 .text-bg-secondary {
  color: #000 !important;
- background-color: RGBA(233, 236, 239, var(--bs-bg-opacity, 1)) !important;
+ background-color: RGBA(var(--bs-secondary-rgb), var(--bs-bg-opacity, 1)) !important;
 }
 
 .text-bg-success {
  color: #fff !important;
- background-color: RGBA(115, 168, 57, var(--bs-bg-opacity, 1)) !important;
+ background-color: RGBA(var(--bs-success-rgb), var(--bs-bg-opacity, 1)) !important;
 }
 
 .text-bg-info {
  color: #fff !important;
- background-color: RGBA(3, 60, 115, var(--bs-bg-opacity, 1)) !important;
+ background-color: RGBA(var(--bs-info-rgb), var(--bs-bg-opacity, 1)) !important;
 }
 
 .text-bg-warning {
  color: #fff !important;
- background-color: RGBA(221, 86, 0, var(--bs-bg-opacity, 1)) !important;
+ background-color: RGBA(var(--bs-warning-rgb), var(--bs-bg-opacity, 1)) !important;
 }
 
 .text-bg-danger {
  color: #fff !important;
- background-color: RGBA(199, 28, 34, var(--bs-bg-opacity, 1)) !important;
+ background-color: RGBA(var(--bs-danger-rgb), var(--bs-bg-opacity, 1)) !important;
 }
 
 .text-bg-light {
  color: #000 !important;
- background-color: RGBA(248, 249, 250, var(--bs-bg-opacity, 1)) !important;
+ background-color: RGBA(var(--bs-light-rgb), var(--bs-bg-opacity, 1)) !important;
 }
 
 .text-bg-dark {
  color: #fff !important;
- background-color: RGBA(52, 58, 64, var(--bs-bg-opacity, 1)) !important;
+ background-color: RGBA(var(--bs-dark-rgb), var(--bs-bg-opacity, 1)) !important;
 }
 
 .link-primary {
@@ -7215,7 +7207,7 @@ textarea.form-control-lg {
 .vr {
  display: inline-block;
  align-self: stretch;
- width: 1px;
+ width: var(--bs-border-width);
  min-height: 1em;
  background-color: currentcolor;
  opacity: 0.25;
@@ -12074,10 +12066,6 @@ textarea.form-control-lg {
  display: none !important;
  }
 }
-:root {
- color-scheme: light;
-}
-
 .navbar.bg-primary {
  background-image: linear-gradient(#50b3eb, #2fa4e7 60%, #2c9ad9);
 }