diff --git a/app/img/icons/IconsetSmiles.png b/app/img/icons/IconsetSmiles.png index 7ee73406..cb3d33c2 100644 Binary files a/app/img/icons/IconsetSmiles.png and b/app/img/icons/IconsetSmiles.png differ diff --git a/app/img/icons/IconsetSmiles_2x.png b/app/img/icons/IconsetSmiles_2x.png index b05da5ed..6ab3eee1 100644 Binary files a/app/img/icons/IconsetSmiles_2x.png and b/app/img/icons/IconsetSmiles_2x.png differ diff --git a/app/js/directives.js b/app/js/directives.js index 8de7a681..586fe7f5 100755 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -2659,7 +2659,7 @@ angular.module('myApp.directives', ['myApp.filters']) element.html( (chat.rTitle || '').valueOf() + - (attrs.verified && chat.pFlags.verified ? ' ' : '') + (attrs.verified && chat.pFlags && chat.pFlags.verified ? ' ' : '') ); } }; diff --git a/app/js/messages_manager.js b/app/js/messages_manager.js index 5cf4fd95..160beb60 100644 --- a/app/js/messages_manager.js +++ b/app/js/messages_manager.js @@ -192,7 +192,6 @@ angular.module('myApp.services') var peerID = AppPeersManager.getPeerID(dialog.peer); var channelID = -peerID; saveChannelDialog(channelID, dialog); - NotificationsManager.savePeerSettings(peerID, dialog.notify_settings); ApiUpdatesManager.addChannelState(channelID, dialog.pts); }); allChannelsLoaded = true; diff --git a/app/less/app.less b/app/less/app.less index 8c6a85ec..fec99eb6 100644 --- a/app/less/app.less +++ b/app/less/app.less @@ -1124,7 +1124,7 @@ i.icon-verified { height: 17px; vertical-align: text-top; .image-2x('../img/icons/ProfileIcons.png', 40px, 420px); - background-position: -10px -373px; + background-position: -11px -373px; .im_dialogs_scrollable_wrap & { display: none; @@ -2537,16 +2537,16 @@ img.img_fullsize { .active .composer_emoji_tooltip_category_flower {background-position: -3px -155px; } /* Bell */ -.composer_emoji_tooltip_category_bell {background-position: -3px -184px; } -.active .composer_emoji_tooltip_category_bell {background-position: -3px -215px; } +.composer_emoji_tooltip_category_bell {background-position: -3px -185px; } +.active .composer_emoji_tooltip_category_bell {background-position: -3px -213px; } /* Car */ -.composer_emoji_tooltip_category_car {background-position: -3px -245px; } -.active .composer_emoji_tooltip_category_car {background-position: -3px -276px; } +.composer_emoji_tooltip_category_car {background-position: -3px -241px; } +.active .composer_emoji_tooltip_category_car {background-position: -3px -269px; } /* Grid */ -.composer_emoji_tooltip_category_grid {background-position: -3px -304px; } -.active .composer_emoji_tooltip_category_grid {background-position: -3px -335px; } +.composer_emoji_tooltip_category_grid {background-position: -3px -297px; } +.active .composer_emoji_tooltip_category_grid {background-position: -3px -324px; } .composer_emoji_tooltip_tabs_wrap {