Browse Source

merged with master

gh-pages
Igor Zhukov 11 years ago
parent
commit
ce56565e2e
  1. 2
      app.manifest
  2. 2
      css/app.css
  3. 14
      css/desktop.css
  4. 10
      js/app.js
  5. 1
      js/locales/en-us.json
  6. 2
      webogram.appcache

2
app.manifest

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# Time: Fri Dec 12 2014 00:55:11 GMT-0800 (PST) # Time: Sun Dec 14 2014 22:09:11 GMT-0800 (PST)
CACHE: CACHE:

2
css/app.css

File diff suppressed because one or more lines are too long

14
css/desktop.css

@ -545,9 +545,16 @@ a.im_panel_peer_photo {
margin-left: 12px; margin-left: 12px;
height: 55px; height: 55px;
} }
div.im_panel_own_photo { a.im_panel_own_photo {
display: block;
margin-right: 12px; margin-right: 12px;
} }
a.im_panel_own_photo .peer_initials,
div.im_panel_peer_photo .peer_initials,
a.im_panel_peer_photo .peer_initials {
font-size: 18px;
line-height: 50px;
}
.im_panel_peer_online { .im_panel_peer_online {
background: #6ec26d; background: #6ec26d;
@ -996,6 +1003,11 @@ div.im_panel_own_photo {
div.im_dialog_photo { div.im_dialog_photo {
margin-right: 12px; margin-right: 12px;
} }
div.im_dialog_photo .peer_initials {
line-height: 48px;
font-size: 18px;
}
.im_dialog_message { .im_dialog_message {
margin-top: 4px; margin-top: 4px;
} }

10
js/app.js

File diff suppressed because one or more lines are too long

1
js/locales/en-us.json

@ -240,6 +240,7 @@
"error_modal_phonebook_required_description": "Telegram needs access to phonebook to import contacts.", "error_modal_phonebook_required_description": "Telegram needs access to phonebook to import contacts.",
"error_modal_username_occupied_description": "Sorry, this username is already taken.", "error_modal_username_occupied_description": "Sorry, this username is already taken.",
"error_modal_media_not_supported_description": "Your browser cannot play this media file. Try downloading the file and opening it in a standalone player.", "error_modal_media_not_supported_description": "Your browser cannot play this media file. Try downloading the file and opening it in a standalone player.",
"error_modal_username_not_found_description": "There is no Telegram account with the username you provided.",
"error_modal_bad_request_description": "One of the params is missing or invalid.", "error_modal_bad_request_description": "One of the params is missing or invalid.",
"error_modal_unauthorized_description": "This action requires authorization access. Please {login-link: log in}.", "error_modal_unauthorized_description": "This action requires authorization access. Please {login-link: log in}.",

2
webogram.appcache

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# Time: Fri Dec 12 2014 00:55:11 GMT-0800 (PST) # Time: Sun Dec 14 2014 22:09:11 GMT-0800 (PST)
CACHE: CACHE:

Loading…
Cancel
Save