Merge branch 'develop' into grid-html-spec

telerik · Jan 18, 2024 · 9be93bd · 9be93bd
2 parents 53594ab + d879bc8
commit 9be93bd
Show file tree

Hide file tree

Showing 25 changed files with 169 additions and 77 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.1.1-dev.0](https://github.com/telerik/kendo-themes/compare/v7.1.0...v7.1.1-dev.0) (2024-01-18)
+
+
+### Bug Fixes
+
+* **bootstrap:** reinstate bootstrap override styles ([d3b60e2](https://github.com/telerik/kendo-themes/commit/d3b60e2e25a7318bf026aca33a414d66fa9d95a0))
+* **textarea:** set wrapper width for resizing ([71eca48](https://github.com/telerik/kendo-themes/commit/71eca488bc6452997ce006367508f52476099261))
+
+
+
+
+
 # [7.1.0](https://github.com/telerik/kendo-themes/compare/v7.1.0-dev.11...v7.1.0) (2024-01-15)
 
 **Note:** Version bump only for package kendo-themes.repo

diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "7.1.0",
+  "version": "7.1.1-dev.0",
   "packages": [
     "packages/*"
   ],

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/bootstrap/CHANGELOG.md b/packages/bootstrap/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.1.1-dev.0](https://github.com/telerik/kendo-themes/compare/v7.1.0...v7.1.1-dev.0) (2024-01-18)
+
+
+### Bug Fixes
+
+* **bootstrap:** reinstate bootstrap override styles ([d3b60e2](https://github.com/telerik/kendo-themes/commit/d3b60e2e25a7318bf026aca33a414d66fa9d95a0))
+
+
+
+
+
 # [7.1.0](https://github.com/telerik/kendo-themes/compare/v7.1.0-dev.11...v7.1.0) (2024-01-15)
 
 **Note:** Version bump only for package @progress/kendo-theme-bootstrap

diff --git a/packages/bootstrap/docs/customization-input.md b/packages/bootstrap/docs/customization-input.md
@@ -266,7 +266,7 @@ The following table lists the available variables for customization.
     <td>$kendo-input-bg</td>
     <td>Color</td>
     <td><code>$input-bg</code></td>
-    <td><span class="color-preview" style="background-color: #fff"></span><code>#fff</code></td>
+    <td><span class="color-preview" style="background-color: #ffffff"></span><code>#ffffff</code></td>
 </tr>
 <tr>
     <td colspan="4" class="theme-variables-description-container"><div><b>Description</b><div class="theme-variables-description">The background color of the Input components.</div></div>
@@ -346,7 +346,7 @@ The following table lists the available variables for customization.
     <td>$kendo-input-focus-bg</td>
     <td>Color</td>
     <td><code>$input-focus-bg</code></td>
-    <td><span class="color-preview" style="background-color: #fff"></span><code>#fff</code></td>
+    <td><span class="color-preview" style="background-color: #ffffff"></span><code>#ffffff</code></td>
 </tr>
 <tr>
     <td colspan="4" class="theme-variables-description-container"><div><b>Description</b><div class="theme-variables-description">The background color of the focused Input components.</div></div>

diff --git a/packages/bootstrap/docs/customization.md b/packages/bootstrap/docs/customization.md
@@ -8729,7 +8729,7 @@ The following table lists the available variables for customizing the Bootstrap
     <td>$kendo-input-bg</td>
     <td>Color</td>
     <td><code>$input-bg</code></td>
-    <td><span class="color-preview" style="background-color: #fff"></span><code>#fff</code></td>
+    <td><span class="color-preview" style="background-color: #ffffff"></span><code>#ffffff</code></td>
 </tr>
 <tr>
     <td colspan="4" class="theme-variables-description-container"><div><b>Description</b><div class="theme-variables-description">The background color of the Input components.</div></div>
@@ -8809,7 +8809,7 @@ The following table lists the available variables for customizing the Bootstrap
     <td>$kendo-input-focus-bg</td>
     <td>Color</td>
     <td><code>$input-focus-bg</code></td>
-    <td><span class="color-preview" style="background-color: #fff"></span><code>#fff</code></td>
+    <td><span class="color-preview" style="background-color: #ffffff"></span><code>#ffffff</code></td>
 </tr>
 <tr>
     <td colspan="4" class="theme-variables-description-container"><div><b>Description</b><div class="theme-variables-description">The background color of the focused Input components.</div></div>

diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@progress/kendo-theme-bootstrap",
   "description": "Bootstrap theme for Kendo UI",
-  "version": "7.1.0",
+  "version": "7.1.1-dev.0",
   "author": "Progress",
   "license": "Apache-2.0",
   "keywords": [
@@ -53,9 +53,9 @@
   },
   "dependencies": {
     "@progress/kendo-svg-icons": "2.1.0",
-    "@progress/kendo-theme-core": "7.1.0",
-    "@progress/kendo-theme-default": "7.1.0",
-    "@progress/kendo-theme-utils": "7.1.0",
+    "@progress/kendo-theme-core": "7.1.1-dev.0",
+    "@progress/kendo-theme-default": "7.1.1-dev.0",
+    "@progress/kendo-theme-utils": "7.1.1-dev.0",
     "bootstrap": "5.2.1"
   },
   "directories": {

diff --git a/packages/bootstrap/scss/_bootstrap-overrides.scss b/packages/bootstrap/scss/_bootstrap-overrides.scss
@@ -0,0 +1,20 @@
+$gray-100: #f8f9fa !default;
+$gray-200: #e9ecef !default;
+$gray-300: #dee2e6 !default;
+$gray-400: #ced4da !default;
+$gray-500: #adb5bd !default;
+$gray-600: #6c757d !default;
+$gray-700: #495057 !default;
+$gray-800: #343a40 !default;
+$gray-900: #212529 !default;
+
+$kendo-body-bg: #ffffff !default;
+
+$kendo-component-bg: $kendo-body-bg !default;
+$kendo-component-text: k-contrast-color( $kendo-component-bg, $gray-900, $gray-100 ) !default;
+$kendo-component-border: if( k-is-light( $kendo-component-bg ), $gray-300, $gray-700 ) !default;
+
+$input-bg: $kendo-component-bg !default;
+$input-color: k-contrast-color( $input-bg, $gray-900, $gray-300 ) !default;
+$input-border-color: if( k-is-light( $input-bg ), $gray-400, $gray-600 ) !default;
+$input-placeholder-color: k-contrast-color( $input-bg, $gray-600, $gray-400 ) !default;
diff --git a/packages/bootstrap/scss/core/color-system/_swatch.scss b/packages/bootstrap/scss/core/color-system/_swatch.scss
@@ -1,5 +1,6 @@
 @import "@progress/kendo-theme-core/scss/functions/index.import.scss";
 @import "@progress/kendo-theme-core/scss/color-system/_constants.scss";
+@import "../../_bootstrap-overrides.scss";
 @import "bootstrap/scss/_functions.scss";
 @import "bootstrap/scss/_variables.scss";
 @import "./_palettes.scss";
@@ -184,28 +185,6 @@ $kendo-colors: $_default-colors !default;
 
 $kendo-is-dark-theme: false !default;
 
-$gray-100: #f8f9fa !default;
-$gray-200: #e9ecef !default;
-$gray-300: #dee2e6 !default;
-$gray-400: #ced4da !default;
-$gray-500: #adb5bd !default;
-$gray-600: #6c757d !default;
-$gray-700: #495057 !default;
-$gray-800: #343a40 !default;
-$gray-900: #212529 !default;
-
-$kendo-body-bg: #ffffff !default;
-
-$kendo-component-bg: $kendo-body-bg !default;
-$kendo-component-text: k-contrast-color( $kendo-component-bg, $gray-900, $gray-100 ) !default;
-$kendo-component-border: if( k-is-light( $kendo-component-bg ), $gray-300, $gray-700 ) !default;
-
-$input-bg: $kendo-component-bg !default;
-$input-color: k-contrast-color( $input-bg, $gray-900, $gray-300 ) !default;
-$input-border-color: if( k-is-light( $input-bg ), $gray-400, $gray-600 ) !default;
-$input-placeholder-color: k-contrast-color( $input-bg, $gray-600, $gray-400 ) !default;
-
-
 // Theme colors
 /// The color that focuses the user attention.
 /// Used for primary buttons and for elements of primary importance across the theme.

diff --git a/packages/classic/CHANGELOG.md b/packages/classic/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.1.1-dev.0](https://github.com/telerik/kendo-themes/compare/v7.1.0...v7.1.1-dev.0) (2024-01-18)
+
+**Note:** Version bump only for package @progress/kendo-theme-classic
+
+
+
+
+
 # [7.1.0](https://github.com/telerik/kendo-themes/compare/v7.1.0-dev.11...v7.1.0) (2024-01-15)
 
 **Note:** Version bump only for package @progress/kendo-theme-classic

diff --git a/packages/classic/package.json b/packages/classic/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@progress/kendo-theme-classic",
   "description": "Sass port of less based themes for Kendo UI theme",
-  "version": "7.1.0",
+  "version": "7.1.1-dev.0",
   "author": "Progress",
   "license": "Apache-2.0",
   "keywords": [
@@ -53,9 +53,9 @@
   },
   "dependencies": {
     "@progress/kendo-svg-icons": "2.1.0",
-    "@progress/kendo-theme-core": "7.1.0",
-    "@progress/kendo-theme-default": "7.1.0",
-    "@progress/kendo-theme-utils": "7.1.0"
+    "@progress/kendo-theme-core": "7.1.1-dev.0",
+    "@progress/kendo-theme-default": "7.1.1-dev.0",
+    "@progress/kendo-theme-utils": "7.1.1-dev.0"
   },
   "directories": {
     "doc": "docs",

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.1.1-dev.0](https://github.com/telerik/kendo-themes/compare/v7.1.0...v7.1.1-dev.0) (2024-01-18)
+
+**Note:** Version bump only for package @progress/kendo-theme-core
+
+
+
+
+
 # [7.1.0](https://github.com/telerik/kendo-themes/compare/v7.1.0-dev.11...v7.1.0) (2024-01-15)
 
 **Note:** Version bump only for package @progress/kendo-theme-core

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@progress/kendo-theme-core",
   "description": "A collection of functions and mixins used for building themes for Kendo UI",
-  "version": "7.1.0",
+  "version": "7.1.1-dev.0",
   "author": "Progress",
   "license": "Apache-2.0",
   "keywords": [

diff --git a/packages/default/CHANGELOG.md b/packages/default/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.1.1-dev.0](https://github.com/telerik/kendo-themes/compare/v7.1.0...v7.1.1-dev.0) (2024-01-18)
+
+
+### Bug Fixes
+
+* **textarea:** set wrapper width for resizing ([71eca48](https://github.com/telerik/kendo-themes/commit/71eca488bc6452997ce006367508f52476099261))
+
+
+
+
+
 # [7.1.0](https://github.com/telerik/kendo-themes/compare/v7.1.0-dev.11...v7.1.0) (2024-01-15)
 
 **Note:** Version bump only for package @progress/kendo-theme-default

diff --git a/packages/default/package.json b/packages/default/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@progress/kendo-theme-default",
   "description": "SASS resources for the default Kendo UI theme",
-  "version": "7.1.0",
+  "version": "7.1.1-dev.0",
   "author": "Progress",
   "license": "Apache-2.0",
   "keywords": [
@@ -52,8 +52,8 @@
   },
   "dependencies": {
     "@progress/kendo-svg-icons": "2.1.0",
-    "@progress/kendo-theme-core": "7.1.0",
-    "@progress/kendo-theme-utils": "7.1.0"
+    "@progress/kendo-theme-core": "7.1.1-dev.0",
+    "@progress/kendo-theme-utils": "7.1.1-dev.0"
   },
   "directories": {
     "doc": "docs",

diff --git a/packages/fluent/CHANGELOG.md b/packages/fluent/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.1.1-dev.0](https://github.com/telerik/kendo-themes/compare/v7.1.0...v7.1.1-dev.0) (2024-01-18)
+
+
+### Bug Fixes
+
+* **textarea:** set wrapper width for resizing ([71eca48](https://github.com/telerik/kendo-themes/commit/71eca488bc6452997ce006367508f52476099261))
+
+
+
+
+
 # [7.1.0](https://github.com/telerik/kendo-themes/compare/v7.1.0-dev.11...v7.1.0) (2024-01-15)
 
 **Note:** Version bump only for package @progress/kendo-theme-fluent