diff --git a/public/assets/fonts/tgico.svg b/public/assets/fonts/tgico.svg index f9af25a38..3a9468c65 100644 --- a/public/assets/fonts/tgico.svg +++ b/public/assets/fonts/tgico.svg @@ -88,128 +88,133 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/assets/fonts/tgico.ttf b/public/assets/fonts/tgico.ttf index 99e3607cc..d6a41d41c 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 9be48779e..4e568401a 100644 Binary files a/public/assets/fonts/tgico.woff and b/public/assets/fonts/tgico.woff differ diff --git a/src/components/dialogsContextMenu.ts b/src/components/dialogsContextMenu.ts index 0a772faf9..ebc5ff213 100644 --- a/src/components/dialogsContextMenu.ts +++ b/src/components/dialogsContextMenu.ts @@ -101,7 +101,7 @@ export default class DialogsContextMenu { onClick: this.onArchiveClick, verify: () => this.filterId === 1 && this.peerId !== rootScope.myId }, { - icon: 'eye2', + icon: 'hide', text: 'Hide', onClick: this.hideTopic, verify: async() => { diff --git a/src/components/emoticonsDropdown/tabs/stickers.ts b/src/components/emoticonsDropdown/tabs/stickers.ts index 6f4539786..3b81a7370 100644 --- a/src/components/emoticonsDropdown/tabs/stickers.ts +++ b/src/components/emoticonsDropdown/tabs/stickers.ts @@ -232,11 +232,15 @@ export class StickersTabCategory { this.applyMediaSpoiler(item); }, verify: () => isMedia && !item.mediaSpoiler }, { - icon: 'spoiler', + icon: 'mediaspoileroff', text: 'DisablePhotoSpoiler', onClick: () => { toggleMediaSpoiler({ diff --git a/src/scss/tgico/_style.scss b/src/scss/tgico/_style.scss index e3ae4b056..d179c0f21 100644 --- a/src/scss/tgico/_style.scss +++ b/src/scss/tgico/_style.scss @@ -3,9 +3,9 @@ @font-face { font-family: '#{$tgico-font-family}'; src: - url('#{$tgico-font-path}/#{$tgico-font-family}.ttf?vqhlcw') format('truetype'), - url('#{$tgico-font-path}/#{$tgico-font-family}.woff?vqhlcw') format('woff'), - url('#{$tgico-font-path}/#{$tgico-font-family}.svg?vqhlcw##{$tgico-font-family}') format('svg'); + url('#{$tgico-font-path}/#{$tgico-font-family}.ttf?ivbp49') format('truetype'), + url('#{$tgico-font-path}/#{$tgico-font-family}.woff?ivbp49') format('woff'), + url('#{$tgico-font-path}/#{$tgico-font-family}.svg?ivbp49##{$tgico-font-family}') format('svg'); font-weight: normal; font-style: normal; font-display: block; @@ -437,11 +437,26 @@ content: $tgico-group; } } +.tgico-groupmedia { + &:before { + content: $tgico-groupmedia; + } +} +.tgico-groupmediaoff { + &:before { + content: $tgico-groupmediaoff; + } +} .tgico-help { &:before { content: $tgico-help; } } +.tgico-hide { + &:before { + content: $tgico-hide; + } +} .tgico-image { &:before { content: $tgico-image; @@ -567,6 +582,16 @@ content: $tgico-logout; } } +.tgico-mediaspoiler { + &:before { + content: $tgico-mediaspoiler; + } +} +.tgico-mediaspoileroff { + &:before { + content: $tgico-mediaspoileroff; + } +} .tgico-mention { &:before { content: $tgico-mention; diff --git a/src/scss/tgico/_variables.scss b/src/scss/tgico/_variables.scss index d04cd9aa2..664cc12c6 100644 --- a/src/scss/tgico/_variables.scss +++ b/src/scss/tgico/_variables.scss @@ -79,128 +79,133 @@ $tgico-gc_microphone: "\e94d"; $tgico-gc_microphoneoff: "\e94e"; $tgico-gifs: "\e94f"; $tgico-group: "\e950"; -$tgico-help: "\e951"; -$tgico-image: "\e952"; -$tgico-info: "\e953"; -$tgico-info2: "\e954"; -$tgico-italic: "\e955"; -$tgico-keyboard: "\e956"; -$tgico-lamp: "\e957"; -$tgico-language: "\e958"; -$tgico-largepause: "\e959"; -$tgico-largeplay: "\e95a"; -$tgico-left: "\e95b"; -$tgico-limit_chat: "\e95c"; -$tgico-limit_chats: "\e95d"; -$tgico-limit_file: "\e95e"; -$tgico-limit_folders: "\e95f"; -$tgico-limit_link: "\e960"; -$tgico-limit_pin: "\e961"; -$tgico-link: "\e962"; -$tgico-listscreenshare: "\e963"; -$tgico-livelocation: "\e964"; -$tgico-location: "\e965"; -$tgico-lock: "\e966"; -$tgico-lockoff: "\e967"; -$tgico-loginlogodesktop: "\e968"; -$tgico-loginlogomobile: "\e969"; -$tgico-logout: "\e96a"; -$tgico-mention: "\e96b"; -$tgico-menu: "\e96c"; -$tgico-message: "\e96d"; -$tgico-messageunread: "\e96e"; -$tgico-microphone: "\e96f"; -$tgico-microphone_crossed: "\e970"; -$tgico-microphone_crossed_filled: "\e971"; -$tgico-microphone_filled: "\e972"; -$tgico-minus: "\e973"; -$tgico-monospace: "\e974"; -$tgico-more: "\e975"; -$tgico-mute: "\e976"; -$tgico-muted: "\e977"; -$tgico-newchannel: "\e978"; -$tgico-newchat_filled: "\e979"; -$tgico-newgroup: "\e97a"; -$tgico-newprivate: "\e97b"; -$tgico-next: "\e97c"; -$tgico-noncontacts: "\e97d"; -$tgico-nosound: "\e97e"; -$tgico-passwordoff: "\e97f"; -$tgico-pause: "\e980"; -$tgico-permissions: "\e981"; -$tgico-phone: "\e982"; -$tgico-pin: "\e983"; -$tgico-pinlist: "\e984"; -$tgico-pinned_filled: "\e985"; -$tgico-pinnedchat: "\e986"; -$tgico-pip: "\e987"; -$tgico-play: "\e988"; -$tgico-playback_05: "\e989"; -$tgico-playback_15: "\e98a"; -$tgico-playback_1x: "\e98b"; -$tgico-playback_2x: "\e98c"; -$tgico-plus: "\e98d"; -$tgico-poll: "\e98e"; -$tgico-premium_addone: "\e98f"; -$tgico-premium_double: "\e990"; -$tgico-premium_lock: "\e991"; -$tgico-premium_unlock: "\e992"; -$tgico-previous: "\e993"; -$tgico-radiooff: "\e994"; -$tgico-radioon: "\e995"; -$tgico-reactions: "\e996"; -$tgico-readchats: "\e997"; -$tgico-recent: "\e998"; -$tgico-replace: "\e999"; -$tgico-reply: "\e99a"; -$tgico-reply_filled: "\e99b"; -$tgico-rightpanel: "\e99c"; -$tgico-rotate_left: "\e99d"; -$tgico-rotate_right: "\e99e"; -$tgico-saved: "\e99f"; -$tgico-savedmessages: "\e9a0"; -$tgico-schedule: "\e9a1"; -$tgico-scheduled: "\e9a2"; -$tgico-search: "\e9a3"; -$tgico-select: "\e9a4"; -$tgico-send: "\e9a5"; -$tgico-send2: "\e9a6"; -$tgico-sending: "\e9a7"; -$tgico-sendingerror: "\e9a8"; -$tgico-settings: "\e9a9"; -$tgico-settings_filled: "\e9aa"; -$tgico-sharescreen_filled: "\e9ab"; -$tgico-shipping: "\e9ac"; -$tgico-shuffle: "\e9ad"; -$tgico-smallscreen: "\e9ae"; -$tgico-smile: "\e9af"; -$tgico-spoiler: "\e9b0"; -$tgico-sport: "\e9b1"; -$tgico-star: "\e9b2"; -$tgico-stickers: "\e9b3"; -$tgico-stickers_face: "\e9b4"; -$tgico-stop: "\e9b5"; -$tgico-strikethrough: "\e9b6"; -$tgico-textedit: "\e9b7"; -$tgico-tip: "\e9b8"; -$tgico-tools: "\e9b9"; -$tgico-topics: "\e9ba"; -$tgico-unarchive: "\e9bb"; -$tgico-underline: "\e9bc"; -$tgico-unmute: "\e9bd"; -$tgico-unpin: "\e9be"; -$tgico-unread: "\e9bf"; -$tgico-up: "\e9c0"; -$tgico-user: "\e9c1"; -$tgico-username: "\e9c2"; -$tgico-videocamera: "\e9c3"; -$tgico-videocamera_crossed_filled: "\e9c4"; -$tgico-videocamera_filled: "\e9c5"; -$tgico-videochat: "\e9c6"; -$tgico-volume_down: "\e9c7"; -$tgico-volume_mute: "\e9c8"; -$tgico-volume_off: "\e9c9"; -$tgico-volume_up: "\e9ca"; -$tgico-zoomin: "\e9cb"; -$tgico-zoomout: "\e9cc"; +$tgico-groupmedia: "\e951"; +$tgico-groupmediaoff: "\e952"; +$tgico-help: "\e953"; +$tgico-hide: "\e954"; +$tgico-image: "\e955"; +$tgico-info: "\e956"; +$tgico-info2: "\e957"; +$tgico-italic: "\e958"; +$tgico-keyboard: "\e959"; +$tgico-lamp: "\e95a"; +$tgico-language: "\e95b"; +$tgico-largepause: "\e95c"; +$tgico-largeplay: "\e95d"; +$tgico-left: "\e95e"; +$tgico-limit_chat: "\e95f"; +$tgico-limit_chats: "\e960"; +$tgico-limit_file: "\e961"; +$tgico-limit_folders: "\e962"; +$tgico-limit_link: "\e963"; +$tgico-limit_pin: "\e964"; +$tgico-link: "\e965"; +$tgico-listscreenshare: "\e966"; +$tgico-livelocation: "\e967"; +$tgico-location: "\e968"; +$tgico-lock: "\e969"; +$tgico-lockoff: "\e96a"; +$tgico-loginlogodesktop: "\e96b"; +$tgico-loginlogomobile: "\e96c"; +$tgico-logout: "\e96d"; +$tgico-mediaspoiler: "\e96e"; +$tgico-mediaspoileroff: "\e96f"; +$tgico-mention: "\e970"; +$tgico-menu: "\e971"; +$tgico-message: "\e972"; +$tgico-messageunread: "\e973"; +$tgico-microphone: "\e974"; +$tgico-microphone_crossed: "\e975"; +$tgico-microphone_crossed_filled: "\e976"; +$tgico-microphone_filled: "\e977"; +$tgico-minus: "\e978"; +$tgico-monospace: "\e979"; +$tgico-more: "\e97a"; +$tgico-mute: "\e97b"; +$tgico-muted: "\e97c"; +$tgico-newchannel: "\e97d"; +$tgico-newchat_filled: "\e97e"; +$tgico-newgroup: "\e97f"; +$tgico-newprivate: "\e980"; +$tgico-next: "\e981"; +$tgico-noncontacts: "\e982"; +$tgico-nosound: "\e983"; +$tgico-passwordoff: "\e984"; +$tgico-pause: "\e985"; +$tgico-permissions: "\e986"; +$tgico-phone: "\e987"; +$tgico-pin: "\e988"; +$tgico-pinlist: "\e989"; +$tgico-pinned_filled: "\e98a"; +$tgico-pinnedchat: "\e98b"; +$tgico-pip: "\e98c"; +$tgico-play: "\e98d"; +$tgico-playback_05: "\e98e"; +$tgico-playback_15: "\e98f"; +$tgico-playback_1x: "\e990"; +$tgico-playback_2x: "\e991"; +$tgico-plus: "\e992"; +$tgico-poll: "\e993"; +$tgico-premium_addone: "\e994"; +$tgico-premium_double: "\e995"; +$tgico-premium_lock: "\e996"; +$tgico-premium_unlock: "\e997"; +$tgico-previous: "\e998"; +$tgico-radiooff: "\e999"; +$tgico-radioon: "\e99a"; +$tgico-reactions: "\e99b"; +$tgico-readchats: "\e99c"; +$tgico-recent: "\e99d"; +$tgico-replace: "\e99e"; +$tgico-reply: "\e99f"; +$tgico-reply_filled: "\e9a0"; +$tgico-rightpanel: "\e9a1"; +$tgico-rotate_left: "\e9a2"; +$tgico-rotate_right: "\e9a3"; +$tgico-saved: "\e9a4"; +$tgico-savedmessages: "\e9a5"; +$tgico-schedule: "\e9a6"; +$tgico-scheduled: "\e9a7"; +$tgico-search: "\e9a8"; +$tgico-select: "\e9a9"; +$tgico-send: "\e9aa"; +$tgico-send2: "\e9ab"; +$tgico-sending: "\e9ac"; +$tgico-sendingerror: "\e9ad"; +$tgico-settings: "\e9ae"; +$tgico-settings_filled: "\e9af"; +$tgico-sharescreen_filled: "\e9b0"; +$tgico-shipping: "\e9b1"; +$tgico-shuffle: "\e9b2"; +$tgico-smallscreen: "\e9b3"; +$tgico-smile: "\e9b4"; +$tgico-spoiler: "\e9b5"; +$tgico-sport: "\e9b6"; +$tgico-star: "\e9b7"; +$tgico-stickers: "\e9b8"; +$tgico-stickers_face: "\e9b9"; +$tgico-stop: "\e9ba"; +$tgico-strikethrough: "\e9bb"; +$tgico-textedit: "\e9bc"; +$tgico-tip: "\e9bd"; +$tgico-tools: "\e9be"; +$tgico-topics: "\e9bf"; +$tgico-unarchive: "\e9c0"; +$tgico-underline: "\e9c1"; +$tgico-unmute: "\e9c2"; +$tgico-unpin: "\e9c3"; +$tgico-unread: "\e9c4"; +$tgico-up: "\e9c5"; +$tgico-user: "\e9c6"; +$tgico-username: "\e9c7"; +$tgico-videocamera: "\e9c8"; +$tgico-videocamera_crossed_filled: "\e9c9"; +$tgico-videocamera_filled: "\e9ca"; +$tgico-videochat: "\e9cb"; +$tgico-volume_down: "\e9cc"; +$tgico-volume_mute: "\e9cd"; +$tgico-volume_off: "\e9ce"; +$tgico-volume_up: "\e9cf"; +$tgico-zoomin: "\e9d0"; +$tgico-zoomout: "\e9d1";