Browse Source

merged with master

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

2
app.manifest

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# Time: Wed Dec 31 2014 18:14:48 GMT+0100 (CET) # Time: Wed Dec 31 2014 21:43:04 GMT+0100 (CET)
CACHE: CACHE:

2
css/app.css

File diff suppressed because one or more lines are too long

7
css/desktop.css

@ -189,7 +189,6 @@
line-height: 15px; line-height: 15px;
padding: 11px 18px 11px 18px; padding: 11px 18px 11px 18px;
color: #52719a; color: #52719a;
font-weight: bold;
} }
.tg_head_peer_dropdown .dropdown-menu > li > a:hover { .tg_head_peer_dropdown .dropdown-menu > li > a:hover {
background: #f3f6fa; background: #f3f6fa;
@ -571,7 +570,7 @@ a.footer_link.active:active {
.icon-message-status { .icon-message-status {
pointer-events: none; pointer-events: none;
background: #6ba2cb; background: #4eabf1;
border: 0; border: 0;
display: block; display: block;
width: 10px; width: 10px;
@ -627,7 +626,7 @@ a.footer_link.active:active {
} }
.im_submit { .im_submit {
color: #4e92ca; color: #499dd9;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
height: 18px; height: 18px;
@ -639,7 +638,7 @@ a.footer_link.active:active {
font-weight: bold; font-weight: bold;
} }
.im_submit:hover { .im_submit:hover {
color: #2c78b6; color: #3589c5;
background: inherit; background: inherit;
} }

2
js/app.js

File diff suppressed because one or more lines are too long

6
js/locales/en-us.json

@ -350,9 +350,9 @@
"login_signing_up": "Signing up", "login_signing_up": "Signing up",
"login_sign_up": "Sign up", "login_sign_up": "Sign up",
"login_about_title": "About", "login_about_title": "About",
"login_about_desc1_md": "Telegram web-client is free, fast and secure way to enjoy most of the **Telegram** features right from your **web-browser**.", "login_about_desc1_md": "The Telegram web-client is a free, fast and secure way to enjoy most of **Telegram**'s features right in your **web-browser**.",
"login_about_desc2_md": "It is always synced to to the **Telegram app** on your mobile device, which makes it a pretty useful tool for messaging and sharing files.", "login_about_desc2_md": "It is always synced with the **Telegram app** on your mobile device, which makes it a perfect tool for messaging and file sharing.",
"login_about_desc3_md": "We designed this product not because we were told to, but because we wanted it for ourselves. Our {source-link: source code} is open, so everyone can make a contribution.", "login_about_desc3_md": "Our {source-link: source code} is open, so everyone can make a contribution.",
"login_about_intro": "Welcome to the official Telegram web-client.", "login_about_intro": "Welcome to the official Telegram web-client.",
"login_about_learn": "Learn more", "login_about_learn": "Learn more",

2
webogram.appcache

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# Time: Wed Dec 31 2014 18:14:48 GMT+0100 (CET) # Time: Wed Dec 31 2014 21:43:04 GMT+0100 (CET)
CACHE: CACHE:

Loading…
Cancel
Save