From 24534d29b71000c8e9fb19e7135d4a58d5e8c50b Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Sun, 28 Dec 2014 15:38:48 +0100 Subject: [PATCH] New design for desktop Added external google fonts [temp] --- app/css/app.css | 364 +++---------- app/css/desktop.css | 628 ++++++++++++++++++----- app/css/mobile.css | 97 +++- app/img/icons/General.png | Bin 0 -> 12622 bytes app/img/icons/General_1x.png | Bin 0 -> 6072 bytes app/index.html | 1 + app/js/controllers.js | 26 +- app/js/directives.js | 3 +- app/js/lib/ng_utils.js | 4 +- app/js/locales/en-us.json | 5 +- app/partials/desktop/head.html | 111 +++- app/partials/desktop/im.html | 93 +--- app/partials/desktop/settings_modal.html | 4 +- app/partials/mobile/head.html | 2 +- app/webogram.appcache | 2 +- gulpfile.js | 25 + package.json | 33 +- 17 files changed, 835 insertions(+), 563 deletions(-) create mode 100644 app/img/icons/General.png create mode 100644 app/img/icons/General_1x.png diff --git a/app/css/app.css b/app/css/app.css index 7ce1ede4..da0e1f95 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -2,30 +2,27 @@ html { display: none; - background: #dee4e9 url(../img/bg_tile.png) 0 0 repeat; + background: #e7ebf0; overflow: visible; } body { color: #000; background: none; - font: 12px/18px "Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, Verdana, sans-serif; + font: 12px/18px 'Open Sans', "Lucida Grande", "Lucida Sans Unicode", Tahoma, sans-serif; overflow: visible; } -.font-light { - font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Light", Helvetica, Arial , Verdana, sans-serif; - font-weight: 300; -} -body.non_osx, -.non_osx .font-light { - font: 13px/18px Tahoma, sans-serif, Arial, Helvetica; - font-weight: normal; -} h1, h2, h3, h4, h5 { color: #222; } .non_osx h4 { font-size: 17px; } +.noselect { + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} a { cursor: pointer; } @@ -186,59 +183,6 @@ input[type="number"] { background: #fbe7e6; } -.tg_page_head .navbar-quick-nav, -.tg_page_head .navbar-toggle { - display: none; -} -.tg_page_head .container { - display: block; - width: auto; - padding-left: 0; - padding-right: 0; -} -.tg_page_head .container .navbar-header { - margin: 0; -} -.tg_page_head .navbar-inverse { - border: 0; - - -webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.11); - -moz-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.11); - box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.11); - - margin: 0; -} -.ios_standalone .tg_page_head .navbar > .container { - margin-top: 20px; -} -.ios_standalone .modal.mobile_modal { - border-top: 20px solid #497495; -} -.tg_page_head .navbar > .container .navbar-brand { - padding: 8px 15px; - opacity: 0.9; - margin-left: 0; - margin-right: 20px; - -webkit-transition: opacity swing .9s; - display: block; - line-height: 0; - height: auto; -} -.tg_page_head .navbar > .container .navbar-brand:hover { - opacity: 1; -} -.tg_head_logo { - background: url(../img/T_LogoM.png) 0 0 no-repeat; - background-size: 143px 30px; - display: inline-block; - width: 143px; - height: 30px; - vertical-align: text-top; -} -.is_1x .tg_head_logo { - background-image: url(../img/T_LogoM_1x.png); -} - .navbar_offline .navbar-header, @@ -258,36 +202,6 @@ input[type="number"] { line-height: 20px; } -.tg_page_head .navbar-menu .navbar-nav.navbar-right { - margin-right: 0; -} - - -.tg_page_head .navbar-inverse .navbar-nav > li > a { - padding-top: 13px; - padding-bottom: 13px; - color: #b9cfe3; - font-size: 13px; -} -.tg_page_head .navbar-inverse .navbar-nav > li > a:hover { - color: #FFF; -} -.tg_page_head .navbar-inverse .navbar-toggle { - border-color: #497495; - outline: 0; - border: 0; -} -.tg_page_head .navbar-inverse .navbar-collapse, -.tg_page_head .navbar-inverse .navbar-form { - border-color: #497495; -} - -.tg_page_head .navbar-inverse .navbar-toggle:hover, -.tg_page_head .navbar-inverse .navbar-toggle:active, -.tg_page_head .navbar-inverse .navbar-toggle:focus { - background-color: rgba(255,255,255,0.1); -} - .tg_progress { height: 12px; @@ -468,6 +382,7 @@ input[type="number"] { margin-top: 0; margin-bottom: 38px; text-align: left; + font-weight: bold; } .md_simple_form_description { color: #777; @@ -897,9 +812,6 @@ img.welcome_logo { .im_dialogs_search { position: relative; } -.im_page_split .im_dialogs_search { - margin-right: 48px; -} .im_dialogs_search_field { font-size: 12px; line-height: normal; @@ -1056,15 +968,6 @@ a.im_dialog_selected .im_dialog_message_text { .active a.im_dialog .im_dialog_message { color: #FFF; } -.im_dialog_photo { - width: 40px; - height: 40px; - line-height: 40px; - border-radius: 2px; - overflow: hidden; - margin: 0 10px 0 0; - -} .im_dialog_peer { color: #222; font-weight: bold; @@ -1190,26 +1093,6 @@ a.im_dialog_selected .im_dialog_date { position: relative; } -.im_history_typing_wrap { - line-height: 18px; - width: 100%; - height: 49px; - padding: 13px 0 18px; - overflow: hidden; - -webkit-user-select: none; -} -.im_history_typing { - font-size: 11px; - color: #999; - max-width: 526px; - margin: 0 auto; - padding: 0 77px 0 77px; -} -.im_history_typing a.im_history_typing_author { - color: #999; - font-weight: bold; -} - .im_message_unread_split { background: #f0f4f7; @@ -1235,19 +1118,19 @@ a.im_dialog_selected .im_dialog_date { .im_message_from_photo, .im_message_contact_photo, .im_message_fwd_photo { - width: 36px; - height: 36px; + width: 42px; + height: 42px; border-radius: 50%; overflow: hidden; } .im_message_from_photo .peer_initials, .im_message_contact_photo .peer_initials, .im_message_fwd_photo .peer_initials { - line-height: 36px; + line-height: 42px; } a.im_message_from_photo, a.im_message_contact_photo { - margin: 0 12px 0 0; + margin: 0 15px 0 0; } .non_osx .im_message_contact_name { font-size: 12px; @@ -1415,50 +1298,48 @@ div.im_message_video_thumb { float: left; width: 42px; height: 42px; - border-radius: 0; + border-radius: 50%; margin-right: 10px; } .im_message_file_button_icon { display: inline-block; line-height: 0; - /*#dae4ea 50%*/ - background: url(../img/icons/IconsetW.png) -15px -953px no-repeat; - background-size: 42px 1171px; + background: url(../img/icons/General.png) no-repeat -14px -509px; + background-size: 40px 678px; width: 12px; - height: 20px; - margin: 11px 15px; + height: 18px; + margin: 12px 15px; } .is_1x .im_message_file_button_icon { - background-image: url(../img/icons/IconsetW_1x.png); + background-image: url(../img/icons/General_1x.png); } .im_message_file_button_dl_doc .im_message_file_button_icon { - background-position: -13px -983px; + background-position: -12px -561px; width: 16px; height: 18px; - margin: 12px 13px; + margin: 13px 13px; } .im_message_file_button_dl_audio { background: #6490b1; - border-radius: 2px; + border-radius: 50%; } .im_message_file_button_dl_audio .im_message_file_button_icon { display: block; - width: 15px; - height: 18px; - background: url(../img/icons/IconsetW.png) -15px -897px no-repeat; - background-size: 42px 1171px; - margin: 12px 13.5px; + width: 14px; + height: 16px; + background: url(../img/icons/General.png) no-repeat -13px -611px; + background-size: 40px 678px;; + margin: 13px 16px; } .is_1x .im_message_file_button_dl_audio .im_message_file_button_icon { - background-image: url(../img/icons/IconsetW_1x.png); - background-position: -15px -899px; + background-image: url(../img/icons/General_1x.png); } .im_message_file_button_dl_audio .audio_player_btn_icon_pause, .is_1x .im_message_file_button_dl_audio .audio_player_btn_icon_pause { width: 12px; - height: 16px; - background-position: -15px -927px; - margin: 13px 15px; + height: 14px; + background-position: -14px -587px; + margin: 14px 15px; } .im_message_selected .icon-document, @@ -1566,19 +1447,11 @@ img.im_message_document_thumb { width: 200px; } .audio_player_seek_slider .tg_slider_wrap { - height: 16px; - line-height: 16px; -} -.audio_player_seek_slider .tg_slider_thumb { - background: #6490b1; - width: 4px; - height: 16px; - line-height: 16px; - margin-top: 0; - border-radius: 0; + height: 18px; + line-height: 18px; } .audio_player_seek_slider .tg_slider_track { - margin: 6px 0; + margin: 7px 0; background: rgba(218,228,234,0.50); height: 4px; border-radius: 0; @@ -1594,14 +1467,14 @@ img.im_message_document_thumb { float: left; } .audio_player_volume_slider .tg_slider_wrap { - height: 16px; - line-height: 16px; + height: 18px; + line-height: 18px; } .audio_player_volume_slider .tg_slider_thumb { display: none; background: #6490b1; width: 4px; - height: 8px; + height: 10px; line-height: 16px; margin-top: 4px; border-radius: 0; @@ -1610,7 +1483,7 @@ img.im_message_document_thumb { display: block; } .audio_player_volume_slider .tg_slider_track { - margin: 6px 0; + margin: 7px 0; background: rgba(218,228,234,0.50); height: 4px; } @@ -1713,10 +1586,6 @@ img.im_message_document_thumb { } - -.im_content_message_wrap { - margin: 8px 0px 8px 16px -} .im_message_date, .im_message_fwd_date { color: #adadad; @@ -1741,6 +1610,7 @@ a.im_message_fwd_photo { .im_message_text { word-wrap: break-word; + line-height: 150%; } span.emoji { @@ -1800,7 +1670,7 @@ span.emoji { .im_send_panel_wrap { margin: 0 auto; - padding: 10px 15px 22px 15px; + padding: 10px 15px 30px 15px; } .im_send_form_wrap { position: relative; @@ -1810,6 +1680,19 @@ span.emoji { position: absolute; bottom: 0; } +.im_attach_input, +.im_media_attach_input { + cursor: pointer; + font-size: 120px !important; + opacity: 0.01; + position: absolute; + z-index: 100; + margin: 0; + padding: 0; + + top: 0; + right: 0; +} .im_send_dropbox_wrap { background: #FFF; @@ -1830,115 +1713,6 @@ textarea.im_message_field { height: 50px; resize: none; } -.im_attach { - cursor: pointer; - display: block; - overflow: hidden; - position: relative; - padding: 0 2px; - - width: 23px; - height: 24px; - margin-top: 4px; - margin-left: 20px; -} - -.icon-paperclip { - display: inline-block; - width: 19px; - height: 23px; - vertical-align: text-top; - background: url(../img/icons/IconsetW.png) -12px -68px no-repeat; - background-size: 42px 1171px; - opacity: 0.8; -} -.is_1x .icon-paperclip { - background-image: url(../img/icons/IconsetW_1x.png); -} -.im_attach:hover .icon-paperclip { - opacity: 1; -} -.im_attach:active .icon-paperclip { - background-position: -12px -100px; - opacity: 1; -} - -.im_emoji_btn { - cursor: pointer; - padding: 0; - - width: 23px; - height: 23px; - margin-top: 4px; -} -.icon-emoji { - display: inline-block; - width: 23px; - height: 23px; - vertical-align: text-top; - background: url(../img/icons/IconsetW.png) -10px -4px no-repeat; - background-size: 42px 1171px; - opacity: 0.8; -} -.is_1x .icon-emoji { - background-image: url(../img/icons/IconsetW_1x.png); -} -.im_emoji_btn:hover .icon-emoji { - opacity: 1; -} -.im_emoji_btn:active .icon-emoji, -.im_emoji_btn.on .icon-emoji { - background-position: -10px -36px; - opacity: 1; -} -.im_attach_input, -.im_media_attach_input { - cursor: pointer; - font-size: 120px !important; - opacity: 0.01; - position: absolute; - z-index: 100; - margin: 0; - padding: 0; - - top: 0; - right: 0; -} - - -.im_media_attach { - cursor: pointer; - display: block; - overflow: hidden; - position: relative; - padding: 0; - - width: 24px; - height: 22px; - margin-top: 5px; - margin-left: 20px; -} - - -.icon-camera { - display: inline-block; - width: 25px; - height: 21px; - vertical-align: text-top; - background: url(../img/icons/IconsetW.png) -9px -132px no-repeat; - background-size: 42px 1171px; - opacity: 0.8; -} -.is_1x .icon-camera { - background-image: url(../img/icons/IconsetW_1x.png); -} -.im_media_attach:hover .icon-camera { - opacity: 1; -} -.im_media_attach:active .icon-camera { - background-position: -9px -162px; - opacity: 1; -} .icon-online { @@ -2032,7 +1806,7 @@ img.img_fullsize { font-size: 12px; margin-bottom: 10px; padding: 6px; - min-height: 36px; + min-height: 38px; height: auto; width: auto; max-height: 284px; @@ -2077,14 +1851,14 @@ img.img_fullsize { padding: 5px 2px 5px 5px; } .emoji-items-wrap1 .emoji-menu-tabs { - width: 100%; - margin-bottom: 8px; - margin-top: 3px; + width: 100%; + margin-bottom: 8px; + margin-top: 3px; } .emoji-items-wrap1 .emoji-menu-tabs td { - text-align: center; - color: white; - line-height: 0; + text-align: center; + color: white; + line-height: 0; } .emoji-menu-tabs .emoji-menu-tab { display: inline-block; @@ -2465,10 +2239,6 @@ img.chat_modal_participant_photo { /* Messages edit panel */ -.im_edit_panel_wrap { - padding: 10px 0 34px; - margin: 0 24px 0 12px; -} .im_edit_panel_border { display: block; margin: 0 0 34px 3px; @@ -2508,18 +2278,6 @@ img.chat_modal_participant_photo { color: #899daf; } -.icon-select-tick { - display: none; - width: 26px; - height: 26px; - margin: 13px 0 0 40px; - background: url(../img/icons/IconsetW.png) -9px -516px no-repeat; - background-size: 42px 1171px; -} -.is_1x .icon-select-tick { - background-image: url(../img/icons/IconsetW_1x.png); -} - /* Colorized user names @@ -2882,7 +2640,7 @@ a.peer_photo_init:focus { color: #999; cursor: pointer; display: block; - font-size: 12px; + font-size: 13px; margin: 0; padding: 0; z-index: 1; diff --git a/app/css/desktop.css b/app/css/desktop.css index dcf23d00..a5b820f8 100644 --- a/app/css/desktop.css +++ b/app/css/desktop.css @@ -1,17 +1,263 @@ -.navbar-nav > li { +.tg_head_wrap { +} +.tg_head_split { + max-width: 1010px; + margin: 0 auto; + height: 48px; + background: #517b9b; +} +.tg_head_logo_wrap { + float: left; + width: 31%; +} +.tg_head_main_wrap { float: left; + width: 69%; + white-space: nowrap; +} + +.tg_head_btn { + display: block; + padding: 16px 19px; + color: #b9cfe3; + font-size: 13px; + line-height: 16px; +} +.dropdown.open .tg_head_btn, +.tg_head_btn:hover { + color: #FFF; + text-decoration: none; + background: #3f6c8c; +} + +.tg_head_logo_dropdown .dropdown-toggle { + color: #FFF; + padding: 17px 20px 15px 22px; + display: block; + font-size: 14px; + line-height: 14px; + vertical-align: top; +} +.tg_head_logo_dropdown .dropdown-toggle:hover, +.tg_head_logo_dropdown .dropdown-toggle:focus, +.tg_head_logo_dropdown .dropdown-toggle:active { + text-decoration: none; +} +.tg_head_logo_dropdown .dropdown-toggle .tg_head_logo_text { + display: inline-block; + vertical-align: top; +} +.icon-hamburger-wrap { + display: inline-block; + width: 18px; + height: 14px; +} +.tg_head_logo_dropdown .icon-hamburger-wrap { + margin: 0 40px 0 0; +} +.icon-hamburger-wrap .icon-bar { + background: #fff; + display: block; + height: 2px; + margin-bottom: 4px; +} +.icon-hamburger-wrap .icon-bar:last-child { + margin-bottom: 0; +} + +.tg_head_logo_dropdown .dropdown-menu { + border-radius: 0; + padding: 9px 0 7px; + + margin: -1px 0 0; + float: none; + right: 0; + border: 1px solid rgba(15, 60, 96, 0.2); + -webkit-box-shadow: 0px 1px 3px 0px rgba(60,75,87,0.27); + -moz-box-shadow: 0px 1px 3px 0px rgba(60,75,87,0.27); + box-shadow: 0px 1px 3px 0px rgba(60,75,87,0.27); +} +.tg_head_logo_dropdown .dropdown-menu > li > a { + font-size: 12px; + line-height: 21px; + padding: 11px 19px 10px 21px; + color: #42749b; } -.tg_page_head .navbar > .container .navbar-brand { - margin-right: 0; +.tg_head_logo_dropdown .dropdown-menu > li > a:hover { + background: #f2f6fa; } -.navbar-header { +.tg_head_logo_dropdown .dropdown-menu > li > a span { + vertical-align: top; +} + +.icon-new-group { + width: 20px; + height: 14px; + margin-right: 38px; + display: inline-block; + background: url(../img/icons/General.png) no-repeat -10px -111px; + background-size: 40px 678px; + vertical-align: top; + margin-top: 3px; +} +.icon-contacts { + width: 18px; + height: 18px; + margin-right: 40px; + margin-top: 2px; + display: inline-block; + vertical-align: top; + background: url(../img/icons/General.png) no-repeat -11px -135px; + background-size: 40px 678px; +} +.icon-settings { + width: 20px; + height: 20px; + margin-right: 38px; + margin-top: 1px; + display: inline-block; + vertical-align: top; + background: url(../img/icons/General.png) no-repeat -10px -163px; + background-size: 40px 678px; +} +.icon-faq { + width: 20px; + height: 20px; + margin-right: 38px; + margin-top: 1px; + display: inline-block; + vertical-align: top; + background: url(../img/icons/General.png) no-repeat -10px -637px; + background-size: 40px 678px; +} +.icon-about { + width: 21px; + height: 21px; + margin-right: 37px; + display: inline-block; + vertical-align: top; + background: url(../img/icons/General.png) no-repeat -10px -193px; + background-size: 40px 678px; +} + + +.tg_head_connecting_text { + color: #b9cfe3; + padding: 14px 15px; + font-size: 13px; + display: block; + line-height: 20px; float: left; } -.navbar-right { +.tg_head_connecting_wrap .tg_head_btn { + float: left; +} +.tg_head_peer_dropdown { float: right; - margin: 0; +} +.tg_head_peer_dropdown .dropdown-menu { + max-width: 100%; + border-radius: 0; + padding: 9px 0; + + margin: -1px 0 0 0; + border: 1px solid rgba(15, 60, 96, 0.2); + -webkit-box-shadow: 0px 1px 3px 0px rgba(60,75,87,0.27); + -moz-box-shadow: 0px 1px 3px 0px rgba(60,75,87,0.27); + box-shadow: 0px 1px 3px 0px rgba(60,75,87,0.27); +} +.tg_head_peer_more_dropdown .dropdown-menu { + left: auto; + right: 0; } +.tg_head_peer_dropdown .dropdown-menu > li > a { + font-size: 12px; + line-height: 15px; + padding: 11px 18px 11px 18px; + color: #52719a; +} +.tg_head_peer_dropdown .dropdown-menu > li > a:hover { + background: #f3f6fa; +} + +.tg_head_peer_return_btn { + float: right; +} +.tg_head_peer_return_count { + color: #FFF; + margin-left: 3px; +} +.tg_head_peer_title_wrap { + overflow: hidden; +} +.tg_head_peer_title_wrap .tg_head_btn { + padding: 15px 19px 15px; + line-height: 18px; +} +.tg_head_peer_title_wrap .tg_head_btn .tg_head_peer_info { + display: block; + white-space: nowrap; + overflow: hidden; + -ms-text-overflow: ellipsis; + text-overflow: ellipsis; +} + +.tg_head_peer_title { + display: inline-block; + color: #fff; + margin-right: 3px; + -ms-text-overflow: ellipsis; + text-overflow: ellipsis; + max-width: 180px; + overflow: hidden; + vertical-align: top; +} + +.tg_head_peer_media { + padding: 14px 19px; + color: #FFF; + font-size: 13px; + line-height: 20px; + float: left; +} +.icon-filter-photos, +.icon-filter-video, +.icon-filter-documents, +.icon-filter-audio { + display: inline-block; + background: url(../img/icons/General.png) no-repeat 0 0; + background-size: 40px 678px; + margin-right: 12px; + vertical-align: top; +} +.icon-filter-photos { + width: 18px; + height: 18px; + background-position: -11px -223px; + margin-top: 1px; +} +.icon-filter-video { + width: 16px; + height: 18px; + background-position: -12px -278px; + margin-top: 1px; +} +.icon-filter-documents { + width: 18px; + height: 17px; + background-position: -11px -251px; + margin-top: 1px; +} +.icon-filter-audio { + width: 14px; + height: 19px; + background-position: -13px -306px; + margin-top: 0; +} + + + /** initial setup **/ .nano { position : relative; @@ -102,15 +348,19 @@ .im_page_wrap { background: #FFF; - max-width: 1000px; + max-width: 1010px; min-width: 300px; margin: 0 auto; - -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: 0px 1px 0 #dfe5ec; + -moz-box-shadow: 0px 1px 0 #dfe5ec; + box-shadow: 0px 1px 0 #dfe5ec; border-radius: 0 0 3px 3px; + + border-left: 1px solid #dfe5ec; + border-right: 1px solid #dfe5ec; + border-bottom: 1px solid #d2dbe3; overflow: hidden; } @@ -121,6 +371,9 @@ color: #9cacb9; line-height: 40px; } +.footer_empty { + height: 23px; +} .footer_brand { color: #9cacb9; font-weight: bold; @@ -240,67 +493,7 @@ a.footer_link.active:active { } -.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; @@ -315,6 +508,26 @@ a.footer_link.active:active { transition: all ease-in-out 0.2s; } +.im_history_typing_wrap { + line-height: 18px; + width: 100%; + height: 49px; + padding: 13px 0 18px; + overflow: hidden; + -webkit-user-select: none; +} +.im_history_typing { + font-size: 11px; + color: #999; + max-width: 526px; + margin: 0 auto; + padding: 0 77px 0 71px; +} +.im_history_typing a.im_history_typing_author { + color: #999; + font-weight: bold; +} + /* Contacts modal */ .contacts_modal_window .modal-dialog { max-width: 420px; @@ -346,7 +559,7 @@ a.footer_link.active:active { border-radius: 7px; position: absolute; margin-left: -26px; - margin-top: 13px; + margin-top: 16px; opacity: 0; } .im_message_unread .icon-message-status { @@ -369,7 +582,10 @@ a.footer_link.active:active { opacity: 1; } - +.im_edit_panel_wrap { + padding: 15px 0 38px; + margin: 0 24px 0 12px; +} .im_edit_flush_link, .im_edit_cancel_link { display: block; @@ -391,11 +607,19 @@ a.footer_link.active:active { } .im_submit { - padding: 6px 13px; + color: #4e92ca; font-size: 13px; - line-height: 17px; - min-width: 60px; - border-radius: 2px; + line-height: 18px; + height: 18px; + border-radius: 0; + float: right; + min-width: 0; + width: auto; + padding: 0; +} +.im_submit:hover { + color: #2c78b6; + background: inherit; } .im_message_selected .im_message_date, @@ -415,10 +639,24 @@ a.footer_link.active:active { display: none; cursor: pointer; position: absolute; - width: 112px; - height: 52px; - margin: -8px 0 0 -112px; - -webkit-user-select: text; + width: 99px; + height: 58px; + margin: -8px 0 0 -99px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} +.icon-select-tick { + display: none; + width: 26px; + height: 26px; + margin: 16px 0 0 40px; + background: url(../img/icons/IconsetW.png) -9px -516px no-repeat; + background-size: 42px 1171px; +} +.is_1x .icon-select-tick { + background-image: url(../img/icons/IconsetW_1x.png); } @media (min-width: 1024px) { .im_content_message_select_area { @@ -471,7 +709,15 @@ a.footer_link.active:active { vertical-align: bottom; } -@media (max-height: 600px) { +@media (max-height: 600px), (max-width: 1010px) { + .im_page_wrap { + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + border-bottom: 0; + border-radius: 0; + } + .footer_wrap { display: none; } @@ -512,42 +758,45 @@ a.footer_link.active:active { } } - +.im_message_fwd_author_wrap { + margin: 1px 0 4px; + display: inline-block; +} .im_message_fwd_author { margin-right: 5px; } .im_message_fwd .im_message_fwd_author_wrap, .im_message_fwd .im_message_text, .im_message_fwd .im_message_media { - margin-left: 42px; + margin-left: 52px; } .im_send_panel_wrap { - max-width: 526px; + max-width: 554px; } .im_send_form { - max-width: 389px; - left: 62px; - right: 62px; + max-width: 382px; + left: 70px; + right: 72px; } .im_panel_peer_photo, .im_panel_own_photo { - width: 50px; - height: 50px; - line-height: 50px; - border-radius: 25px; + width: 52px; + height: 52px; + line-height: 52px; + border-radius: 24px; overflow: hidden; } div.im_panel_peer_photo, a.im_panel_peer_photo { cursor: pointer; - margin-left: 12px; + margin-left: 20px; height: 55px; } a.im_panel_own_photo { display: block; - margin-right: 12px; + margin-right: 18px; } a.im_panel_own_photo .peer_initials, div.im_panel_peer_photo .peer_initials, @@ -568,9 +817,126 @@ a.im_panel_peer_photo .peer_initials { margin-top: -12px; margin-left: 36px; } + +.im_emoji_btn { + position: absolute; + right: 3px; + top: 2px; + cursor: pointer; + padding: 0; + + width: 22px; + height: 22px; + margin-top: 1px; +} +.icon-emoji { + display: inline-block; + width: 22px; + height: 22px; + vertical-align: top; + background: url(../img/icons/General.png) no-repeat -9px -335px; + background-size: 40px 678px; + opacity: 0.8; +} +.is_1x .icon-emoji { + background-image: url(../img/icons/IconsetW_1x.png); +} +.im_emoji_btn:hover .icon-emoji { + opacity: 1; +} +.im_emoji_btn:active .icon-emoji, +.im_emoji_btn.on .icon-emoji { + background-position: -9px -367px; + opacity: 1; +} + +.im_send_field_wrap { + margin-bottom: 20px; +} .emoji-wysiwyg-editor, .im_message_field { border-radius: 0; + border: 0; + box-shadow: none; + outline: none; + box-shadow: 0 1px 0 0 #e8e8e8; + padding: 1px 30px 1px 0; + margin: 0; + min-height: 50px; + line-height: 20px; + height: auto; +} +.emoji-wysiwyg-editor:focus, +.im_message_field:focus { + box-shadow: none; + outline: none; + box-shadow: 0 2px 0 0 #77b7e4; +} + +.im_attach { + cursor: pointer; + display: block; + overflow: hidden; + position: relative; + + width: 18px; + height: 17px; + margin-right: 28px; + margin-top: 1px; +} + +.icon-paperclip { + display: inline-block; + width: 18px; + height: 17px; + vertical-align: top; + background: url(../img/icons/General.png) no-repeat -11px -455px; + background-size: 40px 678px; + opacity: 0.8; + margin: 0; +} +.is_1x .icon-paperclip { + background-image: url(../img/icons/IconsetW_1x.png); +} +.im_attach:hover .icon-paperclip { + opacity: 1; +} +.im_attach:active .icon-paperclip { + background-position: -11px -482px; + opacity: 1; +} + + +.im_media_attach { + cursor: pointer; + display: block; + overflow: hidden; + position: relative; + padding: 0; + + width: 20px; + height: 18px; +} + + +.icon-camera { + display: inline-block; + width: 20px; + height: 18px; + vertical-align: top; + background: url(../img/icons/General.png) no-repeat -10px -399px; + background-size: 40px 678px; + opacity: 0.8; +} +.is_1x .icon-camera { + background-image: url(../img/icons/IconsetW_1x.png); +} +.im_media_attach:hover .icon-camera { + opacity: 1; +} +.im_media_attach:active .icon-camera { + background-position: -10px -427px; + opacity: 1; } /* Peer modals */ @@ -873,20 +1239,29 @@ a.im_panel_peer_photo .peer_initials { } .im_message_wrap { - max-width: 526px; - padding: 0 15px; + max-width: 560px; + padding: 0 15px 0 15px; margin: 0 auto; -} - -.im_message_wrap { position: static; } +.im_content_message_wrap { + margin: 8px 10px 8px 16px +} +.im_grouped_short .im_content_message_wrap { + margin: 6px 10px 6px 16px +} @media (min-width: 901px) { .im_message_wrap { position: relative; } } + +.im_message_author { + margin: 1px 0 4px; + display: inline-block; +} + /* Groupings */ .im_message_fwd_from { margin-top: 5px; @@ -912,18 +1287,31 @@ a.im_panel_peer_photo .peer_initials { .im_grouped .im_message_body, .im_grouped_fwd .im_message_body, .im_grouped_fwd_short .im_message_body { - margin-left: 46px; + margin-left: 57px; } .im_grouped_short .im_content_message_select_area, .im_grouped .im_content_message_select_area { - height: 34px; + height: 50px; +} +.im_message_fwd .im_content_message_select_area { + margin-top: -4px; +} +.im_grouped_fwd .im_message_fwd .im_content_message_select_area, +.im_grouped_fwd_short .im_message_fwd .im_content_message_select_area { + margin-top: -8px; } + .im_history_appending .im_content_message_select_area { height: 52px; } -.im_grouped_short .icon-select-tick, +.im_message_fwd .icon-select-tick { + margin-top: 12px; +} +.im_grouped_short .icon-select-tick { + margin-top: 4px; +} .im_grouped_fwd_short .icon-select-tick { - margin-top: 5px; + margin-top: 2px; } .im_grouped_short .icon-message-status, .im_grouped_fwd_short .icon-message-status { @@ -958,35 +1346,6 @@ a.im_panel_peer_photo .peer_initials { 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; -} .im_dialogs_scrollable_wrap a.im_dialog { padding: 7px 16px; } @@ -999,9 +1358,10 @@ a.im_panel_peer_photo .peer_initials { height: 48px; line-height: 48px; border-radius: 50%; + overflow: hidden; } div.im_dialog_photo { - margin-right: 12px; + margin-right: 15px; } div.im_dialog_photo .peer_initials { line-height: 48px; @@ -1010,6 +1370,10 @@ div.im_dialog_photo .peer_initials { .im_dialog_message { margin-top: 5px; } +.im_dialog_peer { + margin-top: 3px; + margin-bottom: 3px; +} .active .im_dialog_date, .active a.im_dialog:hover .im_dialog_date, .active a.im_dialog_selected .im_dialog_date { diff --git a/app/css/mobile.css b/app/css/mobile.css index a2dbe7a1..71d428fe 100644 --- a/app/css/mobile.css +++ b/app/css/mobile.css @@ -3,6 +3,7 @@ html { } + .dropdown-menu { border-radius: 0; } @@ -14,6 +15,89 @@ html { margin: 0; } +.tg_page_head .navbar-quick-nav, +.tg_page_head .navbar-toggle { + display: none; +} +.tg_page_head .container { + display: block; + width: auto; + padding-left: 0; + padding-right: 0; +} +.tg_page_head .container .navbar-header { + margin: 0; +} +.tg_page_head .navbar-inverse { + border: 0; + + -webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.11); + -moz-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.11); + box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.11); + + margin: 0; +} +.ios_standalone .tg_page_head .navbar > .container { + margin-top: 20px; +} +.ios_standalone .modal.mobile_modal { + border-top: 20px solid #497495; +} +.tg_page_head .navbar > .container .navbar-brand { + padding: 8px 15px; + opacity: 0.9; + margin-left: 0; + margin-right: 20px; + -webkit-transition: opacity swing .9s; + display: block; + line-height: 0; + height: auto; +} +.tg_page_head .navbar > .container .navbar-brand:hover { + opacity: 1; +} +.tg_head_logo { + background: url(../img/T_LogoM.png) 0 0 no-repeat; + background-size: 143px 30px; + display: inline-block; + width: 143px; + height: 30px; + vertical-align: text-top; +} +.is_1x .tg_head_logo { + background-image: url(../img/T_LogoM_1x.png); +} + +.tg_page_head .navbar-menu .navbar-nav.navbar-right { + margin-right: 0; +} + + +.tg_page_head .navbar-inverse .navbar-nav > li > a { + padding-top: 13px; + padding-bottom: 13px; + color: #b9cfe3; + font-size: 13px; +} +.tg_page_head .navbar-inverse .navbar-nav > li > a:hover { + color: #FFF; +} +.tg_page_head .navbar-inverse .navbar-toggle { + border-color: #497495; + outline: 0; + border: 0; +} +.tg_page_head .navbar-inverse .navbar-collapse, +.tg_page_head .navbar-inverse .navbar-form { + border-color: #497495; +} + +.tg_page_head .navbar-inverse .navbar-toggle:hover, +.tg_page_head .navbar-inverse .navbar-toggle:active, +.tg_page_head .navbar-inverse .navbar-toggle:focus { + background-color: rgba(255,255,255,0.1); +} + .tg_page_head .navbar > .container .navbar-brand { padding-left: 9px; @@ -505,8 +589,7 @@ img.im_message_video_thumb, font-size: 15px; float: left; position: relative; - margin-left: 0; - margin-right: 0; + margin: 8px 0 8px; max-width: 100%; } .im_message_out.im_content_message_wrap { @@ -727,8 +810,11 @@ a.im_message_from_photo { .im_dialog_photo { width: 54px; height: 54px; - border-radius: 27px; - margin-right: 12px; + border-radius: 50%; + overflow: hidden; +} +div.im_dialog_photo { + margin: 0 12px 0 0; } .im_dialog_peer, @@ -984,6 +1070,9 @@ a.mobile_modal_action .tg_checkbox_label { } .im_attach { + cursor: pointer; + display: block; + overflow: hidden; position: absolute; right: 0; top: 0; diff --git a/app/img/icons/General.png b/app/img/icons/General.png new file mode 100644 index 0000000000000000000000000000000000000000..0d04d5bea0feb3ae4536a935e72f80b2a597438d GIT binary patch literal 12622 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 literal 0 HcmV?d00001 diff --git a/app/img/icons/General_1x.png b/app/img/icons/General_1x.png new file mode 100644 index 0000000000000000000000000000000000000000..2cc98ffea4aeb12206ee1819559026e6d37a690e GIT binary patch literal 6072 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 literal 0 HcmV?d00001 diff --git a/app/index.html b/app/index.html index f78f6a7f..15bd0ada 100644 --- a/app/index.html +++ b/app/index.html @@ -13,6 +13,7 @@ + diff --git a/app/js/controllers.js b/app/js/controllers.js index 0ef52ec8..b24b14c4 100644 --- a/app/js/controllers.js +++ b/app/js/controllers.js @@ -336,7 +336,7 @@ angular.module('myApp.controllers', ['myApp.i18n']) $scope.search = {}; $scope.historyFilter = {mediaType: false}; $scope.historyPeer = {}; - $scope.historyState = {selectActions: false, typing: []}; + $scope.historyState = {selectActions: false, typing: [], missedCount: 0}; $scope.openSettings = function () { $modal.open({ @@ -344,7 +344,7 @@ angular.module('myApp.controllers', ['myApp.i18n']) controller: 'SettingsModalController', windowClass: 'settings_modal_window mobile_modal' }); - } + }; $scope.openContacts = function () { ContactsSelectService.selectContact().then(function (userID) { @@ -399,6 +399,10 @@ angular.module('myApp.controllers', ['myApp.i18n']) }) }; + $scope.openChangelog = function () { + ChangelogNotifyService.showChangelog(false); + } + $scope.showPeerInfo = function () { if ($scope.curDialog.peerID > 0) { AppUsersManager.openUser($scope.curDialog.peerID) @@ -515,6 +519,7 @@ angular.module('myApp.controllers', ['myApp.i18n']) offset++; } $scope.dialogs.unshift(wrappedDialog); + delete $scope.isEmpty.dialogs; if (!peersInDialogs[dialog.peerID]) { peersInDialogs[dialog.peerID] = true; @@ -784,7 +789,7 @@ angular.module('myApp.controllers', ['myApp.i18n']) $scope.selectedMsgs = {}; $scope.selectedCount = 0; $scope.historyState.selectActions = false; - $scope.missedCount = 0; + $scope.historyState.missedCount = 0; $scope.state = {}; $scope.toggleMessage = toggleMessage; @@ -1041,7 +1046,7 @@ angular.module('myApp.controllers', ['myApp.i18n']) }; function loadHistory (forceRecent) { - $scope.missedCount = 0; + $scope.historyState.missedCount = 0; hasMore = false; $scope.skippedHistory = hasLess = false; @@ -1293,7 +1298,7 @@ angular.module('myApp.controllers', ['myApp.i18n']) if (addedMessage.my) { returnToRecent(); } else { - $scope.missedCount++; + $scope.historyState.missedCount++; } return; } @@ -2508,7 +2513,16 @@ angular.module('myApp.controllers', ['myApp.i18n']) $scope.openChangelog = function () { ChangelogNotifyService.showChangelog(false); - } + }; + + $scope.logOut = function () { + ErrorService.confirm({type: 'LOGOUT'}).then(function () { + MtpApiManager.logOut().then(function () { + location.hash = '/login'; + AppRuntimeManager.reload(); + }); + }) + }; }) .controller('ChangelogModalController', function ($scope, $modal) { diff --git a/app/js/directives.js b/app/js/directives.js index 69a5d7ef..9ccd1111 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -746,7 +746,6 @@ angular.module('myApp.directives', ['myApp.filters']) historyEl = $('.im_history', element)[0], scrollableWrap = $('.im_history_scrollable_wrap', element)[0], scrollable = $('.im_history_scrollable', element)[0], - panelWrap = $('.im_history_panel_wrap', element)[0], bottomPanelWrap = $('.im_bottom_panel_wrap', element)[0], sendFormWrap = $('.im_send_form_wrap', element)[0], headWrap = $('.tg_page_head')[0], @@ -1001,7 +1000,7 @@ angular.module('myApp.directives', ['myApp.filters']) if (!footer || !footer.offsetHeight) { footer = $('.footer_wrap')[0]; } - var historyH = $($window).height() - panelWrap.offsetHeight - bottomPanelWrap.offsetHeight - (headWrap ? headWrap.offsetHeight : 44) - (footer ? footer.offsetHeight : 0); + var historyH = $($window).height() - bottomPanelWrap.offsetHeight - (headWrap ? headWrap.offsetHeight : 44) - (footer ? footer.offsetHeight : 0); $(historyWrap).css({ height: historyH }); diff --git a/app/js/lib/ng_utils.js b/app/js/lib/ng_utils.js index 1638f74f..f29b7bb8 100644 --- a/app/js/lib/ng_utils.js +++ b/app/js/lib/ng_utils.js @@ -392,7 +392,7 @@ angular.module('izhukov.utils', []) function saveFileBase64(db, fileName, blob) { try { var reader = new FileReader(); - reader.readAsDataURL(blob); + reader.readAsDataURL(blob); } catch (e) { storageIsAvailable = false; return $q.reject(); @@ -615,7 +615,7 @@ angular.module('izhukov.utils', []) } }; - if (Config.Modes.nacl && + if (Config.Modes.nacl && navigator.mimeTypes && navigator.mimeTypes['application/x-pnacl'] !== undefined) { var listener = $('
').appendTo($('body'))[0]; diff --git a/app/js/locales/en-us.json b/app/js/locales/en-us.json index b9854744..6470180b 100644 --- a/app/js/locales/en-us.json +++ b/app/js/locales/en-us.json @@ -252,13 +252,15 @@ "error_modal_multiple_open_tabs": "Please close other Telegram app tabs.", + "head_telegram": "Telegram", "head_new_group": "New Group", "head_new_contact": "New Contact", "head_contacts": "Contacts", "head_contacts_title": "Contacts", - "im_found_title": "Global search", + "head_telegram_faq": "Telegram FAQ", "head_settings": "Settings", "head_log_out": "Log Out", + "head_peer_more": "More", "head_edit_messages": "Edit messages", "head_media_photos": "Photos", "head_media_video": "Videos", @@ -285,6 +287,7 @@ "im_contacts_title": "Contacts", "im_settings": "Settings", "im_conversations": "Conversations", + "im_found_title": "Global search", "im_messages": "Messages", "im_no_contacts": "No contacts yet", "im_get_started_long": "Get started by adding a contact to chat with", diff --git a/app/partials/desktop/head.html b/app/partials/desktop/head.html index 3030441e..b3c2e19f 100644 --- a/app/partials/desktop/head.html +++ b/app/partials/desktop/head.html @@ -1,28 +1,101 @@ -
-