From 3c3de236401d139ab498d3e07e341d1ae85e5c7d Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Fri, 2 Jan 2015 17:04:14 +0100 Subject: [PATCH] Improved bottom panel styles --- app/css/app.css | 11 ----------- app/css/desktop.css | 11 ++++++++--- app/css/mobile.css | 1 + app/js/directives.js | 2 +- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/app/css/app.css b/app/css/app.css index aec7907e..6bde250d 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -2363,17 +2363,6 @@ img.chat_modal_participant_photo { /* Messages edit panel */ -.im_edit_panel_border { - display: block; - margin: 0 0 34px 3px; - border-bottom: 1px solid #EEE; -} -.im_panel_to_top .im_edit_panel_wrap { - background: #FFF; - position: absolute; - width: 100%; -} - .im_edit_selected_actions { text-align: center; } diff --git a/app/css/desktop.css b/app/css/desktop.css index 599f00c9..51905fcf 100644 --- a/app/css/desktop.css +++ b/app/css/desktop.css @@ -535,8 +535,8 @@ a.footer_link.active:active { .im_history_typing_wrap { line-height: 18px; width: 100%; - height: 49px; - padding: 13px 0 18px; + height: 39px; + padding: 13px 0 8px; overflow: hidden; -webkit-user-select: none; } @@ -607,9 +607,14 @@ a.footer_link.active:active { } .im_edit_panel_wrap { - padding: 15px 0 38px; + padding: 0px 0 38px; margin: 0 24px 0 12px; } +.im_edit_panel_border { + display: block; + margin: 0 0 49px 3px; + border-bottom: 1px solid #EEE; +} .im_edit_flush_link, .im_edit_cancel_link { display: block; diff --git a/app/css/mobile.css b/app/css/mobile.css index 17921a2a..e02939ec 100644 --- a/app/css/mobile.css +++ b/app/css/mobile.css @@ -29,6 +29,7 @@ html { margin: 0; } .tg_page_head .navbar-inverse { + background: #5682a3; border: 0; -webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.11); diff --git a/app/js/directives.js b/app/js/directives.js index 5d72d66a..7f5b0edf 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -1034,7 +1034,7 @@ angular.module('myApp.directives', ['myApp.filters']) var marginTop = scrollableWrap.offsetHeight - historyMessagesEl.offsetHeight - 20 - - (Config.Mobile ? 0 : 49); + - (Config.Mobile ? 0 : 39); if (historyMessagesEl.offsetHeight > 0 && marginTop > 0) { $(historyMessagesEl).css({marginTop: marginTop});