From 8849072e930915e505f9723a3469185d78fb8ea0 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Fri, 19 Sep 2014 10:20:05 +0400 Subject: [PATCH] Improved mobile layout Refactor styles Remove unused mobile styles Added new modals for mobile --- app/css/app.css | 775 ++---------------- app/css/desktop.css | 605 +++++++++++++- app/css/mobile.css | 72 +- app/js/controllers.js | 22 +- app/js/directives.js | 2 +- app/js/services.js | 35 +- app/partials/desktop/im.html | 10 - app/partials/desktop/message.html | 1 - app/partials/mobile/changelog_modal.html | 2 +- app/partials/mobile/chat_create_modal.html | 41 +- app/partials/mobile/chat_edit_modal.html | 41 +- app/partials/mobile/contacts_modal.html | 5 + app/partials/mobile/edit_contact_modal.html | 45 +- app/partials/mobile/im.html | 47 +- app/partials/mobile/import_contact_modal.html | 46 +- app/partials/mobile/message.html | 8 - app/partials/mobile/message_attach_audio.html | 3 - .../mobile/message_attach_document.html | 4 - app/partials/mobile/message_attach_video.html | 20 - app/partials/mobile/profile_edit_modal.html | 47 +- .../jquery.emojiarea/jquery.emojiarea.js | 1 - 21 files changed, 846 insertions(+), 986 deletions(-) diff --git a/app/css/app.css b/app/css/app.css index 5265cf30..1b060270 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -4,14 +4,12 @@ html { display: none; background: #dee4e9 url(../img/bg_tile.png) 0 0 repeat; overflow: visible; - /*background-size: 300px 468px;*/ } body { color: #000; background: none; font: 12px/18px "Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, Verdana, sans-serif; overflow: visible; - /*-webkit-font-smoothing: antialiased;*/ } .font-light { font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Light", Helvetica, Arial , Verdana, sans-serif; @@ -186,7 +184,7 @@ input[type="number"] { .ios_standalone .tg_page_head .navbar > .container { margin-top: 20px; } -.ios_standalone .modal.page_modal { +.ios_standalone .modal.mobile_modal { border-top: 20px solid #497495; } .tg_page_head .navbar > .container .navbar-brand { @@ -315,9 +313,6 @@ input[type="number"] { overflow-y: auto; padding: 10px; } -.mobile_modal { - padding: 0; -} .modal-dialog { margin: 0 auto; } @@ -539,9 +534,6 @@ a.tg_checkbox:hover { line-height: 18px; vertical-align: middle; } -/*a.tg_checkbox:hover span.icon-checkbox-outer { - -webkit-filter: brightness(95%); -}*/ a.tg_checkbox:hover span.icon-checkbox-outer { background: #bdbdbd; } @@ -584,9 +576,6 @@ a.tg_radio:hover { line-height: 20px; vertical-align: middle; } -/*a.tg_radio:hover i.icon-radio { - -webkit-filter: brightness(95%); -}*/ a.tg_radio:hover i.icon-radio { background: #f2f2f2; border-color: #ccc; @@ -595,6 +584,56 @@ a.tg_radio_on:hover i.icon-radio { border-color: #5785aa; } +.tg_range_wrap { + line-height: 18px; +} +input.tg_range { + cursor: pointer; + outline: none !important; + -webkit-appearance: none; + width: 100%; + max-width: 362px; + display: inline-block; + background: #c7c7c7; + height: 3px; + line-height: 18px; + vertical-align: top; + margin: 8px 0; + border-radius: 2px; +} +input.tg_range::-moz-range-track { + cursor: pointer; + outline: none !important; + -webkit-appearance: none; + width: 100%; + max-width: 362px; + display: inline-block; + background: #c7c7c7; + height: 3px; + line-height: 18px; + vertical-align: top; + margin: 8px 0; + border-radius: 2px; +} +input.tg_range::-webkit-slider-thumb { + border: 0; + -webkit-appearance: none; + background: #568cb5; + width: 12px; + height: 12px; + border-radius: 6px; + overflow: hidden; +} + +input.tg_range::-moz-range-thumb { + border: 0; + background: #568cb5; + width: 12px; + height: 12px; + border-radius: 6px; + overflow: hidden; +} + .tg_form_group { padding: 6px 0; @@ -610,7 +649,6 @@ a.tg_radio_on:hover i.icon-radio { .img_fullsize_with_progress_wrap { position: relative; - /*margin: 0 auto 20px;*/ margin: 0 auto; } .img_fullsize_progress_overlay { @@ -619,7 +657,6 @@ a.tg_radio_on:hover i.icon-radio { height: 100%; } .img_fullsize_progress_wrap { - /*background: rgba(0,0,0, .1);*/ position: relative; } .img_fullsize_progress { @@ -1064,57 +1101,6 @@ a.im_dialog_selected .im_dialog_date { /* IM history */ -.im_history_panel_wrap { - margin: 0 23px 0 15px; - cursor: pointer; - position: relative; - -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.12); - -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.12); - box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.12); - - position: relative; - z-index: 2; - min-height: 44px; -} -.im_history_panel { - padding: 10px 4px 0; -} -.im_history_panel_title h4 { - font-size: 17px; - line-height: 20px; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - margin: 8px 0 6px; -} -.im_history_panel_title h4 small { - color: #999; - font-size: 13px; - margin-left: 5px; -} -.im_history_panel_info_link, -.im_history_panel_edit_link, -.im_history_panel_return_link, -.im_history_panel_media_dropdown .dropdown-toggle { - font-size: 13px; - font-weight: normal; - padding-top: 5px; - line-height: 1; -} -.im_history_panel_media_dropdown { - padding-top: 2px; -} -.im_history_panel_edit_link, -.im_history_panel_return_link, -.im_history_panel_media_dropdown { - font-size: 13px; - margin-right: 20px; -} -.im_history_panel_media_dropdown, -.im_history_panel_return_count { - margin-left: 5px; -} - .icon-caret { width: 8px; height: 4px; @@ -1131,22 +1117,7 @@ a.im_dialog_selected .im_dialog_date { background-image: url(../img/icons/IconsetW_1x.png); } -.im_history_panel_media_dropdown .dropdown-menu { - border-radius: 2px; - right: auto; - left: -15px; - margin-top: 11px; - padding: 0; - - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.175); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.175); -} - -.im_history_no_dialogs_wrap { - margin: 122px 170px 60px; - text-align: center; -} .im_dialogs_empty_header { font-size: 15px; color: #808080; @@ -1166,10 +1137,10 @@ a.im_dialog_selected .im_dialog_date { -webkit-transform: translateZ(0); -webkit-perspective: 1000; -webkit-backface-visibility: hidden; + position: relative; } .im_history_to_bottom { overflow: hidden; - position: relative; } .im_history_to_bottom .im_history_scrollable { position: absolute; @@ -1177,30 +1148,16 @@ a.im_dialog_selected .im_dialog_date { width: 100%; } -.im_history_appending { - -webkit-transition: all ease-in-out 0.2s; - -moz-transition: all ease-in-out 0.2s; - -ms-transition: all ease-in-out 0.2s; - -o-transition: all ease-in-out 0.2s; - transition: all ease-in-out 0.2s; -} - .im_history { - /*padding: 20px 0 0 3px;*/ padding: 20px 0 0 0; - /*max-width: 500px;*/ - /*margin: 0 auto;*/ position: relative; } .im_history_typing_wrap { - /*margin-top: 13px;*/ - /*height: 18px;*/ line-height: 18px; width: 100%; height: 49px; - /*margin-bottom: 13px;*/ padding: 13px 0 18px; overflow: hidden; -webkit-user-select: none; @@ -1307,7 +1264,6 @@ a.im_message_contact_photo { } .im_message_contact_name { font-weight: bold; - /*color: #3C6E97;*/ } a.im_message_photo_thumb, a.im_message_video_thumb { @@ -1441,8 +1397,6 @@ div.im_message_video_thumb { margin-top: 3px; border-radius: 3px; display: inline-block; - /*line-height: 0;*/ - width: 340px; } .icon-document, @@ -1500,12 +1454,6 @@ img.im_message_document_thumb { max-width: 100px; max-height: 100px; vertical-align: middle; - /*-webkit-filter: blur(1px); - -moz-filter: blur(1px); - -o-filter: blur(1px); - -ms-filter: blur(1px); - filter: blur(1px); - filter:progid:DXImageTransform.Microsoft.Blur(PixelRadius='1');*/ } .im_message_document_name_wrap { overflow: hidden; @@ -1665,9 +1613,6 @@ img.im_message_document_thumb { .im_content_message_wrap { margin: 8px 0px 8px 16px } -.im_message_error_btn { - display: none; -} .im_message_date, .im_message_fwd_date { color: #adadad; @@ -1681,9 +1626,6 @@ div.im_message_body { display: block; overflow: hidden; } -.im_message_fwd_title { - display: none; -} .im_message_fwd_from { margin-top: 5px; } @@ -1694,11 +1636,7 @@ div.im_message_body { margin-top: 4px; margin-bottom: 4px; } -.im_message_fwd .im_message_fwd_author_wrap, -.im_message_fwd .im_message_text, -.im_message_fwd .im_message_media { - margin-left: 42px; -} + a.im_message_fwd_photo { position: absolute; margin-top: 1px; @@ -1770,7 +1708,6 @@ span.emoji { } .im_send_panel_wrap { - max-width: 526px; margin: 0 auto; padding: 10px 15px 22px 15px; } @@ -1778,12 +1715,9 @@ span.emoji { position: relative; } .im_send_form { - max-width: 389px; margin: 0 auto; position: absolute; bottom: 0; - left: 62px; - right: 62px; } .im_send_dropbox_wrap { @@ -1870,7 +1804,6 @@ textarea.im_message_field { .im_media_attach_input { cursor: pointer; font-size: 72px !important; - /*visibility: hidden;*/ opacity: 0.01; position: absolute; z-index: 100; @@ -1916,34 +1849,7 @@ textarea.im_message_field { opacity: 1; } -.im_panel_peer_photo, -.im_panel_own_photo { - width: 50px; - height: 50px; - border-radius: 3px; - overflow: hidden; -} -div.im_panel_peer_photo { - cursor: pointer; - margin-left: 12px; - height: 55px; -} -div.im_panel_own_photo { - margin-right: 12px; -} -.im_panel_peer_online { - background: #6DBF69; - border: 1px solid #FFF; - display: block; - width: 11px; - height: 11px; - border-radius: 6px; - overflow: hidden; - position: absolute; - margin-top: -7px; - margin-left: 43px; -} .icon-online { background: #6DBF69; border: 1px solid #FFF; @@ -1985,188 +1891,6 @@ img.img_fullsize { font-size: 12px; } -.user_modal_window .modal-dialog { - max-width: 506px; -} - - - -.user_modal_photo_profile_wrap { - padding: 13px 12px; - margin-bottom: 15px; -} -.user_modal_image_wrap { - display: block; - width: 100px; - margin-right: 22px; - overflow: hidden; - border-radius: 3px; -} -.user_modal_image { - width: 100px; - height: 100px; -} -.user_modal_header { - font-weight: bold; - margin: 2px 0 7px; -} -.user_modal_status { - color: #999; - margin-bottom: 16px; -} - -.user_modal_main_btn { - border: 0; - font-size: 12px; - padding-left: 16px; - padding-right: 16px; - margin: 8px 10px 0 0; - float: left; -} -.user_modal_other_btn { - margin: 8px 0 0 0; - float: left; -} -.user_modal_other_btn .dropdown-toggle { - border: 0; - font-size: 12px; -} -.user_modal_other_btn .dropdown-menu { - margin-left: -3px; -} - -.user_modal_settings_wrap { - margin-top: 25px; -} -.user_modal_notifications { - font-weight: bold; -} -.user_modal_clear { - margin-top: 20px; -} - - -.chat_modal_window .modal-dialog { - max-width: 506px; -} - -.chat_modal_header { - font-weight: bold; - margin: 0 0 10px; -} -.chat_modal_members_count { - color: #999; - margin-bottom: 16px; -} - -.chat_modal_actions_wrap { - position: relative; -} - -.chat_modal_main_btn { - border: 0; - font-size: 12px; - padding-left: 16px; - padding-right: 16px; - float: left; - position: relative; - overflow: hidden; - margin-right: 10px; - margin-top: 8px; -} -.chat_modal_invite_btn { - border: 0; - font-size: 12px; - padding-left: 16px; - padding-right: 16px; - float: left; - position: relative; - margin-right: 10px; - margin-top: 8px; -} -.chat_modal_delete_btn { - border: 0; - font-size: 12px; - padding-left: 16px; - padding-right: 16px; - float: left; - margin-right: 10px; - margin-top: 8px; -} -.chat_modal_other_btn { - margin-top: 8px; - float: left; -} -.chat_modal_other_btn .dropdown-toggle { - border: 0; - font-size: 12px; -} -.chat_modal_other_btn .dropdown-menu { - margin-left: -3px; -} - -.chat_modal_photo_update_link { - display: block; - padding: 5px 14px; - clear: both; - font-weight: normal; - line-height: 1.428571429; - color: #333333; - white-space: nowrap; - font-size: 13px; - overflow: hidden; - position: relative; -} -.chat_modal_photo_update_link:hover { - text-decoration: none; - color: #262626; - background-color: #f5f5f5; -} - -.chat_modal_settings_wrap { - margin-top: 10px; -} - -.chat_modal_participant_wrap { - padding: 8px 0; - border-top: 1px solid #F0F0F0; -} -.chat_modal_participant_wrap:first-child { - border-top: 0; -} -.chat_modal_participant_kick { - padding: 11px 0; - display: block; -} -.chat_modal_participant_name { - display: block; - color: #3C6E97; - font-weight: bold; - margin: 1px 0 2px; -} -.non_osx .chat_modal_participant_name { - font-size: 12px; -} -.chat_modal_participant_status { - color: #999; -} -a.chat_modal_participant_photo { - width: 40px; - height: 40px; - margin-right: 10px; - border-radius: 2px; - overflow: hidden; -} -img.chat_modal_participant_photo { - width: 40px; - height: 40px; -} -.chat_modal_members_forbidden { - color: #999; -} - - - /* Emoji area */ @@ -2303,7 +2027,6 @@ img.chat_modal_participant_photo { border-radius: 2px; } .emoji-menu .emoji-items a:hover { - /*background-color: rgba(0,0,0, 0.5);*/ background-color: #edf2f5; } .emoji-menu:after { @@ -2315,18 +2038,6 @@ img.chat_modal_participant_photo { display: none; } -.emoji-menu-tail { - display: none; - background: url(../img/icons/IconsetW.png) -14px -268px no-repeat; - background-size: 42px 891px; - width: 14px; - height: 7px; - margin: 0 83px; -} -.is_1x .emoji-menu-tail { - background-image: url(../img/icons/IconsetW_1x.png); -} - .error_modal_window .modal-dialog { max-width: 350px; @@ -2411,183 +2122,14 @@ img.chat_modal_participant_photo { } - - - - -.settings_modal_window .modal-dialog { - max-width: 482px; -} - .settings_modal_wrap .im_attach_input { z-index: 999; } -.settings_modal_settings { - padding: 4px 0; - margin: 0; -} - -.settings_modal_wrap .user_modal_main_btn { - position: relative; - overflow: hidden; -} - -.settings_profile_edit_form { - margin-bottom: 15px; -} -.settings_profile_image_wrap { - float: left; - width: 120px; - margin-right: 22px; -} -.settings_profile_first_name, -.settings_profile_last_name { - width: 180px; - float: left; - margin-bottom: 0; -} -.settings_profile_first_name label, -.settings_profile_last_name label { - margin-bottom: 3px; -} -.settings_profile_first_name { - margin-right: 22px; - margin-bottom: 10px; -} -.settings_profile_last_name { - margin-right: 10px; - margin-bottom: 15px; -} -.settings_profile_save { - padding-top: 21px; - float: left; -} -.settings_profile_save_btn { - width: 50px; -} - -.settings_profile_edit_form { - margin-bottom: 0; -} -.settings_profile_edit_form input { - font-size: 12px; - line-height: normal; - background: #F2F2F2; - border: 1px solid #F2F2F2; - border-radius: 0; - padding: 6px 6px 6px 6px; - margin-bottom: 0; - margin: 0; -} -.settings_profile_edit_form input:focus, -.settings_profile_edit_form input:active { - background-color: #FFF; -} - -.settings_send_choose_form input { - margin-top: 2px; -} -.settings_send_choose_form { - margin-bottom: 20px; -} - -.settings_user_phone, -.settings_version { - color: #999; -} - - -.tg_range_wrap { - line-height: 18px; -} -input.tg_range { - cursor: pointer; - outline: none !important; - -webkit-appearance: none; - width: 100%; - max-width: 362px; - display: inline-block; - background: #c7c7c7; - height: 3px; - line-height: 18px; - vertical-align: top; - margin: 8px 0; - border-radius: 2px; -} -input.tg_range::-moz-range-track { - cursor: pointer; - outline: none !important; - -webkit-appearance: none; - width: 100%; - max-width: 362px; - display: inline-block; - background: #c7c7c7; - height: 3px; - line-height: 18px; - vertical-align: top; - margin: 8px 0; - border-radius: 2px; -} -input.tg_range::-webkit-slider-thumb { - border: 0; - -webkit-appearance: none; - background: #568cb5; - width: 12px; - height: 12px; - border-radius: 6px; - overflow: hidden; -} - -input.tg_range::-moz-range-thumb { - border: 0; - background: #568cb5; - width: 12px; - height: 12px; - border-radius: 6px; - overflow: hidden; -} - -.icon-volume-outer { +.settings_external_service { + line-height: 0; display: inline-block; - background: #c7c7c7; - border-radius: 10px; - overflow: hidden; - height: 18px; - padding: 5px 8px; - margin: 0 9px 0 0; - width: 32px; -} -.icon-volume-inner { - display: block; - background: #fff; - float: left; - width: 2px; - vertical-align: bottom; - margin: 0 1px 0; - height: 8px; -} -.icon-volume-inner1 { - height: 2px; - margin-top: 6px; -} -.icon-volume-inner2 { - height: 4px; - margin-top: 4px; -} -.icon-volume-inner3 { - height: 6px; - margin-top: 2px; -} - -.icon-volume-outer1 .icon-volume-inner2, -.icon-volume-outer1 .icon-volume-inner3, -.icon-volume-outer1 .icon-volume-inner4, -.icon-volume-outer2 .icon-volume-inner3, -.icon-volume-outer2 .icon-volume-inner4, -.icon-volume-outer3 .icon-volume-inner4 { - display: none; + padding: 7px 9px; } - .settings_about_section_body { padding-right: 0; } @@ -2595,11 +2137,6 @@ input.tg_range::-moz-range-thumb { margin-top: 7px; margin-bottom: 3px; } -.settings_external_service { - line-height: 0; - display: inline-block; - padding: 7px 9px; -} .icon-github { display: inline-block; width: 59px; @@ -2629,27 +2166,6 @@ a:hover .icon-twitter { } /* Contacts modal */ -.contacts_modal_window .modal-dialog { - max-width: 456px; -} -.contacts_modal_header { - padding: 6px 0 18px; -} -.contacts_modal_edit_wrap { - position: absolute; - margin-top: -1px; -} -.contacts_modal_edit_link { - font-size: 14px; - padding: 5px 7px; -} -.contacts_modal_title { - font-size: 14px; - margin: 0; - text-align: center; - font-weight: bold; -} - .contacts_modal_search { padding: 0 0 14px; position: relative; @@ -2764,9 +2280,6 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status, .contacts_modal_members_list .contacts_modal_contact_wrap:hover .icon-contact-tick { background-position: -9px -481px; opacity: 0.5; -} -.contacts_modal_members_list .contacts_modal_contact_wrap.active { - } .contacts_modal_members_list .contacts_modal_contact_wrap.active .icon-contact-tick { background-position: -9px -481px; @@ -2802,28 +2315,8 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status, .im_panel_to_top .im_edit_panel_wrap { background: #FFF; position: absolute; - /*width: 652px;*/ width: 100%; } -.im_edit_flush_link, -.im_edit_cancel_link { - display: block; - padding: 6px 17px; - border-radius: 2px; - overflow: hidden; - margin: 6px 6px; -} -.im_edit_cancel_link { - float: left; -} -.im_edit_flush_link { - float: right; -} -.im_edit_flush_link:hover, -.im_edit_cancel_link:hover { - background: #f2f6fa; - text-decoration: none; -} .im_edit_selected_actions { text-align: center; @@ -2845,76 +2338,14 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status, line-height: 34px; } -.icon-delete { - display: inline-block; - width: 12px; - height: 15px; - - background: url(../img/icons/IconsetW.png) -15px -319px no-repeat; - background-size: 42px 891px; -} -.is_1x .icon-delete { - background-image: url(../img/icons/IconsetW_1x.png); -} -.im_message_selected .im_message_outer_wrap, -.im_message_focus .im_message_outer_wrap { - background: #f2f6fa; -} - -.im_history_selectable .im_message_outer_wrap { - cursor: pointer; -} -.im_history_selectable .im_message_outer_wrap:hover { - background: #f2f6fa; -} - -.im_message_selected .im_message_date, -.im_message_selected .im_message_document_size, -.im_message_selected .im_message_audio_duration, -.im_message_selected .im_message_audio_size, -.im_message_selected .im_message_fwd_date, .im_message_focus .im_message_date, .im_message_focus .im_message_document_size, .im_message_focus .im_message_audio_duration, .im_message_focus .im_message_audio_size, -.im_message_focus .im_message_fwd_date, -.im_history_selectable .im_message_outer_wrap:hover .im_message_date, -.im_history_selectable .im_message_outer_wrap:hover .im_message_document_size, -.im_history_selectable .im_message_outer_wrap:hover .im_message_audio_duration, -.im_history_selectable .im_message_outer_wrap:hover .im_message_audio_size, -.im_history_selectable .im_message_outer_wrap:hover .im_message_fwd_date { +.im_message_focus .im_message_fwd_date { color: #68839c; } -.im_message_wrap { - max-width: 526px; - padding: 0 15px; - margin: 0 auto; - position: static; -} -@media (min-width: 901px) { - .im_message_wrap { - position: relative; - } -} -.im_content_message_select_area { - display: none; - cursor: pointer; - position: absolute; - width: 112px; - height: 52px; - margin: -8px 0 0 -112px; - -webkit-user-select: text; -} -@media (min-width: 1024px) { - .im_content_message_select_area { - display: block; - } - .im_message_wrap { - position: relative; - } -} - .icon-select-tick { display: none; width: 26px; @@ -2926,28 +2357,6 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status, .is_1x .icon-select-tick { background-image: url(../img/icons/IconsetW_1x.png); } -.im_history_selectable .icon-select-tick, -.im_content_message_select_area:hover .icon-select-tick { - display: inline-block; -} -.im_message_selected .icon-select-tick, -.im_history_selectable .im_message_outer_wrap:hover .icon-select-tick, -.im_content_message_select_area:hover .icon-select-tick { - background-position: -9px -481px; - opacity: 0.5; -} -.im_message_selected .icon-select-tick { - opacity: 1 !important; -} - - -/* Dialogs modal */ -.peer_select_window .modal-dialog { - max-width: 506px; -} -.peer_select_modal_wrap .modal-body { - padding: 0 2px 14px; -} /* Colorized user names @@ -2985,58 +2394,6 @@ ce671b orange margin-left: 8px; } - -.tooltip-inner { - background: rgba(0,0,0, 0.8); -} -.tooltip-arrow { - opacity: 0.8; -} - - -.im_dialogs_panel_dropdown { - margin-left: 8px; -} - -.im_dialogs_panel_dropdown .dropdown-toggle { - background: #F2F2F2; - display: block; - border-radius: 2px; - overflow: hidden; - padding: 11px 12px; - width: 38px; - height: 34px; -} -.im_dialogs_panel_dropdown .dropdown-toggle .icon-bar { - background: #b3b3b3; - display: block; - height: 2px; - margin-bottom: 3px; -} -.im_dialogs_panel_dropdown .dropdown-toggle .icon-bar:last-child { - margin-bottom: 0; -} - - - -.im_dialogs_panel_dropdown.open .dropdown-toggle { - background: #6690b0; -} -.im_dialogs_panel_dropdown.open .dropdown-toggle .icon-bar { - background: #fff; -} - -/* Import contact modal */ -.import_contact_modal_window .modal-dialog { - max-width: 480px; -} - -.modal-content-animated { - -webkit-transition: margin-top linear 0.2s; - transition: margin-top linear 0.2s; -} - - /* Gif documents */ .img_gif_with_progress_wrap { position: relative; @@ -3057,15 +2414,9 @@ ce671b orange padding: 1px; max-width: 100%; } - .img_gif_image { max-width: 100%; } -/*.img_gif_image_wrap img { - overflow: hidden; - border-radius: 2px; -}*/ - .img_gif_info_wrap { color: #FFF; font-size: 10px; @@ -3111,16 +2462,11 @@ ce671b orange font-weight: normal; } -.countries_modal_col { - max-height: 350px; -} - .countries_modal_search { padding: 0 0 12px; margin: 0 20px; position: relative; } - .countries_modal_search_field { font-size: 12px; line-height: normal; @@ -3157,12 +2503,9 @@ ce671b orange .countries_modal_search_clear:hover { opacity: 1; } - .countries_modal_wrap .modal-body { padding: 14px 0; } - - .countries_scrollable_wrap a.countries_modal_country { clear: both; overflow: hidden; @@ -3272,10 +2615,6 @@ ce671b orange } } - -.changelog_modal_window .modal-dialog { - max-width: 506px; -} .changelog_card_wrap { text-align: center; padding: 12px 0 18px; diff --git a/app/css/desktop.css b/app/css/desktop.css index 4663e0ad..96950dc3 100644 --- a/app/css/desktop.css +++ b/app/css/desktop.css @@ -136,10 +136,6 @@ -moz-border-radius : 0; -webkit-border-radius : 0; border-radius : 0; - /*-webkit-transition : .2s; - -moz-transition : .2s; - -o-transition : .2s; - transition : .2s;*/ -webkit-transition : none; -moz-transition : none; -o-transition : none; @@ -164,10 +160,6 @@ width : 9px; right: 0; top: 0; - /*-webkit-transition : .2s; - -moz-transition : .2s; - -o-transition : .2s; - transition : .2s;*/ -moz-border-radius : 2px; -webkit-border-radius : 2px; border-radius : 2px; @@ -211,6 +203,103 @@ } +.im_history_panel_wrap { + margin: 0 23px 0 15px; + cursor: pointer; + position: relative; + -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.12); + -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.12); + box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.12); + + position: relative; + z-index: 2; + min-height: 44px; +} +.im_history_panel { + padding: 10px 4px 0; +} +.im_history_panel_title h4 { + font-size: 17px; + line-height: 20px; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + margin: 8px 0 6px; +} +.im_history_panel_title h4 small { + color: #999; + font-size: 13px; + margin-left: 5px; +} +.im_history_panel_info_link, +.im_history_panel_edit_link, +.im_history_panel_return_link, +.im_history_panel_media_dropdown .dropdown-toggle { + font-size: 13px; + font-weight: normal; + padding-top: 5px; + line-height: 1; +} +.im_history_panel_media_dropdown { + padding-top: 2px; +} +.im_history_panel_edit_link, +.im_history_panel_return_link, +.im_history_panel_media_dropdown { + font-size: 13px; + margin-right: 20px; +} +.im_history_panel_media_dropdown, +.im_history_panel_return_count { + margin-left: 5px; +} + +.im_history_panel_media_dropdown .dropdown-menu { + border-radius: 2px; + right: auto; + left: -15px; + margin-top: 11px; + padding: 0; + + -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.175); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.175); +} + +.im_history_no_dialogs_wrap { + margin: 122px 170px 60px; + text-align: center; +} + +.im_history_appending { + -webkit-transition: all ease-in-out 0.2s; + -moz-transition: all ease-in-out 0.2s; + -ms-transition: all ease-in-out 0.2s; + -o-transition: all ease-in-out 0.2s; + transition: all ease-in-out 0.2s; +} + +/* Contacts modal */ +.contacts_modal_window .modal-dialog { + max-width: 456px; +} +.contacts_modal_header { + padding: 6px 0 18px; +} +.contacts_modal_edit_wrap { + position: absolute; + margin-top: -1px; +} +.contacts_modal_edit_link { + font-size: 14px; + padding: 5px 7px; +} +.contacts_modal_title { + font-size: 14px; + margin: 0; + text-align: center; + font-weight: bold; +} + .icon-message-status { background: #43A4DB; border: 0; @@ -229,7 +318,9 @@ .im_message_pending .icon-message-status { opacity: 0.5; } - +.im_message_error_btn { + display: none; +} .im_message_error .im_message_error_btn { display: inline; } @@ -241,6 +332,27 @@ opacity: 1; } + +.im_edit_flush_link, +.im_edit_cancel_link { + display: block; + padding: 6px 17px; + border-radius: 2px; + overflow: hidden; + margin: 6px 6px; +} +.im_edit_cancel_link { + float: left; +} +.im_edit_flush_link { + float: right; +} +.im_edit_flush_link:hover, +.im_edit_cancel_link:hover { + background: #f2f6fa; + text-decoration: none; +} + .im_submit { padding: 6px 13px; font-size: 13px; @@ -248,6 +360,59 @@ min-width: 60px; } +.im_message_selected .im_message_date, +.im_message_selected .im_message_document_size, +.im_message_selected .im_message_audio_duration, +.im_message_selected .im_message_audio_size, +.im_message_selected .im_message_fwd_date, +.im_history_selectable .im_message_outer_wrap:hover .im_message_date, +.im_history_selectable .im_message_outer_wrap:hover .im_message_document_size, +.im_history_selectable .im_message_outer_wrap:hover .im_message_audio_duration, +.im_history_selectable .im_message_outer_wrap:hover .im_message_audio_size, +.im_history_selectable .im_message_outer_wrap:hover .im_message_fwd_date { + color: #68839c; +} + +.im_content_message_select_area { + display: none; + cursor: pointer; + position: absolute; + width: 112px; + height: 52px; + margin: -8px 0 0 -112px; + -webkit-user-select: text; +} +@media (min-width: 1024px) { + .im_content_message_select_area { + display: block; + } + .im_message_wrap { + position: relative; + } +} + +.im_history_selectable .icon-select-tick, +.im_content_message_select_area:hover .icon-select-tick { + display: inline-block; +} +.im_message_selected .icon-select-tick, +.im_history_selectable .im_message_outer_wrap:hover .icon-select-tick, +.im_content_message_select_area:hover .icon-select-tick { + background-position: -9px -481px; + opacity: 0.5; +} +.im_message_selected .icon-select-tick { + opacity: 1 !important; +} + +/* Dialogs modal */ +.peer_select_window .modal-dialog { + max-width: 506px; +} +.peer_select_modal_wrap .modal-body { + padding: 0 2px 14px; +} + @media (max-width: 900px) { @@ -282,4 +447,426 @@ .im_message_date { padding: 0; } +} + + +.im_message_fwd .im_message_fwd_author_wrap, +.im_message_fwd .im_message_text, +.im_message_fwd .im_message_media { + margin-left: 42px; +} + +.im_send_panel_wrap { + max-width: 526px; +} +.im_send_form { + max-width: 389px; + left: 62px; + right: 62px; +} + +.im_panel_peer_photo, +.im_panel_own_photo { + width: 50px; + height: 50px; + border-radius: 3px; + overflow: hidden; +} +div.im_panel_peer_photo { + cursor: pointer; + margin-left: 12px; + height: 55px; +} +div.im_panel_own_photo { + margin-right: 12px; +} + +.im_panel_peer_online { + background: #6DBF69; + border: 1px solid #FFF; + display: block; + width: 11px; + height: 11px; + border-radius: 6px; + overflow: hidden; + position: absolute; + margin-top: -7px; + margin-left: 43px; +} + +/* Peer modals */ +.user_modal_window .modal-dialog { + max-width: 506px; +} +.user_modal_photo_profile_wrap { + padding: 13px 12px; + margin-bottom: 15px; +} +.user_modal_image_wrap { + display: block; + width: 100px; + margin-right: 22px; + overflow: hidden; + border-radius: 3px; +} +.user_modal_image { + width: 100px; + height: 100px; +} +.user_modal_header { + font-weight: bold; + margin: 2px 0 7px; +} +.user_modal_status { + color: #999; + margin-bottom: 16px; +} + +.user_modal_main_btn { + border: 0; + font-size: 12px; + padding-left: 16px; + padding-right: 16px; + margin: 8px 10px 0 0; + float: left; +} +.user_modal_other_btn { + margin: 8px 0 0 0; + float: left; +} +.user_modal_other_btn .dropdown-toggle { + border: 0; + font-size: 12px; +} +.user_modal_other_btn .dropdown-menu { + margin-left: -3px; +} + +.user_modal_settings_wrap { + margin-top: 25px; +} +.user_modal_notifications { + font-weight: bold; +} +.user_modal_clear { + margin-top: 20px; +} + + +.chat_modal_window .modal-dialog { + max-width: 506px; +} + +.chat_modal_header { + font-weight: bold; + margin: 0 0 10px; +} +.chat_modal_members_count { + color: #999; + margin-bottom: 16px; +} + +.chat_modal_actions_wrap { + position: relative; +} + +.chat_modal_main_btn { + border: 0; + font-size: 12px; + padding-left: 16px; + padding-right: 16px; + float: left; + position: relative; + overflow: hidden; + margin-right: 10px; + margin-top: 8px; +} +.chat_modal_invite_btn { + border: 0; + font-size: 12px; + padding-left: 16px; + padding-right: 16px; + float: left; + position: relative; + margin-right: 10px; + margin-top: 8px; +} +.chat_modal_delete_btn { + border: 0; + font-size: 12px; + padding-left: 16px; + padding-right: 16px; + float: left; + margin-right: 10px; + margin-top: 8px; +} +.chat_modal_other_btn { + margin-top: 8px; + float: left; +} +.chat_modal_other_btn .dropdown-toggle { + border: 0; + font-size: 12px; +} +.chat_modal_other_btn .dropdown-menu { + margin-left: -3px; +} + +.chat_modal_photo_update_link { + display: block; + padding: 5px 14px; + clear: both; + font-weight: normal; + line-height: 1.428571429; + color: #333333; + white-space: nowrap; + font-size: 13px; + overflow: hidden; + position: relative; +} +.chat_modal_photo_update_link:hover { + text-decoration: none; + color: #262626; + background-color: #f5f5f5; +} + +.chat_modal_settings_wrap { + margin-top: 10px; +} + +.chat_modal_participant_wrap { + padding: 8px 0; + border-top: 1px solid #F0F0F0; +} +.chat_modal_participant_wrap:first-child { + border-top: 0; +} +.chat_modal_participant_kick { + padding: 11px 0; + display: block; +} +.chat_modal_participant_name { + display: block; + color: #3C6E97; + font-weight: bold; + margin: 1px 0 2px; +} +.non_osx .chat_modal_participant_name { + font-size: 12px; +} +.chat_modal_participant_status { + color: #999; +} +a.chat_modal_participant_photo { + width: 40px; + height: 40px; + margin-right: 10px; + border-radius: 2px; + overflow: hidden; +} +img.chat_modal_participant_photo { + width: 40px; + height: 40px; +} +.chat_modal_members_forbidden { + color: #999; +} + +.settings_modal_window .modal-dialog { + max-width: 482px; +} +.settings_modal_settings { + padding: 4px 0; + margin: 0; +} +.settings_modal_wrap .user_modal_main_btn { + position: relative; + overflow: hidden; +} +.settings_profile_edit_form { + margin-bottom: 15px; +} +.settings_profile_image_wrap { + float: left; + width: 120px; + margin-right: 22px; +} +.settings_profile_first_name, +.settings_profile_last_name { + width: 180px; + float: left; + margin-bottom: 0; +} +.settings_profile_first_name label, +.settings_profile_last_name label { + margin-bottom: 3px; +} +.settings_profile_first_name { + margin-right: 22px; + margin-bottom: 10px; +} +.settings_profile_last_name { + margin-right: 10px; + margin-bottom: 15px; +} +.settings_profile_save { + padding-top: 21px; + float: left; +} +.settings_profile_save_btn { + width: 50px; +} + +.settings_profile_edit_form { + margin-bottom: 0; +} +.settings_profile_edit_form input { + font-size: 12px; + line-height: normal; + background: #F2F2F2; + border: 1px solid #F2F2F2; + border-radius: 0; + padding: 6px 6px 6px 6px; + margin-bottom: 0; + margin: 0; +} +.settings_profile_edit_form input:focus, +.settings_profile_edit_form input:active { + background-color: #FFF; +} + +.settings_send_choose_form input { + margin-top: 2px; +} +.settings_send_choose_form { + margin-bottom: 20px; +} + +.settings_user_phone, +.settings_version { + color: #999; +} +.icon-volume-outer { + display: inline-block; + background: #c7c7c7; + border-radius: 10px; + overflow: hidden; + height: 18px; + padding: 5px 8px; + margin: 0 9px 0 0; + width: 32px; +} +.icon-volume-inner { + display: block; + background: #fff; + float: left; + width: 2px; + vertical-align: bottom; + margin: 0 1px 0; + height: 8px; +} +.icon-volume-inner1 { + height: 2px; + margin-top: 6px; +} +.icon-volume-inner2 { + height: 4px; + margin-top: 4px; +} +.icon-volume-inner3 { + height: 6px; + margin-top: 2px; +} + +.icon-volume-outer1 .icon-volume-inner2, +.icon-volume-outer1 .icon-volume-inner3, +.icon-volume-outer1 .icon-volume-inner4, +.icon-volume-outer2 .icon-volume-inner3, +.icon-volume-outer2 .icon-volume-inner4, +.icon-volume-outer3 .icon-volume-inner4 { + display: none; +} + + +.im_message_selected .im_message_outer_wrap, +.im_message_focus .im_message_outer_wrap { + background: #f2f6fa; +} +.im_history_selectable .im_message_outer_wrap { + cursor: pointer; +} +.im_history_selectable .im_message_outer_wrap:hover { + background: #f2f6fa; +} + +.im_message_wrap { + max-width: 526px; + padding: 0 15px; + margin: 0 auto; +} + +.im_message_wrap { + position: static; +} +@media (min-width: 901px) { + .im_message_wrap { + position: relative; + } +} + +.tooltip-inner { + background: rgba(0,0,0, 0.8); +} +.tooltip-arrow { + opacity: 0.8; +} + +.im_dialogs_panel_dropdown { + margin-left: 8px; +} + +.im_dialogs_panel_dropdown .dropdown-toggle { + background: #F2F2F2; + display: block; + border-radius: 2px; + overflow: hidden; + padding: 11px 12px; + width: 38px; + height: 34px; +} +.im_dialogs_panel_dropdown .dropdown-toggle .icon-bar { + background: #b3b3b3; + display: block; + height: 2px; + margin-bottom: 3px; +} +.im_dialogs_panel_dropdown .dropdown-toggle .icon-bar:last-child { + margin-bottom: 0; +} + + + +.im_dialogs_panel_dropdown.open .dropdown-toggle { + background: #6690b0; +} +.im_dialogs_panel_dropdown.open .dropdown-toggle .icon-bar { + background: #fff; +} + +/* Import contact modal */ +.import_contact_modal_window .modal-dialog { + max-width: 480px; +} + +.modal-content-animated { + -webkit-transition: margin-top linear 0.2s; + transition: margin-top linear 0.2s; +} + +.countries_modal_col { + max-height: 350px; +} + +.changelog_modal_window .modal-dialog { + max-width: 506px; } \ No newline at end of file diff --git a/app/css/mobile.css b/app/css/mobile.css index 7b74b037..40be67e9 100644 --- a/app/css/mobile.css +++ b/app/css/mobile.css @@ -232,7 +232,6 @@ html { margin-right: 0; } .navbar_offline .navbar-quick-nav li > a > .navbar-quick-back-title, -.navbar_offline .im_head_attach, .navbar_offline .navbar-search-wrap, .navbar_offline .navbar-history-edit { display: none; @@ -326,15 +325,6 @@ html { border: 0; overflow: hidden; } - -.im_page_footer { - display: none; -} - -.im_panel_own_photo, -.im_panel_peer_photo { - display: none; -} .im_history_selectable .im_message_outer_wrap:hover, .im_message_selected { background: #e1e9f0; @@ -453,10 +443,6 @@ html { width: auto; float: none; } -.im_message_audio_actions, -.im_message_document_actions { - display: none; -} .im_message_audio_player_wrap { height: 38px; line-height: 38px; @@ -514,9 +500,6 @@ img.im_message_video_thumb, -ms-filter: none; filter: none; } -.im_message_video .im_message_document_info { - display: none; -} .im_message_document_thumb_wrap { position: absolute; @@ -612,6 +595,7 @@ img.im_message_video_thumb, } .im_message_date { font-size: 12px; + padding-left: 4px; } .im_message_out .im_message_meta { right: auto; @@ -735,20 +719,10 @@ a.im_message_from_photo { } -.form-control { +.im_dialogs_search_field, +.contacts_modal_search_field { font-size: 1.2em; } -.im_history_typing_wrap { - display: none; -} -.im_history_panel_info_link { - display: none; -} - -.im_edit_flush_link, -.im_edit_cancel_link { - display: none; -} .im_edit_delete_btn, .im_edit_forward_btn { background: none !important; @@ -768,10 +742,6 @@ a.im_message_from_photo { .im_edit_forward_btn strong { font-weight: normal; } - -.im_edit_panel_border { - display: none; -} .im_edit_panel_wrap { padding: 5px 0; margin: 0; @@ -797,10 +767,6 @@ a.im_message_from_photo { .im_page_peer_not_selected .im_dialogs_col_wrap { display: block; } -.im_dialogs_col { -} -.im_dialogs_scrollable_wrap { -} .im_dialogs_panel { display: none; @@ -810,9 +776,6 @@ a.im_message_from_photo { .im_dialogs_panel_search.im_dialogs_panel { display: block; } -.im_dialogs_panel_dropdown { - display: none; -} .im_page_split .im_dialogs_search { margin-right: 0; } @@ -872,7 +835,9 @@ a.im_dialog:hover .im_dialog_message_text, a.im_dialog_selected .im_dialog_message_text { color: #8f8f8f; } - +.im_message_fwd_title { + display: none; +} .im_grouped_fwd_start .im_message_fwd_title { display: block; color: #8a8a8a; @@ -911,12 +876,6 @@ a.im_message_fwd_author { margin-left: 50px; } -.im_grouped_fwd_short .im_message_fwd.im_message_out .im_message_fwd_author_wrap, -.im_grouped_fwd_short .im_message_fwd.im_message_out .im_message_text, -.im_grouped_fwd_short .im_message_fwd.im_message_out .im_message_media { - /*margin-left: 0;*/ -} - .im_dialogs_scrollable_wrap a.im_dialog:hover, @@ -928,29 +887,29 @@ a.im_message_fwd_author { background-color: #f4f4f4; } - -.modal.page_modal { +.modal.mobile_modal { background: #FFF; + padding: 0; } -.page_modal .modal-content { +.mobile_modal .modal-content { border-radius: 0; box-shadow: none; } -.page_modal .modal-dialog { +.mobile_modal .modal-dialog { margin: 0; } -.page_modal .modal-content .modal-body { +.mobile_modal .modal-content .modal-body { padding-left: 0; padding-right: 0; } -.page_modal .modal-footer { +.mobile_modal .modal-footer { padding-left: 0; padding-right: 0; padding-bottom: 9px; } .mobile_modal_body, -.page_modal .modal-content .mobile_modal_body { +.mobile_modal .modal-content .mobile_modal_body { padding: 9px; } @@ -1101,9 +1060,6 @@ a.mobile_modal_action .tg_checkbox_label { .is_1x .im_submit { background-image: url(../img/icons/IconsetW_1x.png); } -.im_submit_text { - display: none; -} .im_attach { position: absolute; @@ -1133,7 +1089,6 @@ a.mobile_modal_action .tg_checkbox_label { opacity: 1; } -.im_media_attach, .im_attach, .im_send_form_empty .im_submit { display: none; @@ -1250,7 +1205,6 @@ a.mobile_modal_action .tg_checkbox_label { } .countries_modal_col { margin: 0 -9px; - max-height: none; } .countries_modal_members_list { padding: 0 12px 0 12px; diff --git a/app/js/controllers.js b/app/js/controllers.js index 22939611..8f2e5045 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -43,15 +43,10 @@ angular.module('myApp.controllers', []) $scope.callPending = {}; $scope.chooseCountry = function () { - var className = 'countries_modal_window page_modal'; - if (Config.Mobile) { - className += ' mobile_modal'; - } - var modal = $modal.open({ templateUrl: templateUrl('country_select_modal'), controller: 'CountrySelectModalController', - windowClass: className + windowClass: 'countries_modal_window mobile_modal' }); modal.result.then(selectCountry); @@ -332,15 +327,10 @@ angular.module('myApp.controllers', []) $scope.historyState = {selectActions: false, typing: []}; $scope.openSettings = function () { - var className = 'settings_modal_window page_modal'; - if (Config.Mobile) { - className += ' mobile_modal'; - } - $modal.open({ templateUrl: templateUrl('settings_modal'), controller: 'SettingsModalController', - windowClass: className + windowClass: 'settings_modal_window mobile_modal' }); } @@ -363,7 +353,7 @@ angular.module('myApp.controllers', []) templateUrl: templateUrl('chat_create_modal'), controller: 'ChatCreateModalController', scope: scope, - windowClass: 'group_edit_modal_window' + windowClass: 'group_edit_modal_window mobile_modal' }); } @@ -1821,7 +1811,7 @@ angular.module('myApp.controllers', []) $modal.open({ templateUrl: templateUrl(edit ? 'edit_contact_modal' : 'import_contact_modal'), controller: 'ImportContactModalController', - windowClass: 'import_contact_modal_window page_modal', + windowClass: 'import_contact_modal_window mobile_modal', scope: scope }).result.then(function (foundUserID) { if ($scope.userID == foundUserID) { @@ -2015,7 +2005,7 @@ angular.module('myApp.controllers', []) templateUrl: templateUrl('chat_edit_modal'), controller: 'ChatEditModalController', scope: scope, - windowClass: 'group_edit_modal_window' + windowClass: 'group_edit_modal_window mobile_modal' }); } @@ -2107,7 +2097,7 @@ angular.module('myApp.controllers', []) $modal.open({ templateUrl: templateUrl('profile_edit_modal'), controller: 'ProfileEditModalController', - windowClass: 'profile_edit_modal_window page_modal' + windowClass: 'profile_edit_modal_window mobile_modal' }); }; diff --git a/app/js/directives.js b/app/js/directives.js index 8fcfe73c..3d207db6 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -1650,7 +1650,7 @@ angular.module('myApp.directives', ['myApp.filters']) var updateMargin = function () { if (Config.Mobile && - $(element[0].parentNode.parentNode.parentNode).hasClass('page_modal')) { + $(element[0].parentNode.parentNode.parentNode).hasClass('mobile_modal')) { return; } var height = element[0].parentNode.offsetHeight, diff --git a/app/js/services.js b/app/js/services.js index 356e2d2d..e8f7deec 100644 --- a/app/js/services.js +++ b/app/js/services.js @@ -188,16 +188,11 @@ angular.module('myApp.services', []) var scope = $rootScope.$new(); scope.userID = userID; - var className = 'user_modal_window page_modal'; - if (Config.Mobile) { - className += ' mobile_modal'; - } - var modalInstance = $modal.open({ templateUrl: templateUrl('user_modal'), controller: 'UserModalController', scope: scope, - windowClass: className + windowClass: 'user_modal_window mobile_modal' }); }; $rootScope.openUser = openUser; @@ -291,7 +286,7 @@ angular.module('myApp.services', []) return $modal.open({ templateUrl: templateUrl('import_contact_modal'), controller: 'ImportContactModalController', - windowClass: 'import_contact_modal_window' + windowClass: 'import_contact_modal_window mobile_modal' }).result.then(function (foundUserID) { if (!foundUserID) { return $q.reject(); @@ -381,7 +376,7 @@ angular.module('myApp.services', []) return $modal.open({ templateUrl: templateUrl('phonebook_modal'), controller: 'PhonebookModalController', - windowClass: 'phonebook_modal_window page_modal mobile_modal' + windowClass: 'phonebook_modal_window mobile_modal' }); } @@ -524,16 +519,11 @@ angular.module('myApp.services', []) var scope = $rootScope.$new(); scope.chatID = chatID; - var className = 'chat_modal_window page_modal'; - if (Config.Mobile) { - className += ' mobile_modal'; - } - var modalInstance = $modal.open({ templateUrl: templateUrl('chat_modal'), controller: 'ChatModalController', scope: scope, - windowClass: className + windowClass: 'chat_modal_window mobile_modal' }); } @@ -3846,17 +3836,11 @@ angular.module('myApp.services', []) angular.extend(scope, options); } - var className = 'peer_select_window page_modal'; - - if (Config.Mobile) { - className += ' mobile_modal'; - } - return $modal.open({ templateUrl: templateUrl('peer_select'), controller: 'PeerSelectController', scope: scope, - windowClass: className + windowClass: 'peer_select_window mobile_modal' }).result; } @@ -3879,16 +3863,11 @@ angular.module('myApp.services', []) scope.action = 'select'; } - var className = 'contacts_modal_window page_modal'; - if (Config.Mobile) { - className += ' mobile_modal'; - } - return $modal.open({ templateUrl: templateUrl('contacts_modal'), controller: 'ContactsModalController', scope: scope, - windowClass: className + windowClass: 'contacts_modal_window mobile_modal' }).result; } @@ -3958,7 +3937,7 @@ angular.module('myApp.services', []) $modal.open({ templateUrl: templateUrl('changelog_modal'), scope: $scope, - windowClass: 'changelog_modal_window page_modal' + windowClass: 'changelog_modal_window mobile_modal' }); } diff --git a/app/partials/desktop/im.html b/app/partials/desktop/im.html index afc6f297..0641967e 100644 --- a/app/partials/desktop/im.html +++ b/app/partials/desktop/im.html @@ -83,16 +83,6 @@
-
-
-

Get started

-

Welcome to Telegram Web. You can always set your profile photo and change your name in Settings.

- -
-
- Please select a chat to start messaging -
-
Loading history
diff --git a/app/partials/desktop/message.html b/app/partials/desktop/message.html index 1f5d3714..b1fbb717 100644 --- a/app/partials/desktop/message.html +++ b/app/partials/desktop/message.html @@ -42,7 +42,6 @@
-
Forwarded message
diff --git a/app/partials/mobile/changelog_modal.html b/app/partials/mobile/changelog_modal.html index bc41f668..fc6ca0ce 100644 --- a/app/partials/mobile/changelog_modal.html +++ b/app/partials/mobile/changelog_modal.html @@ -1,4 +1,4 @@ -
+
diff --git a/app/partials/mobile/chat_create_modal.html b/app/partials/mobile/chat_create_modal.html index 28cb5493..46cd4367 100644 --- a/app/partials/mobile/chat_create_modal.html +++ b/app/partials/mobile/chat_create_modal.html @@ -1,24 +1,43 @@ -
+
+ +
+
+
+ +
+ + + +
- +
+
+
-
- -

Create Group

+
- +
-
- Cancel - -
-
\ No newline at end of file diff --git a/app/partials/mobile/chat_edit_modal.html b/app/partials/mobile/chat_edit_modal.html index a73bb27c..00a46cfa 100644 --- a/app/partials/mobile/chat_edit_modal.html +++ b/app/partials/mobile/chat_edit_modal.html @@ -1,24 +1,43 @@ -
+
+ +
+
+
+ +
+ + + +
- +
+
+
-
- -

Edit Group

+
- +
-
- Cancel - -
-
\ No newline at end of file diff --git a/app/partials/mobile/contacts_modal.html b/app/partials/mobile/contacts_modal.html index 59353867..1c09a186 100644 --- a/app/partials/mobile/contacts_modal.html +++ b/app/partials/mobile/contacts_modal.html @@ -36,6 +36,11 @@
@@ -115,12 +100,6 @@
-
- - Delete Chat - Clear History - - Cancel
Forward @@ -135,23 +114,6 @@
-
- - -
-
- -
@@ -159,11 +121,6 @@
-
- - -
-
@@ -173,9 +130,7 @@
- +
diff --git a/app/partials/mobile/import_contact_modal.html b/app/partials/mobile/import_contact_modal.html index 9cd14722..226f1616 100644 --- a/app/partials/mobile/import_contact_modal.html +++ b/app/partials/mobile/import_contact_modal.html @@ -1,31 +1,53 @@ -
+
+ +
+
+
+ +
+ + + +
- +
+
+
-
- -

Add new contact

+
- +
- +
- +
-
- Phonebook - Cancel - +
+ Phonebook
\ No newline at end of file diff --git a/app/partials/mobile/message.html b/app/partials/mobile/message.html index 1f5d3714..cb64bc86 100644 --- a/app/partials/mobile/message.html +++ b/app/partials/mobile/message.html @@ -20,14 +20,6 @@
-
- -
- - - - - diff --git a/app/partials/mobile/message_attach_audio.html b/app/partials/mobile/message_attach_audio.html index d964bd3e..680beb0c 100644 --- a/app/partials/mobile/message_attach_audio.html +++ b/app/partials/mobile/message_attach_audio.html @@ -12,9 +12,6 @@
-
- Play -
Cancel
diff --git a/app/partials/mobile/message_attach_document.html b/app/partials/mobile/message_attach_document.html index 91c58065..dca019ae 100644 --- a/app/partials/mobile/message_attach_document.html +++ b/app/partials/mobile/message_attach_document.html @@ -21,10 +21,6 @@
-
- Download - Open -
Cancel
diff --git a/app/partials/mobile/message_attach_video.html b/app/partials/mobile/message_attach_video.html index f463cd15..7fe315a5 100644 --- a/app/partials/mobile/message_attach_video.html +++ b/app/partials/mobile/message_attach_video.html @@ -8,24 +8,4 @@ thumb="historyMessage.media.video.thumb" /> - -
-
- Video - - -
-
- Download - Play video -
-
- Cancel -
-
-
-
-
-
-
\ No newline at end of file diff --git a/app/partials/mobile/profile_edit_modal.html b/app/partials/mobile/profile_edit_modal.html index dd0e0e40..2f402e97 100644 --- a/app/partials/mobile/profile_edit_modal.html +++ b/app/partials/mobile/profile_edit_modal.html @@ -1,27 +1,46 @@ -
+
+ +
+
+
+ +
+ + + +
- +
+
+
-
- -

Edit Profile

+ -
- +
+
-
- +
+
-
- Cancel - -
-
\ No newline at end of file diff --git a/app/vendor/jquery.emojiarea/jquery.emojiarea.js b/app/vendor/jquery.emojiarea/jquery.emojiarea.js index 0eb0a93e..e14c90df 100644 --- a/app/vendor/jquery.emojiarea/jquery.emojiarea.js +++ b/app/vendor/jquery.emojiarea/jquery.emojiarea.js @@ -486,7 +486,6 @@ '').appendTo(this.$itemsTailWrap); this.$itemsWrap = $('
').appendTo(this.$itemsTailWrap); this.$items = $('
').appendTo(this.$itemsWrap); - $('
').appendTo(this.$menu); /*! MODIFICATION END */ $body.append(this.$menu);