Skip to content

Commit 8effb5c

Browse files
committed
Merge branch 'theming_qa' into theming
2 parents d6ccef9 + 123bb2f commit 8effb5c

32 files changed

+201
-129
lines changed

stylesheets/_conversation.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@
2121
&.invitation-outgoing {
2222
background-color: var(--message-bubbles-sent-background-color);
2323
align-self: flex-end;
24+
25+
.contents {
26+
.session-icon-button {
27+
background-color: var(--transparent-color);
28+
}
29+
}
2430
}
2531

2632
display: inline-block;

stylesheets/_modal.scss

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,19 @@
3030
.contact-selection-list {
3131
width: 100%;
3232
min-width: 300px;
33+
max-width: 350px;
3334
}
3435

3536
&__input-group {
3637
min-width: 300px;
38+
39+
input {
40+
margin-bottom: var(--margins-md);
41+
}
42+
43+
input:last-child {
44+
margin-bottom: 0px;
45+
}
3746
}
3847
}
3948

@@ -106,7 +115,6 @@
106115

107116
input {
108117
padding: 8px;
109-
margin-bottom: 15px;
110118
border: 0;
111119
outline: none;
112120
border-radius: 4px;
@@ -204,6 +212,7 @@
204212
display: flex;
205213
align-items: center;
206214
justify-content: center;
215+
margin-right: -20px; // offsets the edit icon button so it's centered
207216

208217
p {
209218
font-size: $session-font-md;

stylesheets/_session.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,11 @@ label {
223223

224224
padding: var(--margins-lg);
225225

226-
font-family: $session-font-default;
226+
font-family: var(--font-default);
227227
text-align: center;
228228
line-height: 18px;
229-
font-size: $session-font-md;
230-
font-weight: 700;
229+
font-size: var(--font-size-lg);
230+
font-weight: 500;
231231

232232
&.reverse {
233233
flex-direction: row-reverse;
@@ -275,7 +275,7 @@ label {
275275

276276
.session-id-editable {
277277
width: 30vw;
278-
max-width: 700px;
278+
max-width: 400px;
279279
}
280280
}
281281

@@ -298,6 +298,7 @@ label {
298298

299299
.session-button {
300300
margin: var(--margins-xs);
301+
font-weight: 500;
301302
}
302303

303304
&__center {
@@ -313,7 +314,7 @@ label {
313314
&__text-highlight {
314315
@include text-highlight(var(--primary-color));
315316

316-
color: var(--modal-text-color);
317+
color: var(--black-color);
317318

318319
font-family: monospace;
319320
font-style: normal;
@@ -329,7 +330,6 @@ label {
329330
.session-confirm {
330331
&-wrapper {
331332
.session-modal__body .session-modal__centered {
332-
margin: var(--margins-lg);
333333
text-align: center;
334334
}
335335
}

stylesheets/_session_conversation.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
&.show {
3636
transform: none;
3737
transition: transform 0.3s ease-in-out;
38-
z-index: 2;
38+
z-index: 3;
3939
}
4040
}
4141

stylesheets/_session_group_panel.scss

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,26 +33,6 @@
3333
display: none;
3434
}
3535

36-
&-item {
37-
display: flex;
38-
align-items: center;
39-
min-height: 3rem;
40-
font-size: 0.8rem;
41-
color: var(--right-panel-item-text-color);
42-
background-color: var(--right-panel-item-background-color);
43-
border-top: 1px solid var(--border-color);
44-
border-bottom: 1px solid var(--border-color);
45-
46-
width: -webkit-fill-available;
47-
padding: 0 var(--margins-md);
48-
transition: var(--default-duration);
49-
cursor: pointer;
50-
51-
&:hover {
52-
background-color: var(--right-panel-item-background-hover-color);
53-
}
54-
}
55-
5636
// no double border (top and bottom) between two elements
5737
&-item + &-item {
5838
border-top: none;

ts/components/SessionHeaderSearchInput.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export const SessionHeaderSearchInput = styled.input<{ darkMode: boolean }>`
77
padding: 0 26px 0 30px;
88
margin-inline-start: 8px;
99
margin-inline-end: 8px;
10+
margin-bottom: 15px;
1011
outline: 0;
1112
height: 32px;
1213
width: calc(100% - 16px);

ts/components/calling/InConversationCallContainer.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ const StyledCenteredLabel = styled.div`
6969
height: min-content;
7070
white-space: nowrap;
7171
color: var(--in-call-container-text-color);
72-
text-shadow: var(--in-call-container-text-shadow);
7372
z-index: 5;
7473
`;
7574

ts/components/conversation/AddMentions.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const StyledMentionAnother = styled.span`
2020

2121
const StyledMentionedUs = styled(StyledMentionAnother)`
2222
background-color: var(--primary-color);
23-
color: var(--text-primary-color);
23+
color: var(--black-color);
2424
border-radius: 5px;
2525
`;
2626

ts/components/conversation/ConversationRequestButtons.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ const ConversationBannerRow = styled.div`
3737
flex-direction: row;
3838
gap: var(--margins-lg);
3939
justify-content: center;
40+
41+
.session-button {
42+
padding: 0 36px;
43+
}
4044
`;
4145

4246
export const ConversationMessageRequestButtons = () => {
@@ -57,7 +61,6 @@ export const ConversationMessageRequestButtons = () => {
5761
<ConversationRequestBanner>
5862
<ConversationBannerRow>
5963
<SessionButton
60-
buttonColor={SessionButtonColor.Primary}
6164
onClick={async () => {
6265
await handleAcceptConversationRequest(selectedConversation.id);
6366
}}

ts/components/conversation/ConversationRequestInfo.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const ConversationRequestTextBottom = styled.div`
1212
flex-direction: row;
1313
justify-content: center;
1414
padding: var(--margins-lg);
15+
background-color: var(--background-secondary-color);
1516
`;
1617

1718
const ConversationRequestTextInner = styled.div`

0 commit comments

Comments
 (0)