Browse Source

merged with master

gh-pages
Igor Zhukov 10 years ago
parent
commit
25fb2661f2
  1. 2
      app.manifest
  2. 14
      css/app.css
  3. 12
      css/mobile.css
  4. 47
      js/app.js
  5. 15
      js/locales/en-us.json
  6. 3
      manifest.json
  7. 2
      webogram.appcache

2
app.manifest

@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Thu Apr 16 2015 18:30:51 GMT+0300 (MSK)
# Time: Fri May 01 2015 16:23:16 GMT+0300 (MSK)
CACHE:

14
css/app.css

@ -1161,10 +1161,11 @@ input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-
.btn-md-danger,.btn-md-danger:focus,.btn-md-danger:hover{color:#c05f5a}
.btn-md-danger:hover{background:#fbe7e6}
.md-input-group{height:50px;border-bottom:1px solid #e6e6e6;padding:0;margin:0 0 22px}
.md-textarea-group{height:66px}
.md-input-grouped{margin-bottom:12px}
.md-input-label{font-weight:400;color:#999;cursor:pointer;display:block;font-size:13px;margin:0;padding:0;z-index:1;pointer-events:none;-webkit-font-smoothing:antialiased;transform-origin:left center;-webkit-transform-origin:left center;-webkit-transform:translate3d(0,22px,0);transform:translate3d(0,22px,0)}
.md-input-animated .md-input-group,.md-input-animated .md-input-label{-webkit-transition:all .15s cubic-bezier(.35,0,.25,1);transition:all .15s cubic-bezier(.35,0,.25,1)}
.md-input{color:#000;background:#fff;display:inline-block;border:0;outline:0;font-size:13px;padding:3px 0;margin:3px 0 0;width:100%;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}
.md-input{color:#000;background:#fff;display:inline-block;border:0;outline:0;font-size:13px;padding:3px 0;margin:3px 0 0;width:100%;resize:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}
.md-input-disabled .md-input{color:#999}
.md-input-focused{border-bottom:2px solid #6bace1}
.md-input-error{border-bottom:2px solid #e2726f}
@ -1360,8 +1361,9 @@ div.im_message_video_thumb{position:relative}
.im_message_video_duration{background:rgba(0,0,0,.4);color:#fff;position:absolute;bottom:4px;right:4px;padding:2px 6px;font-size:11px;line-height:15px;border-radius:2px;overflow:hidden;z-index:1}
.icon-videoplay{position:absolute;display:inline-block;top:50%;left:50%;margin-left:-21px;margin-top:-21px;width:42px;height:42px;z-index:1;background-image:url(../img/icons/IconsetW.png);background-repeat:no-repeat;background-position:0 -590px}
.is_2x .icon-videoplay{background-image:url(../img/icons/IconsetW_2x.png);background-size:42px 1171px}
.im_message_geopoint{border-radius:2px;margin-top:5px;overflow:hidden;display:block;position:relative;width:200px;height:100px}
.icon-geo-point{position:absolute;display:inline-block;top:50%;left:50%;margin-left:-8px;margin-top:-10px;width:15px;height:19px;background-image:url(../img/icons/IconsetW.png);background-repeat:no-repeat;background-position:-14px -389px}
.im_message_geopoint{border-radius:2px;margin-top:5px;overflow:hidden;display:block;position:relative;width:300px;height:150px}
.im_message_venue_geopoint_wrap{display:block;position:relative;overflow:hidden;width:100px;height:100px;margin-right:10px;float:left;border-radius:2px;background:#f2f2f2;text-align:center;line-height:0}
.icon-geo-point{position:absolute;display:inline-block;top:50%;left:50%;margin-left:-8px;margin-top:-15px;width:15px;height:19px;background-image:url(../img/icons/IconsetW.png);background-repeat:no-repeat;background-position:-14px -389px}
.is_2x .icon-geo-point{background-image:url(../img/icons/IconsetW_2x.png);background-size:42px 1171px}
.im_message_media_embed{position:relative;height:0;overflow:hidden;margin-top:5px}
.im_message_media_embed iframe,.im_message_media_embed webview{position:absolute;top:0;left:0;width:100%;height:100%}
@ -1396,12 +1398,13 @@ div.im_message_video_thumb{position:relative}
.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}
img.im_message_document_thumb{max-width:100px;max-height:100px;vertical-align:middle}
.im_message_document_name_wrap{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;width:265px;padding:0 0 1px}
.im_message_document_actions,.im_message_website_description{width:265px}
.im_message_document_actions{width:265px}
.im_message_document_name{color:#3a6d99;display:inline-block;font-weight:700;max-width:170px;overflow:hidden;vertical-align:text-top;white-space:nowrap;text-overflow:ellipsis}
.im_message_document_size{color:#999;padding-left:2px;vertical-align:text-top}
.audio_player_actions a,.im_message_document_actions a{margin-right:10px}
.audio_player_title_wrap{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;padding:1px 0;line-height:16px;height:19px;width:200px}
.audio_player_title{display:inline-block;font-weight:700;max-width:100px;overflow:hidden;vertical-align:text-top;white-space:nowrap;text-overflow:ellipsis}
.icon-audio-unread{display:inline-block;width:6px;height:6px;background:#4eabf1;border:0;border-radius:4px;margin:5px 5px 0 2px;vertical-align:text-top}
.audio_player_meta{overflow:hidden;vertical-align:text-top;display:inline-block}
.audio_player_duration,.audio_player_size{color:#999;padding-left:2px}
.audio_player_actions{margin-top:3px}
@ -1420,7 +1423,7 @@ img.im_message_document_thumb{max-width:100px;max-height:100px;vertical-align:mi
.audio_player_progress_wrap{overflow:hidden}
.audio_player_progress_wrap .tg_down_progress{margin-top:5px}
.im_message_download_progress_wrap,.im_message_upload_progress_wrap{margin-top:5px;width:200px}
.im_message_document_thumbed .im_message_document_actions,.im_message_document_thumbed .im_message_document_name_wrap,.im_message_document_thumbed .im_message_download_progress_wrap,.im_message_document_thumbed .im_message_upload_progress_wrap,.im_message_document_thumbed .im_message_website_description{width:207px}
.im_message_document_thumbed .im_message_document_actions,.im_message_document_thumbed .im_message_document_name_wrap,.im_message_document_thumbed .im_message_download_progress_wrap,.im_message_document_thumbed .im_message_upload_progress_wrap{width:207px}
.im_message_document_thumbed .im_message_document_name{max-width:110px}
.im_message_video .im_message_document_actions,.im_message_video .im_message_document_name_wrap,.im_message_video .im_message_download_progress_wrap{width:152px}
.im_message_video .im_message_document_name_wrap{margin-top:5px}
@ -1451,6 +1454,7 @@ div.im_message_author,div.im_message_body{display:block;overflow:hidden}
a.im_message_fwd_photo{position:absolute;margin-top:1px}
.im_message_fwd_date{padding:0}
.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}
.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}

12
css/mobile.css

@ -433,6 +433,10 @@ html {
background: #f1f1f1;
margin-top: 0;
}
.im_message_body_media .im_message_geopoint {
width: 200px;
height: 100px;
}
.im_message_body_media a.im_message_photo_thumb,
.im_message_body_media .im_message_video {
margin-top: 0;
@ -495,6 +499,14 @@ html {
width: auto;
max-width: 250px;
}
.im_message_audio {
width: auto;
max-width: 200px;
}
.im_message_audio .audio_player_title_wrap {
width: auto;
font-size: 12px;
}
.im_message_contact {
width: 200px;
}

47
js/app.js

File diff suppressed because one or more lines are too long

15
js/locales/en-us.json

@ -23,6 +23,7 @@
"group_modal_menu_delete_chat": "Delete chat",
"group_modal_settings": "Settings",
"group_modal_notifications": "Notifications",
"group_modal_menu_share_link": "Invite to group via link",
"group_modal_members": "Members",
"group_modal_members_kick": "Remove",
@ -160,6 +161,12 @@
"group_edit_submit": "Save",
"group_edit_submit_active": "Saving...",
"group_invite_link_modal_title": "Invite link",
"group_invite_link_link_label": "Copy link",
"group_invite_link_loading": "Loading...",
"group_invite_revoke_active": "Revoking...",
"group_invite_revoke": "Revoke",
"confirm_modal_logout": "Are you sure you want to log out?",
"confirm_modal_update_reload": "A new version of Telegram Web has been downloaded. Launch it?",
"confirm_modal_history_flush": "Are you sure? This can not be undone!",
@ -182,6 +189,8 @@
"confirm_modal_recovery_email_empty_md": "Warning! Are you sure you don't want to add a password recovery e-mail?\n\nIf you forget your password, you will lose access to your Telegram account",
"confirm_modal_abort_password_setup": "Abort two-step verification setup?",
"confirm_modal_reset_account_md": "Are you sure?\nThis action can not be undone.\n\nYou will lose all your chats and messages, along with any media and files you shared, if you proceed with resetting your account.",
"confirm_modal_join_group_link": "Do you want to join the group «{title}»?",
"confirm_modal_revoke_group_link": "Are you sure you want to revoke this link? Once you do, no one will be able to join the group using it.",
"confirm_modal_are_u_sure": "Are you sure?",
"confirm_modal_logout_submit": "Log out",
@ -244,6 +253,7 @@
"conversation_kicked_user": "removed {user}",
"conversation_invited_user_message": "invited user",
"conversation_kicked_user_message": "removed user",
"conversation_joined_by_link": "joined group",
"conversation_message_sent": "sent you a message",
"conversation_unknown_user": "Somebody",
@ -257,6 +267,7 @@
"message_service_returned_to_group": "returned to group",
"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}",
"error_modal_warning_title": "Warning",
@ -279,7 +290,7 @@
"error_modal_firstname_invali_description": "The first name you entered is invalid.",
"error_modal_lastname_invalid_description": "The last name you entered is invalid.",
"error_modal_phone_invalid_description": "The phone number you entered is invalid.",
"error_modal_users_too_much_description": "You have selected too much users.",
"error_modal_users_too_much_description": "Too many group members.",
"error_modal_photo_dimensions_invalid_description": "The photo dimensions are invalid, please select another file.",
"error_modal_video_file_invalid_description": "The video file extension is invalid or unsupported, please select another file.",
"error_modal_photo_too_small_description": "The photo you provided is too small.",
@ -302,6 +313,8 @@
"error_modal_recovery_na_description": "Since you haven't provided a recovery e-mail when setting up your password, your remaining options are either to remember your password or to reset your account.",
"error_modal_password_success_descripion": "Your password for Two-Step Verification is now active.",
"error_modal_password_disabled_descripion": "You have disabled Two-Step Verification.",
"error_modal_user_not_mutual_contact": "The user can be invited by his contact only",
"error_modal_invite_link_invalid": "The invite link is invalid",
"head_telegram": "Telegram",

3
manifest.json

@ -14,7 +14,8 @@
"webview",
{"fileSystem": ["write"]},
"storage",
"unlimitedStorage"
"unlimitedStorage",
"fullscreen"
],
"icons": {
"16": "img/icons/icon16.png",

2
webogram.appcache

@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Thu Apr 16 2015 18:30:51 GMT+0300 (MSK)
# Time: Fri May 01 2015 16:23:16 GMT+0300 (MSK)
CACHE:

Loading…
Cancel
Save