From 11162b9f77f11fc06ed151846551cc9cffd1c70b Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Wed, 17 Sep 2014 22:24:12 +0400 Subject: [PATCH] Improved mobile views --- app/css/app.css | 28 ++++++-------- app/css/desktop.css | 7 ++++ app/css/mobile.css | 24 ++++++++++++ app/js/controllers.js | 1 + app/js/directives.js | 1 - app/partials/mobile/contacts_modal.html | 48 +++++++++++++----------- app/partials/mobile/im.html | 10 +++-- app/partials/mobile/login.html | 6 +-- app/partials/mobile/phonebook_modal.html | 12 +++--- 9 files changed, 87 insertions(+), 50 deletions(-) diff --git a/app/css/app.css b/app/css/app.css index 78e56e2a..5265cf30 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -65,14 +65,23 @@ input[type="number"]::-webkit-inner-spin-button { input[type="number"] { -moz-appearance:textfield; } - -.btn-primary:focus { +.btn { + border: 0; + padding: 7px 13px; +} +.btn:hover, +.btn:active, +.btn.active, +.btn:focus, +.btn:active:focus, +.btn.active:focus, +.open .dropdown-toggle.btn { + box-shadow: none; outline: none; } .btn-success { color: #ffffff; background-color: #6AC065; - border-color: #6AC065; } .btn-success:hover, @@ -82,7 +91,6 @@ input[type="number"] { .open .dropdown-toggle.btn-success { color: #ffffff; background-color: #61b75b; - border-color: #61b75b; } .btn-success:active, @@ -96,7 +104,6 @@ input[type="number"] { .btn-danger { color: #ffffff; background-color: #c05f5a; - border-color: #c05f5a; } .btn-danger:hover, .btn-danger:focus, @@ -105,7 +112,6 @@ input[type="number"] { .open .dropdown-toggle.btn-danger { color: #ffffff; background-color: #ab5450; - border-color: #ab5450; } .btn-danger:active, .btn-danger.active, @@ -118,7 +124,6 @@ input[type="number"] { .btn-primary { color: #ffffff; background-color: #5d8db3; - border-color: #5d8db3; border-radius: 3px; } .btn-primary:hover, @@ -128,7 +133,6 @@ input[type="number"] { .open .dropdown-toggle.btn-primary { color: #ffffff; background-color: #4a80a9; - border-color: #4a80a9; } .btn-primary:active, .btn-primary.active, @@ -139,7 +143,6 @@ input[type="number"] { .btn-primary[disabled], .btn-primary.disabled { background: #7999b3; - border-color: #7999b3; } .btn-link { color: #3a6d99; @@ -156,7 +159,6 @@ input[type="number"] { } .btn-link.dropdown-toggle:active { outline: none; - box-shadow: none; } .tg_page_head .navbar-quick-nav, @@ -1783,12 +1785,6 @@ span.emoji { left: 62px; right: 62px; } -.im_submit { - padding: 5px 12px; - font-size: 13px; - line-height: 17px; - min-width: 60px; -} .im_send_dropbox_wrap { background: #FFF; diff --git a/app/css/desktop.css b/app/css/desktop.css index 40b06895..4663e0ad 100644 --- a/app/css/desktop.css +++ b/app/css/desktop.css @@ -241,6 +241,13 @@ opacity: 1; } +.im_submit { + padding: 6px 13px; + font-size: 13px; + line-height: 17px; + min-width: 60px; +} + @media (max-width: 900px) { diff --git a/app/css/mobile.css b/app/css/mobile.css index f82e4196..44b63cd5 100644 --- a/app/css/mobile.css +++ b/app/css/mobile.css @@ -17,6 +17,7 @@ html { .tg_page_head .navbar > .container .navbar-brand { padding-left: 9px; + outline: none; } .im_history_panel_edit_link { margin-right: 0; @@ -295,6 +296,29 @@ html { -webkit-box-shadow: none; margin: 30px auto 20px; } +.login_form_wrap .btn-primary { + padding: 12px 13px; +} +.login_phone_country, +.login_phone_number { + height: 42px; +} + +.im_dialogs_empty_header { + font-size: 19px; + margin-bottom: 10px; +} +.im_dialogs_empty_lead { + font-size: 14px; + line-height: 160%; +} +.im_dialogs_add_contact, +.im_dialogs_import_phonebook { + padding: 12px 13px; +} +.im_dialogs_add_contact + .im_dialogs_import_phonebook { + margin-top: 10px; +} .im_page_wrap { background: none; diff --git a/app/js/controllers.js b/app/js/controllers.js index ecb63897..4e250190 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -2326,6 +2326,7 @@ angular.module('myApp.controllers', []) }); AppUsersManager.deleteContacts(selectedUserIDs).then(function () { resetSelected(); + $scope.action = ''; updateContacts($scope.search.query); }); } diff --git a/app/js/directives.js b/app/js/directives.js index 3f04d21c..5e194280 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -43,7 +43,6 @@ angular.module('myApp.directives', ['myApp.filters']) }; function link($scope, element, attrs) { - console.log(111); var selected = false, grouped = false, focused = false, diff --git a/app/partials/mobile/contacts_modal.html b/app/partials/mobile/contacts_modal.html index 257779e5..59353867 100644 --- a/app/partials/mobile/contacts_modal.html +++ b/app/partials/mobile/contacts_modal.html @@ -4,17 +4,38 @@