Misterzym
/
webogram
mirror of https://github.com/misterzym/webogram.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

merged with master

gh-pages
Igor Zhukov 10 years ago
parent
6bf94190c6
commit
17503d742c
12 changed files with 63 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app.manifest
  2. 20
      css/app.css
  3. 5
      css/desktop.css
  4. 8
      css/mobile.css
  5. 48
      js/app.js
  6. 2
      js/background.js
  7. 2
      js/lib/bin_utils.js
  8. 2
      js/lib/crypto_worker.js
  9. 5
      js/locales/en-us.json
  10. 2
      manifest.json
  11. 2
      manifest.webapp
  12. 2
      webogram.appcache

2
app.manifest
Unescape View File

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# Time: Tue May 05 2015 23:43:44 GMT+0300 (MSK) # Time: Thu May 21 2015 15:27:23 GMT+0300 (MSK)
CACHE: CACHE:

20
css/app.css
Unescape View File

@ -1539,9 +1539,11 @@ span.composer_user_photo{display:inline-block;width:32px;height:32px;border-radi
img.composer_user_photo{width:32px;height:32px} img.composer_user_photo{width:32px;height:32px}
span.composer_user_photo .peer_initials{line-height:32px;font-size:14px} 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_user_mention,.composer_user_name{display:inline-block;line-height:32px;vertical-align:top}
.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} .composer_sticker_btn{width:78px;height:78px;display:block;display:inline-block;text-align:center;padding:3px}
.composer_sticker_btn:hover{background:#f2f6fa} .composer_sticker_btn:hover{background:#f2f6fa}
.composer_sticker_image{max-width:72px;max-height:72px} .composer_sticker_image{max-width:72px;max-height:72px;vertical-align:top}
.composer_rich_textarea{font-size:12px;margin-bottom:10px;padding:6px;min-height:38px;height:auto;width:auto;max-height:284px;overflow:auto;line-height:17px;border:1px solid #d2dbe3;border-radius:2px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;-ms-box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;word-wrap:break-word;-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text} .composer_rich_textarea{font-size:12px;margin-bottom:10px;padding:6px;min-height:38px;height:auto;width:auto;max-height:284px;overflow:auto;line-height:17px;border:1px solid #d2dbe3;border-radius:2px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;-ms-box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;word-wrap:break-word;-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text}
.composer_rich_textarea:empty:before{content:attr(placeholder);color:#9aa2ab} .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:active:before,.composer_rich_textarea:focus:before{content:none}
@ -1596,18 +1598,26 @@ img.chat_modal_participant_photo{width:40px;height:40px}
.contacts_modal_members_list .contacts_modal_contact_wrap.active .icon-contact-tick{background-position:-9px -481px;opacity:1} .contacts_modal_members_list .contacts_modal_contact_wrap.active .icon-contact-tick{background-position:-9px -481px;opacity:1}
.contacts_modal_members_list .disabled{pointer-events:none} .contacts_modal_members_list .disabled{pointer-events:none}
.contacts_modal_members_list .disabled .icon-contact-tick{display:none} .contacts_modal_members_list .disabled .icon-contact-tick{display:none}
.sessions_modal_session{padding:8px 16px} .sessions_modal_session{padding:8px 24px}
.sessions_modal_sessions_header{color:#999;font-size:13px;margin-left:16px;margin-top:20px;font-weight:700} .sessions_modal_sessions_header{color:#999;font-size:13px;margin-left:16px;margin-top:20px;font-weight:700}
.sessions_modal_terminate_all_wrap{margin:5px 0;text-align:center} .sessions_modal_terminate_all_wrap{margin:5px 0 0 24px}
.sessions_modal_sessions_list{margin-bottom:20px} .sessions_modal_sessions_list{padding:14px 0 10px;margin-bottom:10px}
.session_active_date_online{color:#3a6d99} .session_active_date_online{color:#3a6d99}
.sessions_modal_loading{text-align:center;color:#999;font-size:16px;line-height:18px;padding:1px 50px;margin:0} .sessions_modal_loading{text-align:center;color:#999;font-size:16px;line-height:18px;padding:1px 50px;margin:0}
.session_active_date{color:#999} .session_active_date{color:#999}
.session_meta_wrap{text-align:right} .session_meta_wrap{text-align:right}
.session_terminate_btn{margin-top:17px} .session_terminate_btn{margin-top:24px;display:inline-block}
.sessions_modal_session_app{font-weight:700;font-style:12px;margin-bottom:3px} .sessions_modal_session_app{font-weight:700;font-style:12px;margin-bottom:3px}
.sessions_modal_session_device{margin:3px 0} .sessions_modal_session_device{margin:3px 0}
.sessions_modal_session_location{color:#777} .sessions_modal_session_location{color:#777}
.sessions_modal_other_splitter{margin:15px 0 20px 24px}
.stickerset_modal_window .modal-dialog{max-width:474px}
.stickerset_modal_stickers_list{padding:25px}
.stickerset_modal_sticker_wrap{list-style:none;margin:0 10px 10px 0;padding:0;position:relative;display:block;width:96px;height:96px;float:left}
.stickerset_modal_sticker,.stickerset_modal_sticker img{width:96px;height:96px}
.stickerset_modal_sticker_alt{position:absolute;bottom:0;right:0}
.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} .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_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} .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}

5
css/desktop.css
Unescape View File

@ -555,6 +555,7 @@ a.footer_link.active:active {
.im_history_col .nano > .nano-pane, .im_history_col .nano > .nano-pane,
.contacts_modal_col .nano > .nano-pane, .contacts_modal_col .nano > .nano-pane,
.sessions_modal_col .nano > .nano-pane, .sessions_modal_col .nano > .nano-pane,
.stickerset_modal_col .nano > .nano-pane,
.im_dialogs_modal_col .nano > .nano-pane { .im_dialogs_modal_col .nano > .nano-pane {
background: rgba(216, 223, 225, 0.45); background: rgba(216, 223, 225, 0.45);
/*45% d8dfe5*/ /*45% d8dfe5*/
@ -573,7 +574,8 @@ a.footer_link.active:active {
width: 5px; width: 5px;
right: 4px; right: 4px;
} }
.sessions_modal_col .nano > .nano-pane { .sessions_modal_col .nano > .nano-pane,
.stickerset_modal_col .nano > .nano-pane {
top: 4px; top: 4px;
bottom: 4px; bottom: 4px;
width: 5px; width: 5px;
@ -590,6 +592,7 @@ a.footer_link.active:active {
.im_history_col .nano > .nano-pane > .nano-slider, .im_history_col .nano > .nano-pane > .nano-slider,
.contacts_modal_col .nano > .nano-pane > .nano-slider, .contacts_modal_col .nano > .nano-pane > .nano-slider,
.sessions_modal_col .nano > .nano-pane > .nano-slider, .sessions_modal_col .nano > .nano-pane > .nano-slider,
.stickerset_modal_col .nano > .nano-pane > .nano-slider,
.im_dialogs_modal_col .nano > .nano-pane > .nano-slider { .im_dialogs_modal_col .nano > .nano-pane > .nano-slider {
background: rgba(137, 160, 179, 0.5); background: rgba(137, 160, 179, 0.5);
/*50% 89a0b3*/ /*50% 89a0b3*/

8
css/mobile.css
Unescape View File

@ -1318,3 +1318,11 @@ a.media_modal_date:hover {
height: 18px; height: 18px;
margin: 13px 17px; margin: 13px 17px;
} }
.stickerset_modal_stickers_list {
padding: 10px;
}
.stickerset_modal_sticker_wrap,
.stickerset_modal_sticker_wrap img {
width: 64px;
height: 64px;
}

48
js/app.js
View File

File diff suppressed because one or more lines are too long

2
js/background.js
Unescape View File

@ -1,5 +1,5 @@
/*! /*!
* Webogram v0.4.5 - messaging web application for MTProto * Webogram v0.4.6 - messaging web application for MTProto
* https://github.com/zhukov/webogram * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE

2
js/lib/bin_utils.js
Unescape View File

@ -1,5 +1,5 @@
/*! /*!
* Webogram v0.4.5 - messaging web application for MTProto * Webogram v0.4.6 - messaging web application for MTProto
* https://github.com/zhukov/webogram * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE

2
js/lib/crypto_worker.js
Unescape View File

@ -1,5 +1,5 @@
/*! /*!
* Webogram v0.4.5 - messaging web application for MTProto * Webogram v0.4.6 - messaging web application for MTProto
* https://github.com/zhukov/webogram * https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com> * Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE * https://github.com/zhukov/webogram/blob/master/LICENSE

5
js/locales/en-us.json
Unescape View File

@ -86,6 +86,11 @@
"sessions_modal_terminate_all": "Terminate all other sessions", "sessions_modal_terminate_all": "Terminate all other sessions",
"sessions_modal_active_sessions": "Active sessions", "sessions_modal_active_sessions": "Active sessions",
"stickerset_modal_title_loading": "Stickerset",
"stickerset_modal_install": "Add stickers",
"stickerset_modal_uninstall": "Remove stickers",
"stickerset_modal_loading": "Loading{dots}",
"page_title_pluralize_notifications": "{'0': 'No notifications', 'one': '1 notification', 'other': '{} notifications'}", "page_title_pluralize_notifications": "{'0': 'No notifications', 'one': '1 notification', 'other': '{} notifications'}",
"profile_edit_modal_title": "Edit profile", "profile_edit_modal_title": "Edit profile",

2
manifest.json
Unescape View File

@ -1,7 +1,7 @@
{ {
"name": "Telegram", "name": "Telegram",
"description": "Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram", "description": "Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
"version": "0.4.5", "version": "0.4.6",
"short_name": "Telegram", "short_name": "Telegram",
"manifest_version": 2, "manifest_version": 2,
"app": { "app": {

2
manifest.webapp
Unescape View File

@ -1,7 +1,7 @@
{ {
"name": "Telegram", "name": "Telegram",
"description": "Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram", "description": "Telegram Web App.\nMore info & source code here: https://github.com/zhukov/webogram",
"version": "0.4.5", "version": "0.4.6",
"type": "privileged", "type": "privileged",
"launch_path": "/index.html", "launch_path": "/index.html",
"developer": { "developer": {

2
webogram.appcache
Unescape View File

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# Time: Tue May 05 2015 23:43:44 GMT+0300 (MSK) # Time: Thu May 21 2015 15:27:23 GMT+0300 (MSK)
CACHE: CACHE:

Write Preview
Loading…
Cancel
Save