diff --git a/app/img/icons/ProfileIcons.png b/app/img/icons/ProfileIcons.png index 2051aa10..2f66bf58 100644 Binary files a/app/img/icons/ProfileIcons.png and b/app/img/icons/ProfileIcons.png differ diff --git a/app/img/icons/ProfileIcons_2x.png b/app/img/icons/ProfileIcons_2x.png index 346bb16d..5c24baf1 100644 Binary files a/app/img/icons/ProfileIcons_2x.png and b/app/img/icons/ProfileIcons_2x.png differ diff --git a/app/js/directives.js b/app/js/directives.js index cdc70e34..3b806509 100755 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -1279,6 +1279,7 @@ angular.module('myApp.directives', ['myApp.filters']) }); $scope.$on('ui_panel_update', function (e, data) { + updateSizes(); onContentLoaded(function () { updateSizes(); if (data && data.blur) { @@ -2639,7 +2640,8 @@ angular.module('myApp.directives', ['myApp.filters']) var chat = AppChatsManager.getChat(-peerID); element.html( - (chat.rTitle || '').valueOf() + (chat.rTitle || '').valueOf() + + (attrs.verified && chat.pFlags.verified ? ' ' : '') ); } }; diff --git a/app/less/app.less b/app/less/app.less index a7c16a5c..99b15555 100644 --- a/app/less/app.less +++ b/app/less/app.less @@ -12,8 +12,7 @@ body { color: #000; background: none; font: 12px/18px 'Open Sans', "Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, Verdana, sans-serif; - overflow: visible; - overflow-x: hidden; + overflow: hidden; &.non_osx { font: 13px/18px Tahoma, sans-serif, Arial, Helvetica; @@ -1119,6 +1118,23 @@ i.icon-search-clear { background-position: -15px -192px; } +i.icon-verified { + display: inline-block; + width: 17px; + height: 17px; + vertical-align: text-top; + .image-2x('../img/icons/ProfileIcons.png', 40px, 420px); + background-position: -10px -373px; + + .im_dialogs_scrollable_wrap & { + display: none; + } + .im_dialogs_col_search & { + display: inline-block; + } + +} + .im_dialogs_tabs_wrap { display: none; } diff --git a/app/partials/desktop/channel_modal.html b/app/partials/desktop/channel_modal.html index fdb6e34c..885d6c92 100644 --- a/app/partials/desktop/channel_modal.html +++ b/app/partials/desktop/channel_modal.html @@ -17,7 +17,7 @@