Browse Source

merged with master

gh-pages
Igor Zhukov 10 years ago
parent
commit
738e23baea
  1. 2
      app.manifest
  2. 64
      css/app.css
  3. 278
      css/desktop.css
  4. 18
      css/mobile.css
  5. BIN
      img/icons/General.png
  6. BIN
      img/icons/General_2x.png
  7. BIN
      img/icons/IconsetSmiles.png
  8. BIN
      img/icons/IconsetSmiles_2x.png
  9. 48
      js/app.js
  10. 11
      js/locales/en-us.json
  11. 2
      webogram.appcache

2
app.manifest

@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Fri May 22 2015 18:59:52 GMT+0300 (MSK)
# Time: Thu Jul 09 2015 14:04:40 GMT+0300 (MSK)
CACHE:

64
css/app.css

@ -1258,7 +1258,7 @@ a.tg_radio_on:hover i.icon-radio{background-color:#5785aa}
.login_head_logo_link{display:inline-block;line-height:30px;padding:23px 15px 22px}
.tg_logo_wrap{line-height:30px!important}
.icon-tg-logo{width:30px;height:30px;display:inline-block;vertical-align:top;margin-right:18px;background-image:url(../img/icons/General.png);background-repeat:no-repeat;background-position:-5px -10px}
.is_2x .icon-tg-logo{background-image:url(../img/icons/General_2x.png);background-size:40px 778px}
.is_2x .icon-tg-logo{background-image:url(../img/icons/General_2x.png);background-size:40px 848px}
.icon-tg-title{width:63px;height:16px;display:inline-block;vertical-align:middle;background-image:url(../img/Telegram.png);background-repeat:no-repeat;background-position:0 0}
.is_2x .icon-tg-title{background-image:url(../img/Telegram_2x.png);background-size:63px 16px}
.login_head_submit_progress,.login_head_submit_wrap{float:right}
@ -1266,7 +1266,7 @@ a.tg_radio_on:hover i.icon-radio{background-color:#5785aa}
.login_head_submit_btn,.login_head_submit_progress{font-size:13px;line-height:20px;padding:27px 15px 28px;display:inline-block;color:#fff}
.login_head_submit_btn:active,.login_head_submit_btn:focus,.login_head_submit_btn:hover{color:#fff;text-decoration:none}
.icon-next-submit{width:7px;height:12px;display:inline-block;vertical-align:middle;margin-left:12px;margin-top:-1px;background-image:url(../img/icons/General.png);background-repeat:no-repeat;background-position:-18px -50px}
.is_2x .icon-next-submit{background-image:url(../img/icons/General_2x.png);background-size:40px 778px}
.is_2x .icon-next-submit{background-image:url(../img/icons/General_2x.png);background-size:40px 848px}
.login_footer_wrap{color:#84a2bc;font-size:13px;line-height:16px;margin-top:25px;text-align:center}
.logo_footer_learn_more_link,.logo_footer_learn_more_link:active,.logo_footer_learn_more_link:focus,.logo_footer_learn_more_link:hover{color:#84a2bc;font-weight:700}
.login_form_wrap{background:#fff;padding:44px 65px;-webkit-box-shadow:0 1px 1px rgba(97,127,152,.2),1px 0 0 rgba(97,127,152,.1),-1px 0 0 rgba(97,127,152,.1);-moz-box-shadow:0 1px 1px rgba(97,127,152,.2),1px 0 0 rgba(97,127,152,.1),-1px 0 0 rgba(97,127,152,.1);box-shadow:0 1px 1px rgba(97,127,152,.2),1px 0 0 rgba(97,127,152,.1),-1px 0 0 rgba(97,127,152,.1);border-radius:2px;border:0;margin:0;max-width:none}
@ -1386,14 +1386,14 @@ div.im_message_video_thumb{position:relative}
.im_message_audio{margin-top:3px}
.im_message_file_button{display:block;background:rgba(218,228,234,.5);float:left;width:42px;height:42px;border-radius:50%;margin-right:10px}
.im_message_file_button_icon{display:inline-block;line-height:0;width:12px;height:18px;margin:12px 15px;background-image:url(../img/icons/General.png);background-repeat:no-repeat;background-position:-14px -509px}
.is_2x .im_message_file_button_icon{background-image:url(../img/icons/General_2x.png);background-size:40px 778px}
.is_2x .im_message_file_button_icon{background-image:url(../img/icons/General_2x.png);background-size:40px 848px}
.im_message_file_button_dl_doc .im_message_file_button_icon{background-position:-12px -561px;width:16px;height:18px;margin:13px}
.im_message_file_button_dl_audio{background:#6490b1;border-radius:50%}
.im_message_file_button_dl_audio .im_message_file_button_icon{display:block;width:14px;height:16px;margin:13px 16px;background-image:url(../img/icons/General.png);background-repeat:no-repeat;background-position:-13px -611px}
.is_2x .im_message_file_button_dl_audio .im_message_file_button_icon{background-image:url(../img/icons/General_2x.png);background-size:40px 778px}
.is_2x .im_message_file_button_dl_audio .im_message_file_button_icon{background-image:url(../img/icons/General_2x.png);background-size:40px 848px}
.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:14px;background-position:-14px -587px;margin:14px 15px}
.im_history_selectable .im_message_outer_wrap:hover .icon-document,.im_message_selected .icon-document{background-color:#dae6f0;background-position:-2px -542px}
.im_history_selectable a{pointer-events:none}
.im_history_select_active .clickable,.im_history_select_active a{pointer-events:none}
.im_message_document_link_disabled{cursor:default;pointer-events:none}
.im_message_document_info{float:left}
.im_message_document_thumb_wrap{border-radius:2px;overflow:hidden;background:#f2f2f2;width:100px;min-height:38px;max-height:100px;margin-right:10px;text-align:center;float:left;line-height:0}
@ -1433,6 +1433,9 @@ img.im_message_document_thumb{max-width:100px;max-height:100px;vertical-align:mi
.tg_down_progress,.tg_up_progress{height:4px;margin:0;padding:0;background:rgba(218,228,234,.5);border:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}
.tg_down_progress .progress-bar,.tg_up_progress .progress-bar{height:4px;line-height:4px;background:#6B9ABD;border-radius:0;overflow:hidden;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}
.im_service_message_wrap{text-align:center}
.im_bot_intro_message_wrap{max-width:300px;padding:4px 10px;margin:10px auto;color:#000;line-height:1.4;text-align:left;font-size:13px}
.im_bot_intro_message_header{font-weight:700;text-align:center}
.im_bot_intro_message{margin-top:10px}
.im_service_message{display:inline-block;min-width:10px;padding:4px 7px;line-height:1.4;color:#999;text-align:center;border-radius:10px;margin:5px 0}
.im_service_message_photo_thumb{display:block;margin:0 auto}
.im_message_date,.im_message_fwd_date{color:#adadad;font-size:.85em;padding:0 0 20px 10px}
@ -1457,6 +1460,30 @@ a.im_message_fwd_photo{position:absolute;margin-top:1px}
.im_message_text{word-wrap:break-word;line-height:150%}
.im_message_photo_caption,.im_message_video_caption{word-wrap:break-word;line-height:150%;margin-top:3px}
.im_message_mymention{background:#fff8cc}
.reply_markup_wrap{margin:15px -2px 0}
.reply_markup_row{padding:4px 0;line-height:0}
.reply_markup_row:first-child{padding-top:0}
.reply_markup_row:last-child{padding-bottom:0}
.reply_markup_scrollable_wrap.active-scrollbar .reply_markup_row{margin-right:6px}
.reply_markup_button_wrap{display:inline-block;padding:0 4px}
.reply_markup_button{color:#3a6d99;display:block;width:100%;background:#f0f4f7;height:30px;font-size:13px;margin:0;padding:6px}
.reply_markup_h1 .reply_markup_button{height:170px}
.reply_markup_h2 .reply_markup_button{height:81px}
.reply_markup_h3 .reply_markup_button{height:51px}
.reply_markup_h4 .reply_markup_button{height:36px}
.reply_markup_button:hover{color:#3a6d99;background:#dfe8f0}
.reply_markup_button_w1{width:100%}
.reply_markup_button_w2{width:50%}
.reply_markup_button_w3{width:33.3333333%}
.reply_markup_button_w4{width:25%}
.reply_markup_button_w5{width:20%}
.reply_markup_button_w6{width:16.6666666%}
.reply_markup_button_w7{width:14.2857142%}
.reply_markup_button_w8{width:12.5%}
.reply_markup_button_w9{width:11.1111111%}
.reply_markup_button_w10{width:10%}
.reply_markup_button_w11{width:9.09090909%}
.reply_markup_button_w12{width:8.33333333%}
.im_history_empty,.im_history_not_selected{visibility:hidden;text-align:center;color:#999;font-size:16px;line-height:18px;padding:1px 50px;margin:0}
.im_history_empty.vertical-aligned,.im_history_not_selected.vertical-aligned{visibility:visible}
.im_history_to_bottom .im_history_empty,.im_history_to_bottom .im_history_not_selected{display:none}
@ -1483,7 +1510,7 @@ img.img_fullsize{margin:0 auto}
.non_osx .media_modal_author{font-size:12px}
.composer_emoji_insert_btn{display:block;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;opacity:.8;background-image:url(../img/icons/General.png);background-repeat:no-repeat;background-position:-9px -335px}
.is_2x .icon-emoji{background-image:url(../img/icons/General_2x.png);background-size:40px 778px}
.is_2x .icon-emoji{background-image:url(../img/icons/General_2x.png);background-size:40px 848px}
.composer_emoji_tooltip{display:none;position:absolute;z-index:999;width:254px;margin-left:-116px;margin-top:-245px;border:1px solid #dfdfdf;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.1);-moz-box-shadow:0 1px 1px rgba(0,0,0,.1);box-shadow:0 1px 1px rgba(0,0,0,.1);background:#fff;padding:5px 2px 5px 8px}
.composer_emoji_tooltip_shown{display:block}
.composer_emoji_tooltip_tail{position:absolute;bottom:-14px;left:50%;margin-left:-13px;overflow:hidden;width:26px;height:14px}
@ -1506,7 +1533,7 @@ img.img_fullsize{margin:0 auto}
.composer_emoji_tooltip_tab_grid.active{background-position:-9px -222px}
.composer_emoji_tooltip_tab_stickers{background-position:-9px -361px}
.composer_emoji_tooltip_tab_stickers.active{background-position:-9px -333px}
.nano.composer_emoji_tooltip_content_wrap{height:174px;position:relative}
.composer_emoji_tooltip_scrollable_container{height:174px;position:relative}
.composer_emoji_tooltip_content{padding-right:8px;outline:0!important}
a.composer_emoji_btn{margin:0 1px 0 0;padding:6px;display:block;float:left;border-radius:2px}
a.composer_emoji_btn:hover{background-color:#edf2f5}
@ -1528,7 +1555,8 @@ a.composer_emoji_btn:hover{background-color:#edf2f5}
.emoji-w26.emoji-spritesheet-2{background-size:858px 182px}
.emoji-w26.emoji-spritesheet-3{background-size:884px 78px}
.emoji-w26.emoji-spritesheet-4{background-size:884px 182px}
.composer_dropdown{display:none;padding:6px 0;border:0;-webkit-box-shadow:0 1px 1px 0 rgba(60,75,87,.27);-moz-box-shadow:0 1px 1px 0 rgba(60,75,87,.27);box-shadow:0 1px 1px 0 rgba(60,75,87,.27);border-radius:0;margin-top:-5px}
.composer_dropdown_wrap{background:#FFF;display:none;position:absolute;border:0;-webkit-box-shadow:0 1px 1px 0 rgba(60,75,87,.27);-moz-box-shadow:0 1px 1px 0 rgba(60,75,87,.27);box-shadow:0 1px 1px 0 rgba(60,75,87,.27);border-radius:0;margin-top:-5px;margin-left:-1px}
.composer_dropdown{position:static;display:block;float:none;top:auto;left:auto;border:0;border-radius:0;padding:0;margin:0;z-index:auto}
.composer_dropdown>li>a{display:block;font-size:13px;line-height:15px;padding:4px 10px;color:#52719a}
.composer_dropdown li a.composer_autocomplete_option_active,.composer_dropdown li a:hover{color:#52719a;background:#f2f6fa}
.composer_emoji_shortcut{display:inline-block;vertical-align:top;margin-left:15px;line-height:20px}
@ -1536,9 +1564,14 @@ a.composer_emoji_btn:hover{background-color:#edf2f5}
.composer_user_mention{color:grey;margin-left:7px}
.composer_dropdown li a.composer_autocomplete_option_active .composer_user_mention,.composer_dropdown li a:hover .composer_user_mention{color:#698192}
span.composer_user_photo{display:inline-block;width:32px;height:32px;border-radius:50%;overflow:hidden;margin-right:10px;vertical-align:top}
img.composer_user_photo{width:32px;height:32px}
img.composer_user_photo{width:32px;height:32px;vertical-align:top}
span.composer_user_photo .peer_initials{line-height:32px;font-size:14px}
.composer_user_mention,.composer_user_name{display:inline-block;line-height:32px;vertical-align:top}
.composer_dropdown a.composer_command_option{color:grey;line-height:32px;padding-right:5px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}
.composer_dropdown .composer_command_value{color:#52719a;display:inline}
.composer_dropdown .composer_command_desc{display:inline;color:grey;padding-left:7px;font-weight:400;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}
a.composer_command_option.composer_autocomplete_option_active .composer_command_desc,a.composer_command_option:hover .composer_command_desc{color:#698192}
.composer_command_desc .emoji{vertical-align:text-bottom}
.composer_stickerset_title{display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;font-weight:700;font-size:13px;color:#444;margin:10px 0 3px}
.composer_stickerset_title:hover{color:#444}
.composer_sticker_btn{width:78px;height:78px;display:block;display:inline-block;text-align:center;padding:3px}
@ -1548,6 +1581,16 @@ span.composer_user_photo .peer_initials{line-height:32px;font-size:14px}
.composer_rich_textarea:empty:before{content:attr(placeholder);color:#9aa2ab}
.composer_rich_textarea:active:before,.composer_rich_textarea:focus:before{content:none}
.composer_rich_textarea img{width:20px;height:20px;vertical-align:middle;margin:-3px 0 0}
.composer_command_btn{display:block;position:absolute;right:37px;top:4px;cursor:pointer;padding:0;width:20px;height:20px}
.icon-slash{display:inline-block;width:20px;height:20px;vertical-align:top;opacity:.8;background-image:url(../img/icons/General.png);background-repeat:no-repeat;background-position:-10px -790px}
.is_2x .icon-slash{background-image:url(../img/icons/General_2x.png);background-size:40px 848px}
.composer_command_btn.active .icon-slash{background-position:-10px -820px}
.composer_command_btn:hover .icon-slash{opacity:1}
.composer_keyboard_btn{display:block;position:absolute;right:37px;top:4px;cursor:pointer;padding:0;width:20px;height:20px}
.icon-keyboard{display:inline-block;width:20px;height:20px;vertical-align:top;opacity:.8;background-image:url(../img/icons/General.png);background-repeat:no-repeat;background-position:-10px -730px}
.is_2x .icon-keyboard{background-image:url(../img/icons/General_2x.png);background-size:40px 848px}
.composer_keyboard_btn.active .icon-keyboard{background-position:-10px -760px}
.composer_keyboard_btn:hover .icon-keyboard{opacity:1}
.error_modal_description{color:#999;padding:5px 0;font-size:13px;line-height:160%}
.error_modal_details textarea{display:block;font-family:Menlo,Monaco,Consolas,"Courier New",monospace;font-size:10px;line-height:100%;white-space:pre-wrap;padding:4px;margin:10px 0;word-break:break-all;word-wrap:break-word;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px;width:100%;text-align:left}
.error_modal_details_link,.error_modal_details_link:hover{font-size:11px;color:#999}
@ -1619,7 +1662,6 @@ img.chat_modal_participant_photo{width:40px;height:40px}
.stickerset_actions{padding:10px 20px;height:50px;text-align:center}
.stickerset_modal_loading{text-align:center;color:#999;font-size:16px;line-height:18px;padding:1px 50px;margin:0}
.confirm_modal_window .modal-dialog,.error_modal_window .modal-dialog,.md_simple_modal_window .modal-dialog{max-width:348px}
.im_edit_panel_title{text-align:center;margin:0;font-size:14px;line-height:34px}
.im_message_focus .audio_player_duration,.im_message_focus .audio_player_size,.im_message_focus .im_message_date,.im_message_focus .im_message_document_size,.im_message_focus .im_message_fwd_date{color:#899daf}
.user_color_1,.user_color_1:hover{color:#8365ab}
.user_color_2,.user_color_2:hover{color:#539e4f}
@ -1638,7 +1680,7 @@ img.chat_modal_participant_photo{width:40px;height:40px}
.user_bgcolor_7{background:#73cdd0}
.user_bgcolor_8{background:#fba76f}
a.peer_photo_init:active,a.peer_photo_init:focus,a.peer_photo_init:hover{text-decoration:none}
.peer_initials{display:block;color:#fff;text-align:center;text-transform:uppercase}
.peer_initials{display:block;color:#fff;text-align:center;text-transform:uppercase;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
.im_dialogs_contacts_wrap h5,.im_dialogs_messages_wrap h5{color:#999;font-size:13px;margin-left:20px;font-weight:700}
.img_gif_with_progress_wrap{position:relative;overflow:hidden;float:left;margin-top:3px;max-width:100%}
.img_gif_thumb{-webkit-filter:blur(2px);-moz-filter:blur(2px);-o-filter:blur(2px);-ms-filter:blur(2px);filter:blur(2px);filter:progid:DXImageTransform.Microsoft.Blur(PixelRadius='2');margin:-1px;padding:1px;max-width:100%}

278
css/desktop.css

@ -180,7 +180,7 @@
}
.is_2x .icon-new-group {
background-image: url(../img/icons/General_2x.png);
background-size: 40px 778px;
background-size: 40px 848px;
}
.icon-contacts {
width: 18px;
@ -195,7 +195,7 @@
}
.is_2x .icon-contacts {
background-image: url(../img/icons/General_2x.png);
background-size: 40px 778px;
background-size: 40px 848px;
}
.icon-settings {
width: 20px;
@ -210,7 +210,7 @@
}
.is_2x .icon-settings {
background-image: url(../img/icons/General_2x.png);
background-size: 40px 778px;
background-size: 40px 848px;
}
.icon-faq {
width: 20px;
@ -225,7 +225,7 @@
}
.is_2x .icon-faq {
background-image: url(../img/icons/General_2x.png);
background-size: 40px 778px;
background-size: 40px 848px;
}
.icon-about {
width: 21px;
@ -239,7 +239,7 @@
}
.is_2x .icon-about {
background-image: url(../img/icons/General_2x.png);
background-size: 40px 778px;
background-size: 40px 848px;
}
.tg_head_connecting_text {
color: #b9cfe3;
@ -339,7 +339,7 @@
.is_2x .icon-filter-documents,
.is_2x .icon-filter-audio {
background-image: url(../img/icons/General_2x.png);
background-size: 40px 778px;
background-size: 40px 848px;
}
.icon-filter-photos {
width: 18px;
@ -424,17 +424,26 @@
/* Target only IE7 and IE8 with this hack */
opacity: 0.99;
}
.composer_emoji_tooltip {
.composer_emoji_tooltip,
.composer_dropdown_wrap {
z-index: 1001;
}
.composer_emoji_tooltip .nano > .nano-pane {
.composer_emoji_tooltip .nano > .nano-pane,
.composer_dropdown_wrap .nano > .nano-pane {
background: rgba(255, 255, 255, 0);
right: -2px;
}
.composer_emoji_tooltip .nano > .nano-pane > .nano-slider {
.composer_emoji_tooltip .nano > .nano-pane > .nano-slider,
.composer_dropdown_wrap .nano > .nano-pane > .nano-slider {
background: #d1d1d1;
background: rgba(0, 0, 0, 0.17);
margin: 0 3px 0 4px;
}
.composer_dropdown_wrap .nano > .nano-pane {
top: 3px;
bottom: 3px;
right: -1px;
}
.countries_modal_col .nano > .nano-pane {
background: rgba(3, 36, 64, 0.08);
width: 3px;
@ -601,6 +610,24 @@ a.footer_link.active:active {
-moz-border-radius: 2px;
border-radius: 2px;
}
.reply_markup_scrollable_container .nano > .nano-pane {
background: rgba(137, 160, 179, 0.1);
right: 2px;
width: 3px;
top: 0;
bottom: 0;
-webkit-border-radius: 1px;
-moz-border-radius: 1px;
border-radius: 1px;
}
.reply_markup_scrollable_container .nano > .nano-pane > .nano-slider {
-webkit-border-radius: 1px;
-moz-border-radius: 1px;
border-radius: 1px;
background: #d1d1d1;
background: rgba(137, 160, 179, 0.5);
margin: 0;
}
.im_history_no_dialogs_wrap {
margin: 122px 170px 60px;
text-align: center;
@ -658,42 +685,11 @@ a.footer_link.active:active {
.sessions_modal_session:hover .session_terminate_btn {
opacity: 1;
}
.icon-message-status {
pointer-events: none;
background: #4eabf1;
border: 0;
display: block;
width: 10px;
height: 10px;
border-radius: 7px;
position: absolute;
margin-left: -26px;
margin-top: 16px;
opacity: 0;
}
.im_message_unread .icon-message-status {
opacity: 1.0;
}
.im_message_pending .icon-message-status {
opacity: 0.5;
}
.im_message_error_btn {
display: none;
}
.im_message_error .im_message_error_btn {
display: inline;
}
.im_message_error_btn .icon-message-status {
background: #da564d;
opacity: 0.85;
}
.im_message_error_btn .icon-message-status:hover {
opacity: 1;
}
/* Messages edit panel */
.im_edit_delete_btn,
.im_edit_forward_btn,
.im_edit_reply_btn {
.im_edit_reply_btn,
.im_start_btn {
border-radius: 2px;
padding: 7px 17px;
font-weight: bold;
@ -702,7 +698,7 @@ a.footer_link.active:active {
margin: 6px 0 6px 14px;
}
.im_edit_panel_wrap {
padding: 0px 0 43px;
padding: 0px 0 41px;
margin: 0 24px 0 12px;
}
.im_edit_panel_border {
@ -722,6 +718,13 @@ a.footer_link.active:active {
text-align: left;
text-transform: uppercase;
}
.im_edit_start_actions {
text-align: center;
text-transform: uppercase;
}
.im_start_btn {
padding: 7px 25px;
}
.im_selected_count {
color: #b9cfe3;
}
@ -761,55 +764,108 @@ a.footer_link.active:active {
.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 {
.im_history_select_active .im_message_outer_wrap:hover .im_message_date,
.im_history_select_active .im_message_outer_wrap:hover .im_message_document_size,
.im_history_select_active .im_message_outer_wrap:hover .im_message_audio_duration,
.im_history_select_active .im_message_outer_wrap:hover .im_message_audio_size,
.im_history_select_active .im_message_outer_wrap:hover .im_message_fwd_date {
color: #899daf;
}
.im_content_message_select_area {
display: none;
cursor: pointer;
position: absolute;
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;
}
@media (min-width: 1024px) {
.im_message_wrap {
position: relative;
}
.im_message_selected .icon-select-tick,
.im_history_selectable .im_message_outer_wrap:hover .icon-select-tick {
position: absolute;
width: 26px;
height: 26px;
margin: 16px 0 0 40px;
margin: 9px 0 0 -59px;
display: block;
background-image: url(../img/icons/IconsetW.png);
background-repeat: no-repeat;
background-position: -9px -516px;
}
.is_2x .icon-select-tick {
background-position: -9px -481px;
opacity: 0.5;
}
.is_2x .im_message_selected .icon-select-tick,
.is_2x .im_history_selectable .im_message_outer_wrap:hover .icon-select-tick {
background-image: url(../img/icons/IconsetW_2x.png);
background-size: 42px 1171px;
}
@media (min-width: 1024px) {
.im_content_message_select_area {
display: block;
}
.im_message_wrap {
position: relative;
.im_message_selected .icon-select-tick {
opacity: 1 !important;
}
.im_grouped_short .icon-select-tick,
.im_grouped_short .im_message_outer_wrap:hover .icon-select-tick {
margin-top: -2px;
}
.im_message_fwd .icon-select-tick,
.im_message_outer_wrap:hover .im_message_fwd .icon-select-tick {
margin-top: 10px;
}
.im_grouped_fwd .icon-select-tick,
.im_grouped_fwd .im_message_outer_wrap:hover .icon-select-tick {
margin-top: 7px;
}
.im_grouped .icon-select-tick,
.im_grouped .im_message_outer_wrap:hover .icon-select-tick {
margin-top: 7px;
}
.im_grouped_fwd_short .icon-select-tick,
.im_grouped_fwd_short .im_message_outer_wrap:hover .icon-select-tick {
margin-top: -5px;
}
}
.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 {
display: inline-block;
background-position: -9px -481px;
.icon-message-status {
pointer-events: none;
background: #4eabf1;
border: 0;
display: block;
width: 10px;
height: 10px;
border-radius: 7px;
position: absolute;
margin-left: -26px;
margin-top: 16px;
opacity: 0;
}
.im_message_unread .icon-message-status {
opacity: 1.0;
}
.im_message_pending .icon-message-status {
opacity: 0.5;
}
.im_message_selected .icon-select-tick {
opacity: 1 !important;
.im_grouped_short .icon-message-status {
margin-top: 5px;
}
.im_message_fwd .icon-message-status {
margin-top: 16px;
}
.im_grouped_fwd .icon-message-status {
margin-top: 13px;
}
.im_grouped .icon-message-status {
margin-top: 13px;
}
.im_grouped_fwd_short .icon-message-status {
margin-top: 2px;
}
.im_message_error_btn {
display: none;
}
.im_message_error .im_message_error_btn {
display: inline;
}
.im_message_error_btn .icon-message-status {
background: #da564d;
opacity: 0.85;
pointer-events: auto;
}
.im_message_error_btn .icon-message-status:hover {
opacity: 1;
}
/* Dialogs modal */
.peer_select_window .modal-dialog {
@ -908,7 +964,7 @@ a.footer_link.active:active {
}
.im_send_panel_wrap {
max-width: 554px;
padding-bottom: 23px;
padding-bottom: 21px;
}
.im_send_form {
max-width: 382px;
@ -960,11 +1016,15 @@ a.im_panel_peer_photo .peer_initials {
opacity: 1;
}
.im_send_field_wrap {
margin-bottom: 15px;
margin-bottom: 13px;
position: relative;
padding-bottom: 2px;
overflow-x: hidden;
}
.composer_rich_textarea,
.composer_textarea {
overflow: none;
overflow-y: scroll;
border-radius: 0;
border: 0;
box-shadow: none;
@ -983,6 +1043,10 @@ a.im_panel_peer_photo .peer_initials {
outline: none;
box-shadow: 0 2px 0 0 #77b7e4;
}
.im_send_field_wrap_2ndbtn .composer_rich_textarea,
.im_send_field_wrap_2ndbtn .composer_textarea {
padding-right: 65px;
}
.icon-paperclip {
display: inline-block;
width: 18px;
@ -996,7 +1060,7 @@ a.im_panel_peer_photo .peer_initials {
}
.is_2x .icon-paperclip {
background-image: url(../img/icons/General_2x.png);
background-size: 40px 778px;
background-size: 40px 848px;
}
.im_attach {
cursor: pointer;
@ -1038,7 +1102,7 @@ a.im_panel_peer_photo .peer_initials {
}
.is_2x .icon-camera {
background-image: url(../img/icons/General_2x.png);
background-size: 40px 778px;
background-size: 40px 848px;
}
.im_media_attach:hover .icon-camera {
opacity: 1;
@ -1052,7 +1116,7 @@ a.im_panel_peer_photo .peer_initials {
}
.im_send_reply_form_wrap a.im_panel_own_photo,
.im_send_reply_form_wrap a.im_panel_peer_photo {
margin-top: 47px;
margin-top: 41px;
}
.im_send_reply_cancel {
float: right;
@ -1456,14 +1520,26 @@ a.im_panel_peer_photo .peer_initials {
max-width: 362px;
display: inline-block;
}
.im_message_selected .im_message_outer_wrap,
.im_message_focus .im_message_outer_wrap {
.im_message_selected .im_message_outer_wrap {
background: #f2f6fa;
}
.im_message_focus .im_message_outer_wrap {
background-color: #f2f6fa;
animation-name: im_message_focus_fade;
animation-duration: 5s;
}
@keyframes im_message_focus_fade {
from {
background-color: #f2f6fa;
}
to {
background-color: rgba(242, 246, 250, 0);
}
}
.im_history_selectable .im_message_outer_wrap {
cursor: pointer;
}
.im_history_selectable .im_message_outer_wrap:hover {
.im_history_select_active .im_message_outer_wrap:hover {
background: #f2f6fa;
}
.im_message_wrap {
@ -1517,33 +1593,6 @@ a.im_panel_peer_photo .peer_initials {
.im_grouped_fwd_short .im_message_body {
margin-left: 57px;
}
.im_grouped_short .im_content_message_select_area,
.im_grouped .im_content_message_select_area {
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_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: 2px;
}
.im_grouped_short .icon-message-status,
.im_grouped_fwd_short .icon-message-status {
margin-top: 5px;
}
.im_grouped_fwd .im_message_fwd_from,
.im_grouped_fwd_short .im_message_fwd_from {
display: none;
@ -1554,11 +1603,6 @@ a.im_panel_peer_photo .peer_initials {
.im_grouped_fwd_short .im_message_fwd .im_message_date {
display: none;
}
.im_grouped_fwd .im_message_fwd,
.im_grouped_fwd_short .im_message_fwd {
margin-top: 8px;
}
.im_grouped_fwd .im_message_fwd,
.im_grouped_fwd_short .im_message_fwd {
margin-top: 8px;
}

18
css/mobile.css

@ -389,7 +389,7 @@ html {
border: 0;
overflow: hidden;
}
.im_history_selectable .im_message_outer_wrap:hover,
.im_history_select_active .im_message_outer_wrap:hover,
.im_message_selected {
background: #e1e9f0;
}
@ -636,10 +636,10 @@ img.im_message_video_thumb,
.im_message_focus .audio_player_duration,
.im_message_focus .audio_player_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 .audio_player_duration,
.im_history_selectable .im_message_outer_wrap:hover .audio_player_size,
.im_history_selectable .im_message_outer_wrap:hover .im_message_fwd_date {
.im_history_select_active .im_message_outer_wrap:hover .im_message_document_size,
.im_history_select_active .im_message_outer_wrap:hover .audio_player_duration,
.im_history_select_active .im_message_outer_wrap:hover .audio_player_size,
.im_history_select_active .im_message_outer_wrap:hover .im_message_fwd_date {
color: #68839c;
}
.im_message_from_photo,
@ -834,10 +834,10 @@ a.im_dialog_selected .im_dialog_message_text {
.im_message_selected .audio_player_title,
.im_message_selected .audio_player_duration,
.im_message_selected .audio_player_size,
.im_history_selectable .im_message_selected:hover .im_message_document_size,
.im_history_selectable .im_message_selected:hover .audio_player_duration,
.im_history_selectable .im_message_selected:hover .audio_player_size,
.im_history_selectable .im_message_selected:hover .im_message_fwd_date {
.im_history_select_active .im_message_selected:hover .im_message_document_size,
.im_history_select_active .im_message_selected:hover .audio_player_duration,
.im_history_select_active .im_message_selected:hover .audio_player_size,
.im_history_select_active .im_message_selected:hover .im_message_fwd_date {
color: #fff;
}
a.im_message_fwd_author {

BIN
img/icons/General.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
img/icons/General_2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
img/icons/IconsetSmiles.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
img/icons/IconsetSmiles_2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 10 KiB

48
js/app.js

File diff suppressed because one or more lines are too long

11
js/locales/en-us.json

@ -115,8 +115,12 @@
"user_modal_block_user": "Block user",
"user_modal_unblock_user": "Unblock user",
"user_modal_delete_chat": "Delete chat",
"user_modal_add_to_group": "Add to group",
"user_modal_info": "Info",
"user_modal_phone": "Phone",
"user_modal_about": "About",
"user_modal_bot_settings": "Settings",
"user_modal_bot_help": "Help",
"user_modal_username": "Username",
"user_modal_settings": "Settings",
"user_modal_notifications": "Notifications",
@ -144,6 +148,9 @@
"user_status_last_week": "last seen within a week",
"user_status_last_month": "last seen within a month",
"user_status_long_ago": "last seen a long time ago",
"user_status_bot": "bot",
"user_status_bot_noprivacy": "has access to messages",
"user_status_bot_privacy": "has no access to messages",
"chat_title_deleted": "DELETED",
"format_size_progress_mulitple": "{done} of {total} {parts}",
"format_size_progress": "{done} of {total}",
@ -274,7 +281,8 @@
"message_service_kicked_user": "removed {user}",
"message_service_left_group": "left group",
"message_service_joined_by_link": "joined group via invite link",
"message_service_unsupported_action": "Unsupported action {action}",
"message_service_unsupported_action": "unsupported action {action}",
"message_service_bot_intro_header": "What can this bot do?",
"error_modal_warning_title": "Warning",
"error_modal_bad_request_title": "Error",
@ -390,6 +398,7 @@
"im_delete": "Delete {count}",
"im_forward": "Forward {count}",
"im_reply": "Reply",
"im_start": "Start",
"im_reply_loading": "Loading{dots}",
"im_photos_drop_text": "Drop photos here to send",
"im_message_field_placeholder": "Write a message...",

2
webogram.appcache

@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Fri May 22 2015 18:59:52 GMT+0300 (MSK)
# Time: Thu Jul 09 2015 14:04:40 GMT+0300 (MSK)
CACHE:

Loading…
Cancel
Save