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
31eac68cd2
commit
2bbc46aaf9
11 changed files with 110 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app.manifest
  2. 2
      css/app.css
  3. 96
      css/desktop.css
  4. 16
      js/app.js
  5. 2
      js/background.js
  6. 2
      js/lib/bin_utils.js
  7. 2
      js/lib/crypto_worker.js
  8. 4
      js/locales/it-it.json
  9. 2
      manifest.json
  10. 2
      manifest.webapp
  11. 2
      webogram.appcache

2
app.manifest
Unescape View File

@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Thu Mar 19 2015 17:36:16 GMT+0300 (MSK)
# Time: Thu Mar 19 2015 21:39:52 GMT+0300 (MSK)
CACHE:

2
css/app.css
Unescape View File

@ -1360,6 +1360,7 @@ div.im_message_video_thumb{position:relative}
.im_message_insta_embed{padding-bottom:122%}
.im_message_vine_embed{padding-bottom:100%}
.im_message_soundcloud_embed{padding-bottom:56.25%}
.im_message_spotify_embed{width:300px;height:80px}
.im_message_media_embed iframe,.im_message_media_embed webview{position:absolute;top:0;left:0;width:100%;height:100%}
.im_message_twitter_embed>blockquote{visibility:hidden}
.im_message_gif_wrap{position:relative}
@ -1435,6 +1436,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_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}
.im_history_to_bottom .im_history_empty,.im_history_to_bottom .im_history_not_selected{display:none}

96
css/desktop.css
Unescape View File

@ -694,12 +694,12 @@ a.footer_link.active:active {
margin: 6px 0 6px 14px;
}
.im_edit_panel_wrap {
padding: 0px 0 38px;
padding: 0px 0 43px;
margin: 0 24px 0 12px;
}
.im_edit_panel_border {
display: block;
margin: 0 0 47px 3px;
margin: 0 0 42px 3px;
border-bottom: 1px solid #EEE;
}
.im_edit_cancel_link {
@ -999,9 +999,6 @@ a.im_panel_peer_photo .peer_initials {
.im_send_field_wrap {
margin-bottom: 15px;
position: relative;
@ -1138,6 +1135,95 @@ a.im_panel_peer_photo .peer_initials {
transform: translate3d(0,-2px,0) rotate(45deg);
}
@media (max-height: 700px) {
a.im_panel_peer_photo,
a.im_panel_own_photo {
display: none;
}
.im_send_field_wrap {
margin-bottom: 0;
}
.composer_rich_textarea,
.composer_textarea {
min-height: 25px;
padding-right: 25px;
}
.composer_emoji_insert_btn {
top: 0;
right: 0px;
margin-top: -3px;
}
.composer_emoji_panel {
display: none;
}
.im_submit {
position: absolute;
top: 0;
left: 100%;
margin: 0 0 0 15px;
}
.im_media_attach {
position: absolute;
top: -7px;
left: -43px;
width: 19px;
height: 24px;
}
.icon-camera {
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-camera {
background-image: url(../img/icons/IconsetW_1x.png);
}
.im_media_attach:hover .icon-camera,
.im_media_attach:active .icon-camera {
background-position: -12px -100px;
opacity: 1;
}
.im_attach {
display: none;
position: absolute;
top: 0;
right: 100%;
margin: 0;
margin-right: 45px;
margin-top: 1px;
}
.icon-emoji {
display: inline-block;
width: 22px;
height: 22px;
vertical-align: text-top;
opacity: 1;
margin: 0;
background: url(../img/icons/IconsetW.png) -10px -771px no-repeat;
background-size: 42px 1171px;
}
.is_1x .icon-emoji {
background-image: url(../img/icons/IconsetW_1x.png);
}
.composer_emoji_insert_btn:active .icon-emoji,
.is_1x .composer_emoji_insert_btn:active .icon-emoji,
.composer_emoji_insert_btn.composer_emoji_insert_btn_on .icon-emoji,
.is_1x .composer_emoji_insert_btn.composer_emoji_insert_btn_on .icon-emoji {
background-position: -10px -803px;
}
.im_edit_panel_wrap {
padding-bottom: 8px;
}
.im_edit_panel_border {
margin-bottom: 7px;
}
}
/* Peer modals */
.user_modal_window .modal-dialog {
max-width: 480px;

16
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.1 - messaging web application for MTProto
* Webogram v0.4.2 - messaging web application for MTProto
* https://github.com/zhukov/webogram
* Copyright (C) 2014 Igor Zhukov <igor.beatle@gmail.com>
* https://github.com/zhukov/webogram/blob/master/LICENSE

2
js/lib/bin_utils.js
Unescape View File

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

2
js/lib/crypto_worker.js
Unescape View File

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

4
js/locales/it-it.json
Unescape View File

@ -269,7 +269,7 @@
"im_add_contact": "Aggiungi contatto",
"im_import_phonebook": "Importa rubrica",
"im_get_started": "Inizia",
"im_welcome_text": "Benvenuto su Telegram Web. E' sempre possibile impostare una foto profilo e cambiare il tuo nome nelle Impostazioni.",
"im_welcome_text": "Benvenuto su Telegram Web. È sempre possibile impostare una foto profilo e cambiare il tuo nome nelle Impostazioni.",
"im_open_settings": "Apri Impostazioni",
"im_select_a_chat": "Seleziona una chat per iniziare a messaggiare",
"im_loading_history": "Caricamento messaggi precedenti",
@ -328,7 +328,7 @@
"login_signing_up": "Registrazione in corso",
"login_sign_up": "Registrati",
"login_about_title": "Info",
"login_about_desc1_md": "L'app web di Telegram è un modo gratis, veloce e sicuro di avere la maggior parte delle feature di **Telegram** sul tuo **browser web**.",
"login_about_desc1_md": "L'app web di Telegram è un modo gratuito, veloce e sicuro di avere la maggior parte delle feature di **Telegram** sul tuo **browser web**.",
"login_about_desc2_md": "È sempre sincronizzato con le **app Telegram** sul tuo dispositivo mobile, il che lo rende lo strumento perfetto per messaggiare e condividere file.",
"login_about_desc3_md": "Il nostro {source-link: source code} è aperto, così ognuno può contribuire.",
"login_about_intro": "Benvenuto nell'app web ufficiale di Telegram.",

2
manifest.json
Unescape View File

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

2
manifest.webapp
Unescape View File

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

2
webogram.appcache
Unescape View File

@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Thu Mar 19 2015 17:36:16 GMT+0300 (MSK)
# Time: Thu Mar 19 2015 21:39:52 GMT+0300 (MSK)
CACHE:

Write Preview
Loading…
Cancel
Save