Fix dialog title overflow with icons
This commit is contained in:
parent
a122fe11c0
commit
082668ab00
@ -335,6 +335,10 @@ export class AppSidebarLeft extends SidebarSlider {
|
|||||||
this.recentSearchLoaded = true;
|
this.recentSearchLoaded = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(this.searchInput.value.trim()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
this.searchGroups.recent.list.innerHTML = '';
|
this.searchGroups.recent.list.innerHTML = '';
|
||||||
this.recentSearchClearBtn.style.display = this.recentSearch.length ? '' : 'none';
|
this.recentSearchClearBtn.style.display = this.recentSearch.length ? '' : 'none';
|
||||||
|
|
||||||
|
@ -25,6 +25,7 @@ type DialogDom = {
|
|||||||
avatarEl: AvatarElement,
|
avatarEl: AvatarElement,
|
||||||
captionDiv: HTMLDivElement,
|
captionDiv: HTMLDivElement,
|
||||||
titleSpan: HTMLSpanElement,
|
titleSpan: HTMLSpanElement,
|
||||||
|
titleSpanContainer: HTMLSpanElement,
|
||||||
statusSpan: HTMLSpanElement,
|
statusSpan: HTMLSpanElement,
|
||||||
lastTimeSpan: HTMLSpanElement,
|
lastTimeSpan: HTMLSpanElement,
|
||||||
unreadMessagesSpan: HTMLSpanElement,
|
unreadMessagesSpan: HTMLSpanElement,
|
||||||
@ -877,34 +878,31 @@ export class AppDialogsManager {
|
|||||||
const captionDiv = document.createElement('div');
|
const captionDiv = document.createElement('div');
|
||||||
captionDiv.classList.add('user-caption');
|
captionDiv.classList.add('user-caption');
|
||||||
|
|
||||||
|
const titleSpanContainer = document.createElement('span');
|
||||||
|
titleSpanContainer.classList.add('user-title');
|
||||||
|
|
||||||
const titleSpan = document.createElement('span');
|
const titleSpan = document.createElement('span');
|
||||||
titleSpan.classList.add('user-title');
|
|
||||||
|
|
||||||
if(peerID == $rootScope.myID && meAsSaved) {
|
if(peerID == $rootScope.myID && meAsSaved) {
|
||||||
title = onlyFirstName ? 'Saved' : 'Saved Messages';
|
title = onlyFirstName ? 'Saved' : 'Saved Messages';
|
||||||
}
|
}
|
||||||
|
|
||||||
titleSpan.innerHTML = title;
|
titleSpan.innerHTML = title;
|
||||||
|
titleSpanContainer.append(titleSpan);
|
||||||
//p.classList.add('')
|
//p.classList.add('')
|
||||||
|
|
||||||
// в других случаях иконка верификации не нужна (а первый - это главные чатлисты)
|
// в других случаях иконка верификации не нужна (а первый - это главные чатлисты)
|
||||||
//if(!container) {
|
//if(!container) {
|
||||||
let peer: any;
|
const peer = appPeersManager.getPeer(peerID);
|
||||||
|
|
||||||
// for muted icon
|
// for muted icon
|
||||||
titleSpan.classList.add('tgico'); // * эта строка будет актуальна только для !container, но ладно
|
titleSpanContainer.classList.add('tgico'); // * эта строка будет актуальна только для !container, но ладно
|
||||||
|
|
||||||
if(peerID < 0) {
|
|
||||||
peer = appChatsManager.getChat(-peerID);
|
|
||||||
} else {
|
|
||||||
peer = appUsersManager.getUser(peerID);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(peer?.pFlags?.verified) {
|
if(peer?.pFlags?.verified) {
|
||||||
titleSpan.classList.add('is-verified');
|
titleSpanContainer.classList.add('is-verified');
|
||||||
const i = document.createElement('i');
|
const i = document.createElement('i');
|
||||||
i.classList.add('verified-icon');
|
i.classList.add('verified-icon');
|
||||||
titleSpan.append(i);
|
titleSpanContainer.append(i);
|
||||||
}
|
}
|
||||||
//}
|
//}
|
||||||
|
|
||||||
@ -957,7 +955,7 @@ export class AppDialogsManager {
|
|||||||
const rightSpan = document.createElement('span');
|
const rightSpan = document.createElement('span');
|
||||||
rightSpan.classList.add('dialog-title-details');
|
rightSpan.classList.add('dialog-title-details');
|
||||||
rightSpan.append(statusSpan, lastTimeSpan);
|
rightSpan.append(statusSpan, lastTimeSpan);
|
||||||
titleP.append(titleSpan, rightSpan);
|
titleP.append(titleSpanContainer, rightSpan);
|
||||||
|
|
||||||
const messageP = document.createElement('p');
|
const messageP = document.createElement('p');
|
||||||
messageP.classList.add('dialog-subtitle');
|
messageP.classList.add('dialog-subtitle');
|
||||||
@ -969,6 +967,7 @@ export class AppDialogsManager {
|
|||||||
avatarEl,
|
avatarEl,
|
||||||
captionDiv,
|
captionDiv,
|
||||||
titleSpan,
|
titleSpan,
|
||||||
|
titleSpanContainer,
|
||||||
statusSpan,
|
statusSpan,
|
||||||
lastTimeSpan,
|
lastTimeSpan,
|
||||||
unreadMessagesSpan,
|
unreadMessagesSpan,
|
||||||
|
@ -111,14 +111,12 @@
|
|||||||
&.is-muted {
|
&.is-muted {
|
||||||
.user-title {
|
.user-title {
|
||||||
&:after {
|
&:after {
|
||||||
|
flex: 0 0 auto;
|
||||||
content: $tgico-nosound;
|
content: $tgico-nosound;
|
||||||
color: #a3a3a3;
|
color: #a3a3a3;
|
||||||
font-size: 1.125rem;
|
font-size: 1.125rem;
|
||||||
line-height: 27px;
|
|
||||||
vertical-align: middle;
|
|
||||||
margin-left: .125rem;
|
margin-left: .125rem;
|
||||||
display: inline-block;
|
display: inline;
|
||||||
height: 29px;
|
|
||||||
animation: fade-in-opacity .2s ease forwards;
|
animation: fade-in-opacity .2s ease forwards;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -204,6 +202,7 @@
|
|||||||
font-size: .75rem;
|
font-size: .75rem;
|
||||||
padding: 1px 0px 0px 0px;
|
padding: 1px 0px 0px 0px;
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
|
margin-left: .5rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -245,13 +244,15 @@
|
|||||||
flex: 1 1 auto;
|
flex: 1 1 auto;
|
||||||
//padding: 1px 3.5px 1px 9px; - DO MAKETA JS3
|
//padding: 1px 3.5px 1px 9px; - DO MAKETA JS3
|
||||||
padding: 1px 8.5px 1px 9px; // JS3
|
padding: 1px 8.5px 1px 9px; // JS3
|
||||||
|
|
||||||
p:last-child {
|
p:last-child {
|
||||||
margin-top: -3px;
|
margin-top: -3px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.user-title {
|
.user-title {
|
||||||
max-width: 82%;
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
img.emoji {
|
img.emoji {
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
@ -269,13 +270,13 @@
|
|||||||
margin-top: -1.5px;
|
margin-top: -1.5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
i.verified-icon {
|
.verified-icon {
|
||||||
|
flex: 0 0 auto;
|
||||||
content: " ";
|
content: " ";
|
||||||
background: url(assets/img/icon-verified.svg);
|
background: url(assets/img/icon-verified.svg);
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
width: 20px;
|
width: 20px;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
vertical-align: text-bottom;
|
|
||||||
margin-left: .125rem;
|
margin-left: .125rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user