From a5c2d9962ae55d0a21991a5762165b4b286c42c3 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Tue, 19 May 2015 15:05:29 +0300 Subject: [PATCH 1/5] Fixed sessions list styles --- app/js/directives.js | 4 ++-- app/less/app.less | 15 ++++++++++----- app/partials/desktop/sessions_list_modal.html | 11 ++++------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/app/js/directives.js b/app/js/directives.js index 0497316c..5066c9bc 100755 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -914,8 +914,8 @@ angular.module('myApp.directives', ['myApp.filters']) function updateSizes () { $(element).css({ - height: $($window).height() - - (Config.Mobile ? 46 + 18 : 200) + height: Math.min(760, $($window).height() + - (Config.Mobile ? 46 + 18 : 200)) }); $(sessionsWrap).nanoScroller(); } diff --git a/app/less/app.less b/app/less/app.less index ca42724b..e359c45b 100644 --- a/app/less/app.less +++ b/app/less/app.less @@ -2863,7 +2863,7 @@ a.contacts_modal_contact:hover .md_modal_list_peer_description, .sessions_modal { &_session { - padding: 8px 16px; + padding: 8px 24px; } &_sessions_header { color: #999; @@ -2873,12 +2873,12 @@ a.contacts_modal_contact:hover .md_modal_list_peer_description, font-weight: bold; } &_terminate_all_wrap { - margin: 5px 0 5px; - text-align: center; + margin: 5px 0 0 24px; } } .sessions_modal_sessions_list { - margin-bottom: 20px; + padding: 14px 0 10px; + margin-bottom: 10px; } .session_active_date_online { color: #3a6d99; @@ -2898,7 +2898,8 @@ a.contacts_modal_contact:hover .md_modal_list_peer_description, text-align: right; } .session_terminate_btn { - margin-top: 17px; + margin-top: 24px; + display: inline-block; } .sessions_modal_session_app { font-weight: bold; @@ -2912,6 +2913,10 @@ a.contacts_modal_contact:hover .md_modal_list_peer_description, color: #777; } +.sessions_modal_other_splitter { + margin: 15px 0 20px 24px; +} + .modal-dialog { .md_simple_modal_window &, .confirm_modal_window &, diff --git a/app/partials/desktop/sessions_list_modal.html b/app/partials/desktop/sessions_list_modal.html index 2d82651e..2f5e4840 100644 --- a/app/partials/desktop/sessions_list_modal.html +++ b/app/partials/desktop/sessions_list_modal.html @@ -25,17 +25,14 @@