Skip to content

Commit 584284f

Browse files
committed
Merge branch 'main' into markdown-stream-component
2 parents 0d0fba6 + e60dad5 commit 584284f

File tree

3 files changed

+65
-65
lines changed

3 files changed

+65
-65
lines changed

js/chat/chat.scss

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -12,74 +12,74 @@ shiny-chat-container {
1212
p:last-child {
1313
margin-bottom: 0;
1414
}
15+
}
1516

16-
shiny-chat-messages {
17-
display: flex;
18-
flex-direction: column;
19-
gap: 2rem;
20-
21-
shiny-chat-message {
22-
display: grid;
23-
grid-template-columns: auto minmax(0, 1fr);
24-
gap: 1rem;
25-
> * {
26-
height: fit-content;
27-
}
28-
.message-icon {
29-
border-radius: 50%;
30-
border: var(--shiny-chat-border);
31-
> * {
32-
margin: 0.5rem;
33-
height: 20px;
34-
width: 20px;
35-
}
36-
}
37-
/* Vertically center the 2nd column (message content) */
38-
shiny-markdown {
39-
align-self: center;
40-
}
41-
}
17+
shiny-chat-messages {
18+
display: flex;
19+
flex-direction: column;
20+
gap: 2rem;
21+
}
4222

43-
/* Align the user message to the right */
44-
shiny-user-message {
45-
align-self: flex-end;
46-
padding: 0.75rem 1rem;
47-
border-radius: 10px;
48-
background-color: var(--shiny-chat-user-message-bg);
49-
max-width: 100%;
23+
shiny-chat-message {
24+
display: grid;
25+
grid-template-columns: auto minmax(0, 1fr);
26+
gap: 1rem;
27+
> * {
28+
height: fit-content;
29+
}
30+
.message-icon {
31+
border-radius: 50%;
32+
border: var(--shiny-chat-border);
33+
> * {
34+
margin: 0.5rem;
35+
height: 20px;
36+
width: 20px;
5037
}
5138
}
39+
/* Vertically center the 2nd column (message content) */
40+
shiny-markdown-stream {
41+
align-self: center;
42+
}
43+
}
5244

53-
shiny-chat-input {
54-
margin-top: auto;
55-
position: sticky;
56-
background-color: var(--bs-body-bg, white);
57-
bottom: 0;
58-
textarea {
59-
--bs-border-radius: 26px;
60-
resize: none;
61-
padding-right: 36px !important;
62-
max-height: 175px;
63-
&::placeholder {
64-
color: var(--bs-gray-600, #707782) !important;
65-
}
45+
/* Align the user message to the right */
46+
shiny-user-message {
47+
align-self: flex-end;
48+
padding: 0.75rem 1rem;
49+
border-radius: 10px;
50+
background-color: var(--shiny-chat-user-message-bg);
51+
max-width: 100%;
52+
}
53+
54+
shiny-chat-input {
55+
margin-top: auto;
56+
position: sticky;
57+
background-color: var(--bs-body-bg, white);
58+
bottom: 0;
59+
textarea {
60+
--bs-border-radius: 26px;
61+
resize: none;
62+
padding-right: 36px !important;
63+
max-height: 175px;
64+
&::placeholder {
65+
color: var(--bs-gray-600, #707782) !important;
6666
}
67-
button {
68-
position: absolute;
69-
bottom: 7px;
70-
right: 8px;
71-
background-color: transparent;
72-
color: var(--bs-primary, #007bc2);
73-
transition: color 0.25s ease-in-out;
74-
border: none;
75-
padding: 0;
76-
cursor: pointer;
77-
line-height: 16px;
78-
border-radius: 50%;
79-
&:disabled {
80-
cursor: not-allowed;
81-
color: var(--bs-gray-500, #8d959e);
82-
}
67+
}
68+
button {
69+
position: absolute;
70+
bottom: 7px;
71+
right: 8px;
72+
background-color: transparent;
73+
color: var(--bs-primary, #007bc2);
74+
transition: color 0.25s ease-in-out;
75+
border: none;
76+
padding: 0;
77+
cursor: pointer;
78+
line-height: 16px;
79+
border-radius: 50%;
80+
&:disabled {
81+
cursor: not-allowed;
82+
color: var(--bs-gray-500, #8d959e);
8383
}
8484
}
8585
}

shiny/www/py-shiny/chat/chat.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

shiny/www/py-shiny/chat/chat.css.map

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

0 commit comments

Comments
 (0)