Skip to content

Commit ac779ef

Browse files
committed
merge devel
2 parents 84534df + e2c32de commit ac779ef

149 files changed

Lines changed: 16371 additions & 5161 deletions

File tree

Some content is hidden

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

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ The app is currently available in the following languages:
5353
* Spanish
5454
* Thai
5555
* Ukrainian
56+
* Vietnamese
5657

5758
More translations are welcome. See [instructions](https://github.com/tinode/chat/blob/devel/docs/translations.md#webapp).
5859

css/base.css

Lines changed: 110 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,8 @@
299299
html, body {
300300
height: 100%;
301301
width: 100%;
302+
height: 100dvh;
303+
width: 100dvw;
302304
font-size: 10pt; /* 13.33 px/rem */
303305
color: var(--clr-text-primary);
304306
overflow: hidden;
@@ -790,6 +792,14 @@ div.trusted-badge {
790792
height: 0.015rem;
791793
}
792794

795+
/* Vertical divider line */
796+
.divider {
797+
display: inline-block;
798+
width: 1px;
799+
margin: 0 0.25rem;
800+
border-left: var(--clr-border-muted) 1.5px groove;
801+
}
802+
793803
.ellipsized {
794804
overflow-x: hidden;
795805
white-space: nowrap;
@@ -816,6 +826,15 @@ div.trusted-badge {
816826
text-decoration: none;
817827
}
818828

829+
.flat-button.disabled,
830+
.flat-button.disabled:hover,
831+
.flat-button.disabled:focus {
832+
color: var(--clr-primary-accent);
833+
cursor: default;
834+
opacity: 0.75;
835+
filter: grayscale(75%);
836+
}
837+
819838
.flat-button.faux {
820839
display: inline-block;
821840
height: 1.4em;
@@ -1427,6 +1446,9 @@ i.search {
14271446
font-size: 2.4rem;
14281447
line-height: 3rem;
14291448
}
1449+
.contact-box .avatar-box > .checkmark.material-icons {
1450+
line-height: unset;
1451+
}
14301452
.contact-box.small .avatar-box > .material-icons {
14311453
font-size: 1.6rem;
14321454
line-height: 2rem;
@@ -1961,7 +1983,7 @@ img.channel {
19611983
}
19621984

19631985

1964-
#image-preview-caption-panel {
1986+
#preview-caption-panel {
19651987
display: flex;
19661988
justify-content: space-between;
19671989
background-color: var(--clr-background-blue-gray-50);
@@ -1971,15 +1993,16 @@ img.channel {
19711993
flex-grow: 0;
19721994
height: var(--caption-panel-height);
19731995
padding: 1rem 0.75rem 0 0.75rem;
1996+
font-size: 120%;
19741997
z-index: 3;
19751998
}
19761999

1977-
#image-preview-caption-panel a {
2000+
#preview-caption-panel a {
19782001
color: var(--clr-text-secondary);
19792002
text-decoration: none;
19802003
}
19812004

1982-
#image-preview-caption-panel a:hover {
2005+
#preview-caption-panel a:hover {
19832006
color: var(--clr-dark);
19842007
}
19852008

@@ -2016,6 +2039,17 @@ img.channel {
20162039
background-color: var(--clr-std-ltgray);
20172040
padding: 1rem;
20182041
border-radius: 0.5rem;
2042+
max-width: 30rem;
2043+
}
2044+
2045+
.doc-card .avatar-box {
2046+
width: 10rem;
2047+
height: 10rem;
2048+
font-size: 4.5rem;
2049+
}
2050+
2051+
.doc-card .avatar-box .material-icons {
2052+
line-height: 10rem;
20192053
}
20202054

20212055
/* Video-call related styles */
@@ -3533,6 +3567,79 @@ ul.tabbar li.active > a {
35333567
position: relative;
35343568
right: 0;
35353569
}
3570+
/* END of pinned messages */
3571+
3572+
/* Contact attachments */
3573+
.contact-card {
3574+
position: relative;
3575+
background-color: var(--clr-background-off-white);
3576+
border-radius: 0.5rem;
3577+
display: flex;
3578+
flex-direction: column;
3579+
min-width: 14rem;
3580+
}
3581+
3582+
.contact-card .avatar-box {
3583+
position: relative;
3584+
width: 1.8rem;
3585+
height: 1.8rem;
3586+
font-size: 1rem;
3587+
margin-right: 0.75rem;
3588+
margin-bottom: 0;
3589+
}
3590+
3591+
.contact-card .contact-body {
3592+
align-items: center;
3593+
background-color: var(--clr-background-blue-gray-50);
3594+
display: flex;
3595+
padding: 0.75rem;
3596+
border-radius: 0.5rem 0.5rem 0 0;
3597+
border-bottom: none;
3598+
}
3599+
3600+
.contact-card .contact-body .name-box {
3601+
display: flex;
3602+
flex-direction: column;
3603+
overflow: hidden;
3604+
}
3605+
3606+
.contact-card .contact-body .name-box .name {
3607+
color: var(--clr-text-primary);
3608+
font-weight: 500;
3609+
overflow: hidden;
3610+
text-overflow: ellipsis;
3611+
white-space: nowrap;
3612+
}
3613+
3614+
.contact-card .contact-body .name-box .org {
3615+
color: var(--clr-text-secondary);
3616+
font-size: 90%;
3617+
overflow: hidden;
3618+
text-overflow: ellipsis;
3619+
white-space: nowrap;
3620+
font-weight: 300;
3621+
}
3622+
3623+
.contact-card .contact-actions {
3624+
display: flex;
3625+
justify-content: space-evenly;
3626+
align-items: center;
3627+
padding: 0 0.5rem;
3628+
border-radius: 0 0 0.5rem 0.5rem;
3629+
border-top: none;
3630+
background-color: var(--clr-bright);
3631+
}
3632+
3633+
.contact-card .contact-actions a {
3634+
cursor: pointer;
3635+
}
3636+
3637+
.contact-card .contact-actions .divider {
3638+
height: 1.8rem;
3639+
opacity: 0.5;
3640+
}
3641+
3642+
/* END of contact attachments */
35363643

35373644
/*
35383645
Drag-and-drop area.

css/base.min.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.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tinode-webapp",
33
"description": "Tinode messenger for the web",
4-
"version": "0.25.1",
4+
"version": "0.25.2",
55
"repository": {
66
"type": "git",
77
"url": "git+https://github.com/tinode/webapp.git"
@@ -62,6 +62,7 @@
6262
"ru",
6363
"th",
6464
"uk",
65+
"vi",
6566
"zh",
6667
"zh-TW"
6768
],
@@ -80,7 +81,7 @@
8081
"react": "^18.3.0",
8182
"react-dom": "^18.3.0",
8283
"react-intl": "^7.0.0",
83-
"tinode-sdk": "^0.25.1",
84+
"tinode-sdk": "^0.25.2",
8485
"webm-duration-fix": "^1.0.4"
8586
},
8687
"devDependencies": {

scripts/gen-version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function writeVersion(fileName, useExport) {
88
{ flag: 'w' },
99
(err) => {
1010
if (err) {
11-
return console.log(err);
11+
return console.error(err);
1212
}
1313
}
1414
);

service-worker.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ const webAppChannel = (typeof BroadcastChannel == 'function') ?
1010

1111
// Basic internationalization.
1212
const i18n = {
13+
'ar': {
14+
'new_message': "رسالة جديدة",
15+
'new_chat': "محادثة جديدة",
16+
},
1317
'de': {
1418
'new_message': "Neue Nachricht",
1519
'new_chat': "Neuer Chat",
@@ -50,17 +54,17 @@ const i18n = {
5054
'new_message': "Нове повідомлення",
5155
'new_chat': "Новий чат",
5256
},
57+
'vi': {
58+
'new_message': "Tin nhắn mới",
59+
'new_chat': "Cuộc trò chuyện mới",
60+
},
5361
'zh': {
5462
'new_message': "新讯息",
5563
'new_chat': "新聊天",
5664
},
5765
'zh-TW': {
5866
'new_message': "新訊息",
5967
'new_chat': "新聊天",
60-
},
61-
'ar': {
62-
'new_message': "رسالة جديدة",
63-
'new_chat': "محادثة جديدة",
6468
}
6569
};
6670

src/i18n.min/ar.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/i18n.min/de.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/i18n.min/en.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/i18n.min/es.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)