diff --git a/app/css/app.css b/app/css/app.css index abc12d46..aec7907e 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -727,7 +727,7 @@ a.tg_radio_on:hover i.icon-radio { /* Login page */ .login_head_bg { - background: #537c9a; + background: #5682a3; height: 226px; } .login_page { diff --git a/app/css/desktop.css b/app/css/desktop.css index a6b17f6a..599f00c9 100644 --- a/app/css/desktop.css +++ b/app/css/desktop.css @@ -4,7 +4,7 @@ max-width: 1010px; margin: 0 auto; height: 48px; - background: #517b9b; + background: #5682a3; } .tg_head_logo_wrap { float: left; @@ -28,7 +28,7 @@ .tg_head_btn:hover { color: #FFF; text-decoration: none; - background: #3f6c8c; + background: #497799; } .tg_head_logo_dropdown .dropdown-toggle { @@ -237,6 +237,7 @@ font-size: 13px; line-height: 20px; float: left; + font-weight: bold; } .icon-filter-photos, .icon-filter-video, @@ -542,9 +543,9 @@ a.footer_link.active:active { .im_history_typing { font-size: 11px; color: #999; - max-width: 526px; + max-width: 556px; margin: 0 auto; - padding: 0 77px 0 71px; + padding: 0 81px 0 85px; } .im_history_typing a.im_history_typing_author { color: #999; @@ -1296,6 +1297,9 @@ a.im_panel_peer_photo .peer_initials { .im_grouped_short .im_content_message_wrap { margin: 6px 10px 6px 16px } +.im_grouped_short:last-child .im_content_message_wrap { + margin-bottom: 8px; +} @media (min-width: 901px) { .im_message_wrap { position: relative; diff --git a/app/img/icons/General.png b/app/img/icons/General.png index 0d04d5be..b6f3fdf6 100644 Binary files a/app/img/icons/General.png and b/app/img/icons/General.png differ diff --git a/app/img/icons/General_1x.png b/app/img/icons/General_1x.png index 2cc98ffe..271503ca 100644 Binary files a/app/img/icons/General_1x.png and b/app/img/icons/General_1x.png differ diff --git a/app/js/directives.js b/app/js/directives.js index a9177214..a9b28c07 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -858,10 +858,10 @@ angular.module('myApp.directives', ['myApp.filters']) var pr = parseInt($(scrollableWrap).css('paddingRight')) $(scrollableWrap).addClass('im_history_to_bottom'); scrollableWrap.scrollHeight; // Some strange Chrome bug workaround - $(scrollable).css({bottom: 0, marginLeft: -Math.ceil(pr / 2)}); + $(scrollable).css({bottom: 0, paddingRight: pr}); onContentLoaded(function () { $(scrollableWrap).removeClass('im_history_to_bottom'); - $(scrollable).css({bottom: '', marginLeft: ''}); + $(scrollable).css({bottom: '', paddingRight: ''}); updateSizes(true); moreNotified = false; lessNotified = false; @@ -889,11 +889,11 @@ angular.module('myApp.directives', ['myApp.filters']) $(scrollableWrap).addClass('im_history_to_bottom'); scrollableWrap.scrollHeight; // Some strange Chrome bug workaround - $(scrollable).css({bottom: -(sh - st - ch), marginLeft: -Math.ceil(pr / 2)}); + $(scrollable).css({bottom: -(sh - st - ch), paddingRight: pr}); var upd = function () { $(scrollableWrap).removeClass('im_history_to_bottom'); - $(scrollable).css({bottom: '', marginLeft: ''}); + $(scrollable).css({bottom: '', paddingRight: ''}); if (scrollTopInitial >= 0) { changeScroll(); } else {