diff --git a/public/assets/fonts/tgico.svg b/public/assets/fonts/tgico.svg
index 58cdeea6..1f4e6628 100644
--- a/public/assets/fonts/tgico.svg
+++ b/public/assets/fonts/tgico.svg
@@ -65,110 +65,112 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/assets/fonts/tgico.ttf b/public/assets/fonts/tgico.ttf
index a82613be..a991be88 100644
Binary files a/public/assets/fonts/tgico.ttf and b/public/assets/fonts/tgico.ttf differ
diff --git a/public/assets/fonts/tgico.woff b/public/assets/fonts/tgico.woff
index f4cb7a95..bf9b71f1 100644
Binary files a/public/assets/fonts/tgico.woff and b/public/assets/fonts/tgico.woff differ
diff --git a/src/components/chat/input.ts b/src/components/chat/input.ts
index 8064e299..4ca199cf 100644
--- a/src/components/chat/input.ts
+++ b/src/components/chat/input.ts
@@ -1424,7 +1424,7 @@ export default class ChatInput {
executed.push(document.execCommand('styleWithCSS', false, 'true'));
- if(type === 'monospace') {
+ if(type === 'monospace' || type === 'spoiler') {
let haveThisType = false;
//executed.push(document.execCommand('styleWithCSS', false, 'true'));
diff --git a/src/components/chat/markupTooltip.ts b/src/components/chat/markupTooltip.ts
index a240ca64..086eb129 100644
--- a/src/components/chat/markupTooltip.ts
+++ b/src/components/chat/markupTooltip.ts
@@ -49,7 +49,7 @@ export default class MarkupTooltip {
tools1.classList.add('markup-tooltip-tools');
tools2.classList.add('markup-tooltip-tools');
- const arr = ['bold', 'italic', 'underline', 'strikethrough', 'monospace', 'link'] as (keyof MarkupTooltip['buttons'])[];
+ const arr = ['bold', 'italic', 'underline', 'strikethrough', 'monospace', 'spoiler', 'link'] as (keyof MarkupTooltip['buttons'])[];
arr.forEach(c => {
const button = ButtonIcon(c, {noRipple: true});
tools1.append(this.buttons[c] = button);
@@ -417,4 +417,4 @@ export default class MarkupTooltip {
}
});
}
-}
\ No newline at end of file
+}
diff --git a/src/scss/partials/_chatMarkupTooltip.scss b/src/scss/partials/_chatMarkupTooltip.scss
index c47f659c..ad49580a 100644
--- a/src/scss/partials/_chatMarkupTooltip.scss
+++ b/src/scss/partials/_chatMarkupTooltip.scss
@@ -5,7 +5,7 @@
*/
.markup-tooltip {
- $widthRegular: 218px;
+ $widthRegular: 252px;
$widthLink: 420px;
$padding: 7px;
@@ -132,4 +132,4 @@
pointer-events: all;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/scss/partials/_fonts.scss b/src/scss/partials/_fonts.scss
index d25348cf..949aa660 100644
--- a/src/scss/partials/_fonts.scss
+++ b/src/scss/partials/_fonts.scss
@@ -9,9 +9,9 @@
@font-face {
font-family: "#{$tgico-font-family}";
src:
- url('#{$tgico-font-path}/#{$tgico-font-family}.ttf?onwvlx') format('truetype'),
- url('#{$tgico-font-path}/#{$tgico-font-family}.woff?onwvlx') format('woff'),
- url('#{$tgico-font-path}/#{$tgico-font-family}.svg?onwvlx#tgico') format('svg');
+ url('#{$tgico-font-path}/#{$tgico-font-family}.ttf?ee3u9s') format('truetype'),
+ url('#{$tgico-font-path}/#{$tgico-font-family}.woff?ee3u9s') format('woff'),
+ url('#{$tgico-font-path}/#{$tgico-font-family}.svg?ee3u9s#tgico') format('svg');
font-weight: normal;
font-style: normal;
font-display: block;
@@ -327,6 +327,11 @@
content: $tgico-endcall_filled;
}
}
+.tgico-endcall {
+ &:before {
+ content: $tgico-endcall;
+ }
+}
.tgico-enter {
&:before {
content: $tgico-enter;
@@ -757,6 +762,11 @@
content: $tgico-smile;
}
}
+.tgico-spoiler {
+ &:before {
+ content: $tgico-spoiler;
+ }
+}
.tgico-sport {
&:before {
content: $tgico-sport;
diff --git a/src/scss/partials/_ico.scss b/src/scss/partials/_ico.scss
index 036202d3..8761be4a 100644
--- a/src/scss/partials/_ico.scss
+++ b/src/scss/partials/_ico.scss
@@ -77,109 +77,111 @@ $tgico-eats: "\e936";
$tgico-edit: "\e937";
$tgico-email: "\e938";
$tgico-endcall_filled: "\e939";
-$tgico-enter: "\e93a";
-$tgico-eye1: "\e93b";
-$tgico-eye2: "\e93c";
-$tgico-favourites: "\e93d";
-$tgico-flag: "\e93e";
-$tgico-folder: "\e93f";
-$tgico-fontsize: "\e940";
-$tgico-forward_filled: "\e941";
-$tgico-forward: "\e942";
-$tgico-fullscreen: "\e943";
-$tgico-gc_microphone: "\e944";
-$tgico-gc_microphoneoff: "\e945";
-$tgico-gifs: "\e946";
-$tgico-group: "\e947";
-$tgico-help: "\e948";
-$tgico-image: "\e949";
-$tgico-info: "\e94a";
-$tgico-info2: "\e94b";
-$tgico-italic: "\e94c";
-$tgico-keyboard: "\e94d";
-$tgico-lamp: "\e94e";
-$tgico-language: "\e94f";
-$tgico-largepause: "\e950";
-$tgico-largeplay: "\e951";
-$tgico-left: "\e952";
-$tgico-link: "\e953";
-$tgico-listscreenshare: "\e954";
-$tgico-livelocation: "\e955";
-$tgico-location: "\e956";
-$tgico-lock: "\e957";
-$tgico-lockoff: "\e958";
-$tgico-loginlogodesktop: "\e959";
-$tgico-loginlogomobile: "\e95a";
-$tgico-logout: "\e95b";
-$tgico-mention: "\e95c";
-$tgico-menu: "\e95d";
-$tgico-message: "\e95e";
-$tgico-messageunread: "\e95f";
-$tgico-microphone: "\e960";
-$tgico-minus: "\e961";
-$tgico-monospace: "\e962";
-$tgico-more: "\e963";
-$tgico-mute: "\e964";
-$tgico-muted: "\e965";
-$tgico-newchannel: "\e966";
-$tgico-newchat_filled: "\e967";
-$tgico-newgroup: "\e968";
-$tgico-newprivate: "\e969";
-$tgico-next: "\e96a";
-$tgico-noncontacts: "\e96b";
-$tgico-nosound: "\e96c";
-$tgico-passwordoff: "\e96d";
-$tgico-pause: "\e96e";
-$tgico-permissions: "\e96f";
-$tgico-phone: "\e970";
-$tgico-pin: "\e971";
-$tgico-pinlist: "\e972";
-$tgico-pinned_filled: "\e973";
-$tgico-pinnedchat: "\e974";
-$tgico-play: "\e975";
-$tgico-plus: "\e976";
-$tgico-poll: "\e977";
-$tgico-previous: "\e978";
-$tgico-radiooff: "\e979";
-$tgico-radioon: "\e97a";
-$tgico-readchats: "\e97b";
-$tgico-recent: "\e97c";
-$tgico-replace: "\e97d";
-$tgico-reply_filled: "\e97e";
-$tgico-reply: "\e97f";
-$tgico-rightpanel: "\e980";
-$tgico-saved: "\e981";
-$tgico-savedmessages: "\e982";
-$tgico-schedule: "\e983";
-$tgico-scheduled: "\e984";
-$tgico-search: "\e985";
-$tgico-select: "\e986";
-$tgico-send: "\e987";
-$tgico-send2: "\e988";
-$tgico-sending: "\e989";
-$tgico-sendingerror: "\e98a";
-$tgico-settings_filled: "\e98b";
-$tgico-settings: "\e98c";
-$tgico-sharescreen_filled: "\e98d";
-$tgico-smallscreen: "\e98e";
-$tgico-smile: "\e98f";
-$tgico-sport: "\e990";
-$tgico-stickers: "\e991";
-$tgico-stop: "\e992";
-$tgico-strikethrough: "\e993";
-$tgico-textedit: "\e994";
-$tgico-tip: "\e995";
-$tgico-tools: "\e996";
-$tgico-unarchive: "\e997";
-$tgico-underline: "\e998";
-$tgico-unmute: "\e999";
-$tgico-unpin: "\e99a";
-$tgico-unread: "\e99b";
-$tgico-up: "\e99c";
-$tgico-user: "\e99d";
-$tgico-username: "\e99e";
-$tgico-videocamera_filled: "\e99f";
-$tgico-videocamera: "\e9a0";
-$tgico-videochat: "\e9a1";
-$tgico-zoomin: "\e9a2";
-$tgico-zoomout: "\e9a3";
+$tgico-endcall: "\e93a";
+$tgico-enter: "\e93b";
+$tgico-eye1: "\e93c";
+$tgico-eye2: "\e93d";
+$tgico-favourites: "\e93e";
+$tgico-flag: "\e93f";
+$tgico-folder: "\e940";
+$tgico-fontsize: "\e941";
+$tgico-forward_filled: "\e942";
+$tgico-forward: "\e943";
+$tgico-fullscreen: "\e944";
+$tgico-gc_microphone: "\e945";
+$tgico-gc_microphoneoff: "\e946";
+$tgico-gifs: "\e947";
+$tgico-group: "\e948";
+$tgico-help: "\e949";
+$tgico-image: "\e94a";
+$tgico-info: "\e94b";
+$tgico-info2: "\e94c";
+$tgico-italic: "\e94d";
+$tgico-keyboard: "\e94e";
+$tgico-lamp: "\e94f";
+$tgico-language: "\e950";
+$tgico-largepause: "\e951";
+$tgico-largeplay: "\e952";
+$tgico-left: "\e953";
+$tgico-link: "\e954";
+$tgico-listscreenshare: "\e955";
+$tgico-livelocation: "\e956";
+$tgico-location: "\e957";
+$tgico-lock: "\e958";
+$tgico-lockoff: "\e959";
+$tgico-loginlogodesktop: "\e95a";
+$tgico-loginlogomobile: "\e95b";
+$tgico-logout: "\e95c";
+$tgico-mention: "\e95d";
+$tgico-menu: "\e95e";
+$tgico-message: "\e95f";
+$tgico-messageunread: "\e960";
+$tgico-microphone: "\e961";
+$tgico-minus: "\e962";
+$tgico-monospace: "\e963";
+$tgico-more: "\e964";
+$tgico-mute: "\e965";
+$tgico-muted: "\e966";
+$tgico-newchannel: "\e967";
+$tgico-newchat_filled: "\e968";
+$tgico-newgroup: "\e969";
+$tgico-newprivate: "\e96a";
+$tgico-next: "\e96b";
+$tgico-noncontacts: "\e96c";
+$tgico-nosound: "\e96d";
+$tgico-passwordoff: "\e96e";
+$tgico-pause: "\e96f";
+$tgico-permissions: "\e970";
+$tgico-phone: "\e971";
+$tgico-pin: "\e972";
+$tgico-pinlist: "\e973";
+$tgico-pinned_filled: "\e974";
+$tgico-pinnedchat: "\e975";
+$tgico-play: "\e976";
+$tgico-plus: "\e977";
+$tgico-poll: "\e978";
+$tgico-previous: "\e979";
+$tgico-radiooff: "\e97a";
+$tgico-radioon: "\e97b";
+$tgico-readchats: "\e97c";
+$tgico-recent: "\e97d";
+$tgico-replace: "\e97e";
+$tgico-reply_filled: "\e97f";
+$tgico-reply: "\e980";
+$tgico-rightpanel: "\e981";
+$tgico-saved: "\e982";
+$tgico-savedmessages: "\e983";
+$tgico-schedule: "\e984";
+$tgico-scheduled: "\e985";
+$tgico-search: "\e986";
+$tgico-select: "\e987";
+$tgico-send: "\e988";
+$tgico-send2: "\e989";
+$tgico-sending: "\e98a";
+$tgico-sendingerror: "\e98b";
+$tgico-settings_filled: "\e98c";
+$tgico-settings: "\e98d";
+$tgico-sharescreen_filled: "\e98e";
+$tgico-smallscreen: "\e98f";
+$tgico-smile: "\e990";
+$tgico-spoiler: "\e991";
+$tgico-sport: "\e992";
+$tgico-stickers: "\e993";
+$tgico-stop: "\e994";
+$tgico-strikethrough: "\e995";
+$tgico-textedit: "\e996";
+$tgico-tip: "\e997";
+$tgico-tools: "\e998";
+$tgico-unarchive: "\e999";
+$tgico-underline: "\e99a";
+$tgico-unmute: "\e99b";
+$tgico-unpin: "\e99c";
+$tgico-unread: "\e99d";
+$tgico-up: "\e99e";
+$tgico-user: "\e99f";
+$tgico-username: "\e9a0";
+$tgico-videocamera_filled: "\e9a1";
+$tgico-videocamera: "\e9a2";
+$tgico-videochat: "\e9a3";
+$tgico-zoomin: "\e9a4";
+$tgico-zoomout: "\e9a5";
diff --git a/tweb-design b/tweb-design
index d10c87ef..2c4d0858 160000
--- a/tweb-design
+++ b/tweb-design
@@ -1 +1 @@
-Subproject commit d10c87ef1aec54cdd2e506fcd980ea848e60eedc
+Subproject commit 2c4d08587b77a388d4beb8bc018dcb56ebd8a589