Skip to content

Commit a189bdf

Browse files
dtopalovdtopalov
committed
chore: merge dev resolve conflicts
2 parents c350f30 + e416202 commit a189bdf

File tree

594 files changed

+10912
-2102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

594 files changed

+10912
-2102
lines changed

‎CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,21 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [13.0.0-dev.3](https://github.com/telerik/kendo-themes/compare/v13.0.0-dev.2...v13.0.0-dev.3) (2026-01-30)
7+
8+
9+
### Bug Fixes
10+
11+
* **chat:** decrease min-height ([127b774](https://github.com/telerik/kendo-themes/commit/127b77455f377d3d5b001dfe1ba4dfb79144635c))
12+
* **fluent:** resolve calc related parse errors ([274b1b2](https://github.com/telerik/kendo-themes/commit/274b1b2d7fb4987bd130f5ee3d40b5ddfe4b586b))
13+
* **html:** remove redundant themeColor and roundness from components ([c94dbd1](https://github.com/telerik/kendo-themes/commit/c94dbd10d73ebd1956e298f19e28710b8c72f54c))
14+
* **material:** resolve unit test sass warnings ([c0cfa8b](https://github.com/telerik/kendo-themes/commit/c0cfa8b0fa4ff36eab2541383b40f84a48a755a1))
15+
* resolve unit tests sass warnings ([1cc38b0](https://github.com/telerik/kendo-themes/commit/1cc38b0baa09b61279effcf8c9009952cbaa4645))
16+
17+
18+
19+
20+
621
# [13.0.0-dev.2](https://github.com/telerik/kendo-themes/compare/v13.0.0-dev.1...v13.0.0-dev.2) (2026-01-27)
722

823

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
3-
"version": "13.0.0-dev.2",
3+
"version": "13.0.0-dev.3",
44
"packages": [
55
"packages/html",
66
"packages/core",

‎package-lock.json‎

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/bootstrap/CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [13.0.0-dev.3](https://github.com/telerik/kendo-themes/compare/v13.0.0-dev.2...v13.0.0-dev.3) (2026-01-30)
7+
8+
9+
### Bug Fixes
10+
11+
* **chat:** decrease min-height ([127b774](https://github.com/telerik/kendo-themes/commit/127b77455f377d3d5b001dfe1ba4dfb79144635c))
12+
13+
14+
15+
16+
617
# [13.0.0-dev.2](https://github.com/telerik/kendo-themes/compare/v13.0.0-dev.1...v13.0.0-dev.2) (2026-01-27)
718

819

‎packages/bootstrap/docs/customization-chat.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ The following table lists the available variables for customization.
6060
<tr>
6161
<td>$kendo-chat-height</td>
6262
<td>Number</td>
63-
<td><code>600px</code></td>
64-
<td><code>600px</code></td>
63+
<td><code>320px</code></td>
64+
<td><code>320px</code></td>
6565
</tr>
6666
<tr>
6767
<td colspan="4" class="theme-variables-description-container"><div><b>Description</b><div class="theme-variables-description">The minimum height of the Chat.</div></div>
@@ -180,8 +180,8 @@ The following table lists the available variables for customization.
180180
<tr>
181181
<td>$kendo-chat-message-box-wrapper-spacing</td>
182182
<td>String</td>
183-
<td><code>k-spacing(3)</code></td>
184-
<td><code>var(--kendo-spacing-3, 0.75rem)</code></td>
183+
<td><code>k-spacing(4)</code></td>
184+
<td><code>var(--kendo-spacing-4, 1rem)</code></td>
185185
</tr>
186186
<tr>
187187
<td colspan="4" class="theme-variables-description-container"><div><b>Description</b><div class="theme-variables-description">The spacing of the Chat message box wrapper.</div></div>

‎packages/bootstrap/docs/customization.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6836,8 +6836,8 @@ The following table lists the available variables for customizing the Bootstrap
68366836
<tr>
68376837
<td>$kendo-chat-height</td>
68386838
<td>Number</td>
6839-
<td><code>600px</code></td>
6840-
<td><code>600px</code></td>
6839+
<td><code>320px</code></td>
6840+
<td><code>320px</code></td>
68416841
</tr>
68426842
<tr>
68436843
<td colspan="4" class="theme-variables-description-container"><div><b>Description</b><div class="theme-variables-description">The minimum height of the Chat.</div></div>
@@ -6956,8 +6956,8 @@ The following table lists the available variables for customizing the Bootstrap
69566956
<tr>
69576957
<td>$kendo-chat-message-box-wrapper-spacing</td>
69586958
<td>String</td>
6959-
<td><code>k-spacing(3)</code></td>
6960-
<td><code>var(--kendo-spacing-3, 0.75rem)</code></td>
6959+
<td><code>k-spacing(4)</code></td>
6960+
<td><code>var(--kendo-spacing-4, 1rem)</code></td>
69616961
</tr>
69626962
<tr>
69636963
<td colspan="4" class="theme-variables-description-container"><div><b>Description</b><div class="theme-variables-description">The spacing of the Chat message box wrapper.</div></div>

‎packages/bootstrap/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@progress/kendo-theme-bootstrap",
33
"description": "Bootstrap theme for Kendo UI",
4-
"version": "13.0.0-dev.2",
4+
"version": "13.0.0-dev.3",
55
"author": "Progress",
66
"license": "Apache-2.0",
77
"keywords": [
@@ -54,8 +54,8 @@
5454
},
5555
"dependencies": {
5656
"@progress/kendo-svg-icons": "^4.8.0",
57-
"@progress/kendo-theme-core": "13.0.0-dev.2",
58-
"@progress/kendo-theme-utils": "13.0.0-dev.2"
57+
"@progress/kendo-theme-core": "13.0.0-dev.3",
58+
"@progress/kendo-theme-utils": "13.0.0-dev.3"
5959
},
6060
"directories": {
6161
"doc": "docs",

‎packages/bootstrap/scss/chat/_variables.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $kendo-chat-padding-y: k-spacing(5) !default;
1616
$kendo-chat-width: 280px !default;
1717
/// The minimum height of the Chat.
1818
/// @group chat
19-
$kendo-chat-height: 600px !default;
19+
$kendo-chat-height: 320px !default;
2020
/// The border width of the Chat.
2121
/// @group chat
2222
$kendo-chat-border-width: 1px !default;
@@ -56,7 +56,7 @@ $kendo-chat-message-list-padding-y: $kendo-chat-padding-y !default;
5656
$kendo-chat-message-list-spacing: $kendo-chat-item-spacing-y !default;
5757
/// The spacing of the Chat message box wrapper.
5858
/// @group chat
59-
$kendo-chat-message-box-wrapper-spacing: k-spacing(3) !default;
59+
$kendo-chat-message-box-wrapper-spacing: k-spacing(4) !default;
6060

6161
/// The minimum size of the Chat message status.
6262
/// @group chat

‎packages/bootstrap/scss/index.scss‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
@forward "./floating-label/_index.scss";
3131
@forward "./textbox/_index.scss";
3232
@forward "./textarea/_index.scss";
33+
@forward "./segmented-control/_index.scss";
34+
@forward "./smart-box/_index.scss";
3335
@forward "./checkbox/_index.scss";
3436
@forward "./listbox/_index.scss";
3537
@forward "./progressbar/_index.scss";
@@ -106,6 +108,7 @@
106108
@forward "./gantt/_index.scss";
107109
@forward "./scheduler/_index.scss";
108110
@forward "./file-box/_index.scss";
111+
@forward "./prompt-box/_index.scss";
109112
@forward "./chat/_index.scss";
110113
@forward "./mediaplayer/_index.scss";
111114
@forward "./timeline/_index.scss";
@@ -114,8 +117,6 @@
114117
@forward "./scrollview/_index.scss";
115118
@forward "./speech-to-text-button/_index.scss";
116119
@forward "./prompt/_index.scss";
117-
@forward "./segmented-control/_index.scss";
118-
@forward "./prompt-box/_index.scss";
119120
@forward "./dataviz/_index.scss";
120121
@forward "./chart-wizard/_index.scss";
121122
@forward "./map/_index.scss";
@@ -124,7 +125,6 @@
124125
@forward "./otp/_index.scss";
125126
@forward "./column-menu/_index.scss";
126127
@forward "./marquee/_index.scss";
127-
@forward "./smart-box/_index.scss";
128128

129129

130130
// Use component modules

‎packages/bootstrap/scss/prompt-box/_index.scss‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
// Dependencies
22
@use "../core/_index.scss" as *;
3+
@use "../input/_index.scss" as *;
4+
@use "../button/_index.scss" as *;
5+
@use "../speech-to-text-button/_index.scss" as *;
6+
@use "../file-box/_index.scss" as *;
37

48
// Component
59
@forward "./_variables.scss";
@@ -10,6 +14,10 @@
1014
@mixin kendo-prompt-box--styles() {
1115
@include import-once( "prompt-box" ) {
1216
@include core-styles();
17+
@include kendo-input--styles();
18+
@include kendo-button--styles();
19+
@include kendo-speech-to-text-button--styles();
20+
@include kendo-file-box--styles();
1321
@include kendo-prompt-box--layout();
1422
@include kendo-prompt-box--theme();
1523
}

0 commit comments

Comments
 (0)