diff --git a/app/css/app.css b/app/css/app.css index 82e33401..9ca0d4b0 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -204,9 +204,9 @@ input[type="number"] { height: 30px; vertical-align: text-top; } -/*.is_1x .tg_head_logo { - background-image: url(../img/TLogo_1x.png); -}*/ +.is_1x .tg_head_logo { + background-image: url(../img/T_LogoM_1x.png); +} @@ -430,7 +430,7 @@ input[type="number"] { .modal-close-button i { display: inline-block; background: url(../img/icons/IconsetW.png) -15px -320px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; width: 12px; height: 12px; margin: 21px; @@ -904,7 +904,7 @@ a.tg_radio_on:hover i.icon-radio { font-size: 12px; line-height: normal; background: #F2F2F2 url(../img/icons/IconsetW.png) -6px -205px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; border: 1px solid #F2F2F2; border-radius: 3px; padding: 6px 20px 6px 30px; @@ -927,7 +927,7 @@ a.tg_radio_on:hover i.icon-radio { height: 13px; vertical-align: text-top; background: url(../img/icons/IconsetW.png) -15px -192px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; opacity: 0.6; } .is_1x .im_dialogs_search_clear { @@ -1237,7 +1237,7 @@ a.im_dialog_selected .im_dialog_date { margin-left: 6px; background: url(../img/icons/IconsetW.png) -17px -444px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; } .is_1x .icon-caret { background-image: url(../img/icons/IconsetW_1x.png); @@ -1346,55 +1346,55 @@ a.im_dialog_selected .im_dialog_date { .non_osx .im_message_fwd_author { font-size: 12px; } -.im_message_grouped1 .im_message_from_photo, -.im_message_grouped1 .im_message_author, -.im_message_grouped2 .im_message_from_photo, -.im_message_grouped2 .im_message_author, -.im_message_grouped3 .im_message_author, -.im_message_grouped3 .im_message_from_photo, -.im_message_grouped4 .im_message_author, -.im_message_grouped4 .im_message_from_photo { +.im_grouped_short .im_message_from_photo, +.im_grouped_short .im_message_author, +.im_grouped .im_message_from_photo, +.im_grouped .im_message_author, +.im_grouped_fwd .im_message_author, +.im_grouped_fwd .im_message_from_photo, +.im_grouped_fwd_short .im_message_author, +.im_grouped_fwd_short .im_message_from_photo { display: none; } -.im_message_grouped1 .im_message_body, -.im_message_grouped2 .im_message_body, -.im_message_grouped3 .im_message_body, -.im_message_grouped4 .im_message_body { +.im_grouped_short .im_message_body, +.im_grouped .im_message_body, +.im_grouped_fwd .im_message_body, +.im_grouped_fwd_short .im_message_body { margin-left: 46px; } -.im_message_grouped1 .im_content_message_select_area, -.im_message_grouped2 .im_content_message_select_area { +.im_grouped_short .im_content_message_select_area, +.im_grouped .im_content_message_select_area { height: 34px; } .im_history_appending .im_content_message_select_area { height: 52px; } -.im_message_grouped1 .icon-select-tick, -.im_message_grouped4 .icon-select-tick { +.im_grouped_short .icon-select-tick, +.im_grouped_fwd_short .icon-select-tick { margin-top: 5px; } -.im_message_grouped1 .icon-message-status, -.im_message_grouped4 .icon-message-status { +.im_grouped_short .icon-message-status, +.im_grouped_fwd_short .icon-message-status { margin-top: 5px; } -.im_message_grouped3 .im_message_fwd_from, -.im_message_grouped4 .im_message_fwd_from { +.im_grouped_fwd .im_message_fwd_from, +.im_grouped_fwd_short .im_message_fwd_from { display: none; } -.im_message_grouped1 .im_message_fwd .im_message_date, -.im_message_grouped2 .im_message_fwd .im_message_date, -.im_message_grouped3 .im_message_fwd .im_message_date, -.im_message_grouped4 .im_message_fwd .im_message_date { +.im_grouped_short .im_message_fwd .im_message_date, +.im_grouped .im_message_fwd .im_message_date, +.im_grouped_fwd .im_message_fwd .im_message_date, +.im_grouped_fwd_short .im_message_fwd .im_message_date { display: none; } -.im_message_grouped3 .im_message_fwd, -.im_message_grouped4 .im_message_fwd { +.im_grouped_fwd .im_message_fwd, +.im_grouped_fwd_short .im_message_fwd { margin-top: 8px; } -.im_message_grouped3 .im_message_fwd, -.im_message_grouped4 .im_message_fwd { +.im_grouped_fwd .im_message_fwd, +.im_grouped_fwd_short .im_message_fwd { margin-top: 8px; } @@ -1476,7 +1476,7 @@ div.im_message_video_thumb { height: 42px; background: url(../img/icons/IconsetW.png) 0 -590px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; z-index: 1; } .is_1x .icon-videoplay { @@ -1503,7 +1503,7 @@ div.im_message_video_thumb { height: 19px; background: url(../img/icons/IconsetW.png) -14px -389px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; } .is_1x .icon-geo-point { background-image: url(../img/icons/IconsetW_1x.png); @@ -1564,7 +1564,7 @@ div.im_message_video_thumb { vertical-align: text-top; background: #F2F2F2 url(../img/icons/IconsetW.png) -2px -229px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; border-radius: 3px; margin-right: 10px; } @@ -1651,13 +1651,19 @@ img.im_message_document_thumb { vertical-align: text-top; background: #F2F2F2 url(../img/icons/IconsetW.png) -2px -277px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; border-radius: 3px; margin-right: 10px; } .is_1x .icon-audio { background-image: url(../img/icons/IconsetW_1x.png); } +.im_message_selected .icon-audio, +.im_history_selectable .im_message_outer_wrap:hover .icon-audio { + background-color: #dae6f0; + background-position: -2px -697px; +} + .im_message_audio_info { float: left; @@ -1766,7 +1772,6 @@ img.im_message_document_thumb { .im_content_message_wrap { - /*margin: 10px 0px 5px 16px;*/ margin: 8px 0px 8px 16px } .icon-message-status { @@ -1851,14 +1856,13 @@ div.im_message_body { display: block; overflow: hidden; } - -div.im_message_fwd_header { - color: #808080; +.im_message_fwd_title { + display: none; } .im_message_fwd_from { margin-top: 5px; } -.im_message_grouped2 .im_message_fwd_from { +.im_grouped .im_message_fwd_from { margin-top: 0; } .im_message_fwd { @@ -2001,7 +2005,7 @@ textarea.im_message_field { height: 23px; vertical-align: text-top; background: url(../img/icons/IconsetW.png) -12px -68px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; opacity: 0.8; } .is_1x .icon-paperclip { @@ -2029,7 +2033,7 @@ textarea.im_message_field { height: 23px; vertical-align: text-top; background: url(../img/icons/IconsetW.png) -10px -4px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; opacity: 0.8; } .is_1x .icon-emoji { @@ -2083,7 +2087,7 @@ textarea.im_message_field { height: 21px; vertical-align: text-top; background: url(../img/icons/IconsetW.png) -9px -132px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; opacity: 0.8; } .is_1x .icon-camera { @@ -2499,7 +2503,7 @@ img.chat_modal_participant_photo { .emoji-menu-tail { display: none; background: url(../img/icons/IconsetW.png) -14px -268px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; width: 14px; height: 7px; margin: 0 83px; @@ -2849,7 +2853,7 @@ a:hover .icon-twitter { font-size: 12px; line-height: normal; background: #F2F2F2 url(../img/icons/IconsetW.png) -6px -205px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; border: 1px solid #F2F2F2; border-radius: 3px; padding: 6px 15px 6px 30px; @@ -2872,7 +2876,7 @@ a:hover .icon-twitter { height: 13px; vertical-align: text-top; background: url(../img/icons/IconsetW.png) -15px -192px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; opacity: 0.6; } .is_1x .contacts_modal_search_clear { @@ -2941,7 +2945,7 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status, width: 25px; height: 25px; background: url(../img/icons/IconsetW.png) -9px -516px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; opacity: 0.5; } .is_1x .icon-contact-tick { @@ -3037,7 +3041,7 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status, height: 15px; background: url(../img/icons/IconsetW.png) -15px -319px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; } .is_1x .icon-delete { background-image: url(../img/icons/IconsetW_1x.png); @@ -3055,16 +3059,19 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status, } .im_message_selected .im_message_date, -.im_message_selected .im_message_fwd_header, .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_fwd_header, .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_fwd_header, .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; } @@ -3104,7 +3111,7 @@ a.contacts_modal_contact:hover .contacts_modal_contact_status, height: 26px; margin: 13px 0 0 40px; background: url(../img/icons/IconsetW.png) -9px -516px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; } .is_1x .icon-select-tick { background-image: url(../img/icons/IconsetW_1x.png); @@ -3307,7 +3314,7 @@ ce671b orange font-size: 12px; line-height: normal; background: #F2F2F2 url(../img/icons/IconsetW.png) -6px -205px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; border: 1px solid #F2F2F2; border-radius: 3px; padding: 6px 20px 6px 30px; @@ -3330,7 +3337,7 @@ ce671b orange height: 13px; vertical-align: text-top; background: url(../img/icons/IconsetW.png) -15px -192px no-repeat; - background-size: 42px 710px; + background-size: 42px 891px; opacity: 0.6; } .is_1x .countries_modal_search_clear { diff --git a/app/css/app_mobile.css b/app/css/app_mobile.css index 60ebe31b..85ca2f50 100644 --- a/app/css/app_mobile.css +++ b/app/css/app_mobile.css @@ -126,12 +126,12 @@ html { } .icon-back { display: inline-block; - width: 10px; - height: 18px; + width: 11px; + height: 19px; vertical-align: text-top; - background: url(../img/icons/IconsetW.png) -15px -418px no-repeat; - background-size: 42px 710px; + background: url(../img/icons/IconsetW.png) -15px -835px no-repeat; + background-size: 42px 891px; opacity: 0.8; } .is_1x .icon-back { @@ -152,7 +152,7 @@ html { } .tg_page_head .navbar-inverse .navbar-quick-nav > li > a { - padding-left: 15px; + padding-left: 16px; padding: 6px 10px 2px 28px; color: #b9cfe3; font-size: 13px; @@ -165,7 +165,7 @@ html { .navbar-quick-nav .icon-back { position: absolute; margin-left: -18px; - margin-top: 10px; + margin-top: 8px; } .navbar-quick-nav h4 { font-size: 15px; @@ -302,9 +302,72 @@ html { } +.im_message_body, +.im_message_document { + padding: 7px 10px; + border-radius: 3px; + background: #f1f1f1; +} +.im_message_out .im_message_body, +.im_message_out .im_message_document { + background: #e4ecf2; +} +.im_message_body_media, +.im_message_out .im_message_body_media { + padding: 0; + border-radius: 0; + background: none; +} +.im_message_selected .im_message_body, +.im_message_selected .im_message_document { + background: #497495; + color: #FFF; +} +.im_message_selected .im_message_body_media { + background: none; + color: inherit; +} + +.im_message_fwd .im_message_body, +.im_message_fwd .im_message_document { + padding: 7px 8px; +} +.im_grouped_fwd_start .im_message_body, +.im_grouped_fwd_short .im_message_body, +.im_grouped_fwd .im_message_body, +.im_grouped .im_message_fwd .im_message_body, +.im_grouped_fwd_start .im_message_document, +.im_grouped_fwd_short .im_message_document, +.im_grouped_fwd .im_message_document, +.im_grouped .im_message_fwd .im_message_document { + border-radius: 0; +} + +.im_grouped_fwd_start .im_message_fwd .im_message_body, +.im_grouped_fwd_start .im_message_fwd .im_message_document { + border-radius: 3px 3px 0 0; +} +.im_grouped_fwd_end .im_message_fwd .im_message_body, +.im_grouped_fwd_end .im_message_fwd .im_message_document { + border-radius: 0 0 3px 3px; +} + +.im_message_fwd .im_message_text { + min-height: 21px; +} +.im_grouped_fwd .im_message_text, +.im_grouped_fwd_short .im_message_text { + min-height: 0; +} + +.im_service_message { + font-size: 13px; +} .im_message_document { padding: 5px; - width: 250px; + width: auto; + max-width: 250px; + margin-top: 0; } .im_message_audio, .im_message_document { @@ -316,6 +379,10 @@ html { .im_message_document_thumb_wrap { position: absolute; } +.im_message_out .im_message_audio .icon-audio, +.im_message_out .im_message_document .icon-document { + background-color: #e4ecf2; +} .im_message_document_thumb_wrap { background-color: transparent; } @@ -325,7 +392,7 @@ html { .im_message_audio_info, .im_message_document_info { float: none; - margin-left: 48px; + margin-left: 43px; width: auto; min-height: 38px; } @@ -339,7 +406,7 @@ html { line-height: 38px; } .im_message_audio_progress .im_message_audio_name, -.im_message_audio_progress .im_message_audio_duration, { +.im_message_audio_progress .im_message_audio_duration { line-height: 18px; } .im_message_audio_done .im_message_audio_info { @@ -407,25 +474,10 @@ a.im_message_video_thumb { .im_message_document_thumb_wrap { position: absolute; } -/*.im_message_document, -.im_message_audio, -.im_message_upload_file { - width: auto; -}*/ -/*.im_message_document_info { - float: none; -} -.im_message_document_thumb_wrap { - float: none; -} -.im_message_document_thumbed .im_message_document_name { - max-width: 100%; -}*/ - -.im_message_grouped1 .im_message_body, -.im_message_grouped2 .im_message_body, -.im_message_grouped3 .im_message_body, -.im_message_grouped4 .im_message_body { +.im_grouped_short .im_message_body, +.im_grouped .im_message_body, +.im_grouped_fwd .im_message_body, +.im_grouped_fwd_short .im_message_body { margin-left: 0; } @@ -448,9 +500,6 @@ a.im_message_video_thumb { } .im_content_message_wrap { font-size: 1.2em; - margin-right: 65px; - margin-left: 0; - /*margin-bottom: 0;*/ float: left; position: relative; max-width: 80%; @@ -460,30 +509,47 @@ a.im_message_video_thumb { margin-left: 80px; float: right; } +.im_message_in.im_content_message_wrap { + margin-right: 65px; + margin-left: 0; +} .im_message_fwd.im_content_message_wrap { float: none; } -.im_history_messages_group .im_message_grouped1 .im_content_message_wrap, -.im_history_messages_group .im_message_grouped2 .im_content_message_wrap, -.im_history_messages_group .im_message_grouped3 .im_content_message_wrap, -.im_history_messages_group .im_message_grouped4 .im_content_message_wrap { - margin-top: 0; +.im_history_messages_group .im_message_in.im_content_message_wrap, +.im_history_messages_group .im_grouped_short .im_message_in.im_content_message_wrap, +.im_history_messages_group .im_grouped .im_message_in.im_content_message_wrap, +.im_history_messages_group .im_grouped_fwd .im_message_in.im_content_message_wrap, +.im_history_messages_group .im_grouped_fwd_short .im_message_in.im_content_message_wrap { + /*margin-top: 0;*/ margin-left: 45px; } -.im_message_grouped1 .im_message_out.im_content_message_wrap, -.im_message_grouped2 .im_message_out.im_content_message_wrap, -.im_message_grouped3 .im_message_out.im_content_message_wrap, -.im_message_grouped4 .im_message_out.im_content_message_wrap { - margin-left: 0; -} -.im_message_grouped1 .im_message_fwd.im_content_message_wrap, -.im_message_grouped2 .im_message_fwd.im_content_message_wrap, -.im_message_grouped3 .im_message_fwd.im_content_message_wrap, -.im_message_grouped4 .im_message_fwd.im_content_message_wrap { +.im_grouped_short .im_message_out.im_message_fwd, +.im_grouped .im_message_out.im_message_fwd, +.im_grouped_fwd .im_message_out.im_message_fwd, +.im_grouped_fwd_short .im_message_out.im_message_fwd { margin-left: 80px; +} +.im_grouped_short .im_content_message_wrap, +.im_grouped .im_content_message_wrap { + margin-top: 0; +} + +.im_grouped_fwd_start .im_message_fwd.im_content_message_wrap, +.im_grouped_short .im_message_fwd.im_content_message_wrap, +.im_grouped .im_message_fwd.im_content_message_wrap, +.im_grouped_fwd .im_message_fwd.im_content_message_wrap, +.im_grouped_fwd_short .im_message_fwd.im_content_message_wrap { margin-top: 0; margin-bottom: 0; } +.im_grouped_fwd_start .im_message_fwd.im_content_message_wrap { + margin-top: 8px; +} +.im_grouped_fwd_end .im_message_fwd.im_content_message_wrap { + margin-bottom: 8px; +} + .im_message_meta { float: none; position: absolute; @@ -498,47 +564,67 @@ a.im_message_video_thumb { left: -60px; } -.im_message_body, -.im_message_document { - padding: 7px 10px; - border-radius: 3px; - background: #f1f1f1; +.im_grouped_fwd .im_message_meta, +.im_grouped_fwd_short .im_message_meta, +.im_grouped_fwd_start .im_message_meta { + display: none; } -.im_message_out .im_message_body, -.im_message_out .im_message_document { - background: #e4ecf2; +.im_grouped_fwd_end .im_message_meta { + display: block; } -.im_message_body_media, -.im_message_out .im_message_body_media { - padding: 0; - border-radius: 0; - background: none; +.im_grouped_fwd_end .im_message_fwd .im_message_date { + display: inline; } -.im_message_selected .im_message_body, -.im_message_selected .im_message_document { - background: #497495; - color: #FFF; +.im_message_out .im_message_fwd_date { + color: #93a2ae; } -.im_message_selected .im_message_body_media { - background: none; - color: inherit; + +.im_message_out .icon-document, +.im_message_out .icon-photo, +.im_message_out .icon-video { + background-color: #dae6f0; + background-position: -2px -542px; } -.im_message_selected .im_message_body a { - color: #FFF; +.im_message_out .icon-audio, +.im_history_selectable .im_message_outer_wrap:hover .icon-audio { + background-color: #dae6f0; + background-position: -2px -697px; +} + +.im_message_out .im_message_document_size, +.im_message_out .im_message_audio_duration, +.im_message_out .im_message_audio_size, +.im_message_out .im_message_fwd_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_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_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_message_from_photo { +.im_message_from_photo, +.im_message_fwd_photo { width: 40px; height: 40px; } a.im_message_from_photo { - margin-right: 5px; + margin: 0; display: none; } .im_history_messages_group a.im_message_from_photo { display: block; + position: absolute; + margin-left: -45px; } .im_message_author { display: none; @@ -548,16 +634,17 @@ a.im_message_from_photo { font-size: 13px; font-weight: normal; } -.im_message_grouped1 a.im_message_from_photo, -.im_message_grouped1 a.im_message_author, -.im_message_grouped2 a.im_message_from_photo, -.im_message_grouped2 a.im_message_author, -.im_message_grouped3 a.im_message_author, -.im_message_grouped3 a.im_message_from_photo, -.im_message_grouped4 a.im_message_author, -.im_message_grouped4 a.im_message_from_photo, +.im_grouped_short a.im_message_from_photo, +.im_grouped_short a.im_message_author, +.im_grouped a.im_message_from_photo, +.im_grouped a.im_message_author, +.im_grouped_fwd a.im_message_author, +.im_grouped_fwd a.im_message_from_photo, +.im_grouped_fwd_short a.im_message_author, +.im_grouped_fwd_short a.im_message_from_photo, .im_message_out a.im_message_author, -.im_message_out a.im_message_from_photo { +.im_message_out a.im_message_from_photo, +.im_message_body_media a.im_message_author { display: none; } .im_message_wrap { @@ -724,7 +811,7 @@ a.im_message_from_photo { } .im_dialog_peer { margin-bottom: 7px; - margin-top: 6px; + margin-top: 5px; } .im_dialog_meta { margin-top: 5px; @@ -754,9 +841,50 @@ a.im_dialog_selected .im_dialog_unread { color: #8f8f8f; } -.im_message_grouped4 .im_message_fwd.im_message_out .im_message_fwd_author_wrap, -.im_message_grouped4 .im_message_fwd.im_message_out .im_message_text, -.im_message_grouped4 .im_message_fwd.im_message_out .im_message_media { +.im_message_fwd_from { + margin-top: 0; +} +.im_grouped_fwd_start .im_message_fwd_title { + display: block; + color: #8a8a8a; + font-size: 13px; + font-weight: normal; + margin-bottom: 5px; +} +.im_history_messages_group .im_message_in .im_message_fwd_title { + margin-top: 5px; +} +.im_message_out .im_message_fwd_title { + color: #798791; +} +.im_message_selected .im_message_body a, +.im_message_selected .im_message_fwd_title, +.im_message_selected .im_message_audio_name, +.im_message_selected .im_message_document_name, +.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_selected:hover .im_message_document_size, +.im_history_selectable .im_message_selected:hover .im_message_audio_duration, +.im_history_selectable .im_message_selected:hover .im_message_audio_size, +.im_history_selectable .im_message_selected:hover .im_message_fwd_date { + color: #FFF; +} + + +a.im_message_fwd_author { + color: #323232; +} +.im_message_fwd .im_message_fwd_author_wrap, +.im_message_fwd .im_message_text, +.im_message_fwd .im_message_media { + 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;*/ } @@ -846,25 +974,22 @@ a.im_dialog_selected .im_dialog_unread { min-width: 0; height: 32px; padding: 0; - background: url(../img/icons/mobile/Msg_send_active.png) 15px 3px no-repeat; - background-size: 24px 24px; border: 0; - color: transparent; position: absolute; right: 0; top: 0; } -.is_1x .im_submit { - background: url(../img/icons/mobile/Msg_send_active.png) 15px 3px no-repeat; - background-size: 24px 24px; -} +.im_submit, +.im_submit:active, .im_submit:hover { - background-color: transparent; + background: url(../img/icons/IconsetW.png) 2px -860px no-repeat; + background-size: 42px 891px; color: transparent; -} -.im_submit:active { box-shadow: none; } +.is_1x .im_submit { + background-image: url(../img/icons/IconsetW_1x.png); +} .im_submit_text { display: none; } @@ -876,27 +1001,25 @@ a.im_dialog_selected .im_dialog_unread { margin: 0; width: 50px; height: 32px; - padding: 4px 13px 4px 16px; + padding: 3px 13px 4px 16px; } .icon-camera { display: inline-block; - width: 22px; - height: 22px; + width: 19px; + height: 23px; vertical-align: text-top; - background: url(../img/icons/mobile/Msg_attach.png) 0 0 no-repeat; - background-size: 22px 22px; + background: url(../img/icons/IconsetW.png) -12px -68px no-repeat; + background-size: 42px 891px; opacity: 1; - margin: 0; } .is_1x .icon-camera { - background-image: url(../img/icons/mobile/Msg_attach.png); + background-image: url(../img/icons/IconsetW_1x.png); } - -.im_media_attach:active .icon-camera, -.is_1x .im_media_attach:active .icon-camera { - background-position: 0 0; - background-image: url(../img/icons/mobile/Msg_attach_active.png); +.im_media_attach:hover .icon-camera, +.im_media_attach:active .icon-camera { + background-position: -12px -100px; + opacity: 1; } .im_media_attach, @@ -913,7 +1036,7 @@ a.im_dialog_selected .im_dialog_unread { left: 0; top: 0; margin: 0; - padding: 5px 13px 4px 13px; + padding: 3px 13px 4px 13px; width: 48px; height: 32px; } @@ -922,20 +1045,19 @@ a.im_dialog_selected .im_dialog_unread { width: 22px; height: 22px; vertical-align: text-top; - background: url(../img/icons/mobile/Msg_smile.png) 0 0 no-repeat; - background-size: 22px 22px; opacity: 1; margin: 0; + background: url(../img/icons/IconsetW.png) -10px -771px no-repeat; + background-size: 42px 891px; } .is_1x .icon-emoji { - background-image: url(../img/icons/mobile/Msg_smile.png); + background-image: url(../img/icons/IconsetW_1x.png); } .im_emoji_btn:active .icon-emoji, .is_1x .im_emoji_btn:active .icon-emoji, .im_emoji_btn.on .icon-emoji, .is_1x .im_emoji_btn.on .icon-emoji { - background-position: 0 0; - background-image: url(../img/icons/mobile/Msg_smile_active.png); + background-position: -10px -803px; } .im_send_field_wrap { diff --git a/app/img/T_LogoM_1x.png b/app/img/T_LogoM_1x.png new file mode 100644 index 00000000..3b46902b Binary files /dev/null and b/app/img/T_LogoM_1x.png differ diff --git a/app/img/icons/IconsetW.png b/app/img/icons/IconsetW.png index 6e8615fa..1f358805 100644 Binary files a/app/img/icons/IconsetW.png and b/app/img/icons/IconsetW.png differ diff --git a/app/img/icons/IconsetW_1x.png b/app/img/icons/IconsetW_1x.png index 75fdc42a..c6000d3d 100644 Binary files a/app/img/icons/IconsetW_1x.png and b/app/img/icons/IconsetW_1x.png differ diff --git a/app/img/icons/mobile/Header_back.png b/app/img/icons/mobile/Header_back.png deleted file mode 100644 index 7a0cddef..00000000 Binary files a/app/img/icons/mobile/Header_back.png and /dev/null differ diff --git a/app/img/icons/mobile/Msg_attach.png b/app/img/icons/mobile/Msg_attach.png deleted file mode 100644 index e847fd48..00000000 Binary files a/app/img/icons/mobile/Msg_attach.png and /dev/null differ diff --git a/app/img/icons/mobile/Msg_attach_active.png b/app/img/icons/mobile/Msg_attach_active.png deleted file mode 100644 index 4d0c54ce..00000000 Binary files a/app/img/icons/mobile/Msg_attach_active.png and /dev/null differ diff --git a/app/img/icons/mobile/Msg_send.png b/app/img/icons/mobile/Msg_send.png deleted file mode 100644 index 6603e4bd..00000000 Binary files a/app/img/icons/mobile/Msg_send.png and /dev/null differ diff --git a/app/img/icons/mobile/Msg_send_active.png b/app/img/icons/mobile/Msg_send_active.png deleted file mode 100644 index 0cad4dfe..00000000 Binary files a/app/img/icons/mobile/Msg_send_active.png and /dev/null differ diff --git a/app/img/icons/mobile/Msg_smile.png b/app/img/icons/mobile/Msg_smile.png deleted file mode 100644 index 414b4b87..00000000 Binary files a/app/img/icons/mobile/Msg_smile.png and /dev/null differ diff --git a/app/img/icons/mobile/Msg_smile_active.png b/app/img/icons/mobile/Msg_smile_active.png deleted file mode 100644 index 53424a32..00000000 Binary files a/app/img/icons/mobile/Msg_smile_active.png and /dev/null differ diff --git a/app/img/icons/mobile/T_LogoM.png b/app/img/icons/mobile/T_LogoM.png deleted file mode 100644 index 382cc029..00000000 Binary files a/app/img/icons/mobile/T_LogoM.png and /dev/null differ diff --git a/app/js/directives.js b/app/js/directives.js index 55d3143f..6196c647 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -32,6 +32,11 @@ angular.module('myApp.directives', ['myApp.filters']) }; }) + .directive('myServiceMessage', function() { + return { + templateUrl: 'partials/message_service.html' + }; + }) .directive('myMessagePhoto', function() { return { templateUrl: 'partials/message_attach_photo.html' @@ -710,7 +715,7 @@ angular.module('myApp.directives', ['myApp.filters']) updateHeight(); $scope.$apply(function () { - $scope.draftMessage.text = richTextarea.innerText; + $scope.draftMessage.text = richTextarea.textContent; }); $timeout.cancel(updatePromise); @@ -1614,7 +1619,7 @@ angular.module('myApp.directives', ['myApp.filters']) } element.on('click', function (e) { - $rootScope.openUser(userID); + $rootScope.openUser($scope.userID); }); if (attrs.imgClass) { diff --git a/app/js/services.js b/app/js/services.js index 92dcd986..17460284 100644 --- a/app/js/services.js +++ b/app/js/services.js @@ -1788,7 +1788,8 @@ angular.module('myApp.services', []) function regroupWrappedHistory (history, limit) { var start = 0, - end = history.length, + len = history.length, + end = len, i, curDay, prevDay, curMessage, prevMessage; if (limit > 0) { @@ -1816,12 +1817,24 @@ angular.module('myApp.services', []) var singleLine = curMessage.message && curMessage.message.length < 70 && curMessage.message.indexOf("\n") == -1; if (curMessage.fwd_from_id && curMessage.fwd_from_id == prevMessage.fwd_from_id) { - curMessage.grouped = singleLine ? 4 : 3; + curMessage.grouped = singleLine ? 'im_grouped_fwd_short' : 'im_grouped_fwd'; } else { - curMessage.grouped = !curMessage.fwd_from_id && singleLine ? 1 : 2; + curMessage.grouped = !curMessage.fwd_from_id && singleLine ? 'im_grouped_short' : 'im_grouped'; + } + if (curMessage.fwd_from_id) { + if (!prevMessage.grouped) { + prevMessage.grouped = 'im_grouped_fwd_start'; + } + if (curMessage.grouped && i == len - 1) { + curMessage.grouped += ' im_grouped_fwd_end'; + } } } else if (prevMessage || !i) { delete curMessage.grouped; + + if (prevMessage && prevMessage.grouped && prevMessage.fwd_from_id) { + prevMessage.grouped += ' im_grouped_fwd_end'; + } } prevMessage = curMessage; prevDay = curDay; @@ -1854,6 +1867,7 @@ angular.module('myApp.services', []) case 'messageMediaPhoto': notificationMessage = 'Photo'; break; case 'messageMediaVideo': notificationMessage = 'Video'; break; case 'messageMediaDocument': notificationMessage = 'Document'; break; + case 'messageMediaAudio': notificationMessage = 'Voice message'; break; case 'messageMediaGeo': notificationMessage = 'Location'; break; case 'messageMediaContact': notificationMessage = 'Contact'; break; default: notificationMessage = 'Attachment'; break; diff --git a/app/partials/login.html b/app/partials/login.html index 94e703f6..f4b93037 100644 --- a/app/partials/login.html +++ b/app/partials/login.html @@ -40,7 +40,7 @@
- +