Skip to content

Commit 29baafe

Browse files
GoodDayForSurfGoodDayForSurf
authored
Merge branch '26_1' into 26_1_global_format
2 parents 7c9709d + 7c1f961 commit 29baafe

53 files changed

Lines changed: 6403 additions & 6834 deletions

Some content is hidden

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

‎apps/demos/Demos/Chat/PromptSuggestions/Angular/app/app.component.css‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
gap: 20px;
66
}
77

8-
.options-container {
8+
.options {
99
padding: 20px;
1010
display: flex;
1111
flex-direction: column;
@@ -17,7 +17,7 @@
1717
box-sizing: border-box;
1818
}
1919

20-
.options {
20+
.suggestions-options {
2121
display: flex;
2222
align-items: center;
2323
gap: 24px;
@@ -46,6 +46,11 @@
4646
font-size: var(--dx-font-size-heading-5);
4747
}
4848

49+
::ng-deep .dx-chat-messagelist-empty-prompt {
50+
max-width: 462px;
51+
line-height: 20px;
52+
}
53+
4954
::ng-deep .dx-template-wrapper > div > p:first-child {
5055
margin-top: 0;
5156
}

‎apps/demos/Demos/Chat/PromptSuggestions/Angular/app/app.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
</div>
2525
</dx-chat>
2626

27-
<div class="options-container">
27+
<div class="options">
2828
<div class="caption">Suggestion Options</div>
29-
<div class="options">
29+
<div class="suggestions-options">
3030
<div class="option">
3131
<dx-switch
3232
[value]="sendImmediately"

‎apps/demos/Demos/Chat/PromptSuggestions/React/App.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ export default function App() {
103103
onMessageEntered={onMessageEntered}
104104
onInputFieldTextChanged={onInputFieldTextChanged}
105105
/>
106-
<div className='options-container'>
106+
<div className='options'>
107107
<div className='caption'>Suggestion Options</div>
108-
<div className='options'>
108+
<div className='suggestions-options'>
109109
<div className='option'>
110110
<Switch
111111
defaultValue={false}

‎apps/demos/Demos/Chat/PromptSuggestions/React/styles.css‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
gap: 20px;
66
}
77

8-
.options-container {
8+
.options {
99
padding: 20px;
1010
display: flex;
1111
flex-direction: column;
@@ -17,7 +17,7 @@
1717
box-sizing: border-box;
1818
}
1919

20-
.options {
20+
.suggestions-options {
2121
display: flex;
2222
align-items: center;
2323
gap: 24px;
@@ -46,6 +46,11 @@
4646
font-size: var(--dx-font-size-heading-5);
4747
}
4848

49+
.dx-chat-messagelist-empty-prompt {
50+
max-width: 462px;
51+
line-height: 20px;
52+
}
53+
4954
.dx-chat-messagebubble-content > div > p:first-child {
5055
margin-top: 0;
5156
}

‎apps/demos/Demos/Chat/PromptSuggestions/ReactJs/App.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ export default function App() {
8989
onMessageEntered={onMessageEntered}
9090
onInputFieldTextChanged={onInputFieldTextChanged}
9191
/>
92-
<div className="options-container">
92+
<div className="options">
9393
<div className="caption">Suggestion Options</div>
94-
<div className="options">
94+
<div className="suggestions-options">
9595
<div className="option">
9696
<Switch
9797
defaultValue={false}

‎apps/demos/Demos/Chat/PromptSuggestions/ReactJs/styles.css‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
gap: 20px;
66
}
77

8-
.options-container {
8+
.options {
99
padding: 20px;
1010
display: flex;
1111
flex-direction: column;
@@ -17,7 +17,7 @@
1717
box-sizing: border-box;
1818
}
1919

20-
.options {
20+
.suggestions-options {
2121
display: flex;
2222
align-items: center;
2323
gap: 24px;
@@ -46,6 +46,11 @@
4646
font-size: var(--dx-font-size-heading-5);
4747
}
4848

49+
.dx-chat-messagelist-empty-prompt {
50+
max-width: 462px;
51+
line-height: 20px;
52+
}
53+
4954
.dx-chat-messagebubble-content > div > p:first-child {
5055
margin-top: 0;
5156
}

‎apps/demos/Demos/Chat/PromptSuggestions/Vue/App.vue‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
</template>
2525
</DxChat>
2626

27-
<div class="options-container">
27+
<div class="options">
2828
<div class="caption">Suggestion Options</div>
29-
<div class="options">
29+
<div class="suggestions-options">
3030
<div class="option">
3131
<DxSwitch
3232
:value="sendImmediately"
@@ -185,7 +185,7 @@ function onSuggestionItemClick(e: { itemData?: { text: string; prompt: string }
185185
gap: 20px;
186186
}
187187
188-
.options-container {
188+
.options {
189189
padding: 20px;
190190
display: flex;
191191
flex-direction: column;
@@ -197,7 +197,7 @@ function onSuggestionItemClick(e: { itemData?: { text: string; prompt: string }
197197
box-sizing: border-box;
198198
}
199199
200-
.options {
200+
.suggestions-options {
201201
display: flex;
202202
align-items: center;
203203
gap: 24px;
@@ -226,6 +226,11 @@ function onSuggestionItemClick(e: { itemData?: { text: string; prompt: string }
226226
font-size: var(--dx-font-size-heading-5);
227227
}
228228
229+
.dx-chat-messagelist-empty-prompt {
230+
max-width: 462px;
231+
line-height: 20px;
232+
}
233+
229234
.dx-chat-messagebubble-content > div > p:first-child {
230235
margin-top: 0;
231236
}

‎apps/demos/Demos/Chat/PromptSuggestions/jQuery/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
<div class="demo-container">
3535
<div id="dx-ai-chat"></div>
3636

37-
<div class="options-container">
37+
<div class="options">
3838
<div class="caption">Suggestion Options</div>
3939

40-
<div class="options">
40+
<div class="suggestions-options">
4141
<div class="option">
4242
<div id="send-immediately"></div>
4343
<span>Send Immediately</span>

‎apps/demos/Demos/Chat/PromptSuggestions/jQuery/styles.css‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
gap: 20px;
66
}
77

8-
.options-container {
8+
.options {
99
padding: 20px;
1010
display: flex;
1111
flex-direction: column;
@@ -17,7 +17,7 @@
1717
box-sizing: border-box;
1818
}
1919

20-
.options {
20+
.suggestions-options {
2121
display: flex;
2222
align-items: center;
2323
gap: 24px;
@@ -46,6 +46,11 @@
4646
font-size: var(--dx-font-size-heading-5);
4747
}
4848

49+
.dx-chat-messagelist-empty-prompt {
50+
max-width: 462px;
51+
line-height: 20px;
52+
}
53+
4954
.dx-chat-messagebubble-content,
5055
.chat-messagebubble-text {
5156
display: flex;

‎apps/demos/Demos/Scheduler/HiddenDays/Angular/app/app.component.css‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
.hidden-days-demo {
2+
display: flex;
3+
gap: 20px;
4+
}
5+
6+
.scheduler-container {
7+
flex: 1;
8+
min-width: 0;
9+
}
10+
11+
.options {
12+
display: flex;
13+
flex-direction: column;
14+
flex-shrink: 0;
15+
width: 220px;
16+
box-sizing: border-box;
17+
padding: 20px;
18+
background-color: rgba(191, 191, 191, 0.15);
19+
gap: 12px;
20+
}
21+
22+
.caption {
23+
font-weight: 500;
24+
font-size: 18px;
25+
}
26+
27+
.option {
28+
display: flex;
29+
flex-direction: column;
30+
}
31+
32+
.validation-message {
33+
display: none;
34+
margin-top: 8px;
35+
padding: 10px 12px;
36+
background: #fdf3f4;
37+
border-left: 3px solid #c50f1f;
38+
border-radius: 4px;
39+
color: #c50f1f;
40+
font-size: 13px;
41+
line-height: 1.4;
42+
}
43+
44+
::ng-deep .hidden-days-demo.is-invalid .validation-message {
45+
display: block;
46+
}
47+
48+
::ng-deep .hidden-days-demo.is-invalid .option .dx-checkbox-icon {
49+
border-color: #c50f1f;
50+
}
51+
52+
::ng-deep .hidden-days-demo.is-invalid .dx-scheduler-work-space {
53+
opacity: 0.4;
54+
pointer-events: none;
55+
}

0 commit comments

Comments
 (0)