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 9 years ago
parent
ae977f818e
commit
faac860ea0
7 changed files with 52 additions and 29 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. 22
      css/desktop.css
  4. 19
      css/mobile.css
  5. 12
      js/app.js
  6. 4
      js/locales/en-us.json
  7. 2
      webogram.appcache

2
app.manifest
Unescape View File

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# Time: Mon Feb 08 2016 18:56:49 GMT+0000 (GMT) # Time: Wed Feb 10 2016 18:21:30 GMT+0000 (GMT)
CACHE: CACHE:

20
css/app.css
Unescape View File

@ -1131,7 +1131,9 @@ h1,h2,h3,h4,h5{color:#222}
.non_osx h4{font-size:17px} .non_osx h4{font-size:17px}
.noselect{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} .noselect{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
.hasselect{-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text} .hasselect{-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text}
pre{margin-bottom:0;max-height:300px;overflow:auto;padding:3px;border:1px solid #dedede;font-size:inherit} .copyonly{color:transparent;display:inline-block;vertical-align:baseline;width:1px;height:0;background:0 no-repeat none;font-size:0;float:left;text-rendering:auto;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
.nocopy::before{content:attr(data-content)}
pre{margin-bottom:0;overflow:auto;padding:3px;border:1px solid #eee;max-height:none;font-size:inherit}
a{cursor:pointer} a{cursor:pointer}
a.disabled{cursor:default;pointer-events:none} a.disabled{cursor:default;pointer-events:none}
.form-control{border:1px solid #d9dbde;border-radius:2px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;-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} .form-control{border:1px solid #d9dbde;border-radius:2px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;-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}
@ -1363,8 +1365,11 @@ a.im_dialog:hover .im_dialog_date,a.im_dialog_selected .im_dialog_date{color:#91
.im_history_to_bottom .im_history_scrollable{position:absolute;bottom:0;width:100%} .im_history_to_bottom .im_history_scrollable{position:absolute;bottom:0;width:100%}
.im_history{padding:0;position:relative} .im_history{padding:0;position:relative}
.im_message_unread_split{background:#f0f4f7;color:#8096a8;text-align:center;padding:4px 10px;margin:10px 0} .im_message_unread_split{background:#f0f4f7;color:#8096a8;text-align:center;padding:4px 10px;margin:10px 0}
.im_message_author,.im_message_fwd_author,.im_message_via_author{color:#3a6d99;font-weight:700} .im_message_author,.im_message_fwd_author{color:#3a6d99;font-weight:700}
.non_osx .im_message_author,.non_osx .im_message_fwd_author,.non_osx .im_message_via_author{font-size:12px} .im_message_author_via,.im_message_fwd_via{color:#3a6d99}
.im_message_author_via:hover,.im_message_fwd_via:hover{text-decoration:none}
.im_message_author_via:hover .im_message_fwd_author,.im_message_fwd_via:hover .im_message_fwd_author{text-decoration:underline}
.non_osx .im_message_author_wrap,.non_osx .im_message_fwd_author_wrap{font-size:12px}
.im_message_author_via{color:#3a6d99;margin-left:5px} .im_message_author_via{color:#3a6d99;margin-left:5px}
.im_message_fwd_via{margin-left:0} .im_message_fwd_via{margin-left:0}
.im_message_contact_photo,.im_message_from_photo,.im_message_fwd_photo{width:42px;height:42px;border-radius:50%;overflow:hidden} .im_message_contact_photo,.im_message_from_photo,.im_message_fwd_photo{width:42px;height:42px;border-radius:50%;overflow:hidden}
@ -1463,7 +1468,7 @@ img.im_message_document_thumb{max-width:100px;max-height:100px;vertical-align:mi
.im_message_date{cursor:pointer} .im_message_date{cursor:pointer}
.im_message_date:hover{text-decoration:underline} .im_message_date:hover{text-decoration:underline}
div.im_message_author,div.im_message_body{display:block;overflow:hidden} div.im_message_author,div.im_message_body{display:block;overflow:hidden}
.im_message_body,.im_message_meta{-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text} .im_message_body{-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text}
.im_message_error_btn{display:none} .im_message_error_btn{display:none}
.im_message_error .im_message_error_btn{display:inline} .im_message_error .im_message_error_btn{display:inline}
.im_message_error_btn .icon-message-status{background:#da564d;opacity:.85;pointer-events:auto} .im_message_error_btn .icon-message-status{background:#da564d;opacity:.85;pointer-events:auto}
@ -1518,6 +1523,13 @@ a.im_message_fwd_photo{position:absolute;margin-top:1px}
.reply_markup_button_w10{width:10%} .reply_markup_button_w10{width:10%}
.reply_markup_button_w11{width:9.09090909%} .reply_markup_button_w11{width:9.09090909%}
.reply_markup_button_w12{width:8.33333333%} .reply_markup_button_w12{width:8.33333333%}
.im_history_not_selected_wrap{display:none}
.im_page_peer_not_selected .im_history_not_selected_wrap{display:block}
.im_history_selected_wrap{display:none}
.im_history_loaded .im_history_selected_wrap{display:block}
.im_page_peer_not_selected .im_history_selected_wrap{display:none}
.im_history_selected_loading_wrap{display:block}
.im_history_loaded .im_history_selected_loading_wrap,.im_page_peer_not_selected .im_history_selected_loading_wrap{display:none}
.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,.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_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} .im_history_to_bottom .im_history_empty,.im_history_to_bottom .im_history_not_selected{display:none}

22
css/desktop.css
Unescape View File

@ -1522,18 +1522,14 @@ a.im_panel_peer_photo .peer_initials {
margin-top: 4px; margin-top: 4px;
margin-bottom: 4px; margin-bottom: 4px;
} }
.im_grouped_short .im_message_author_via, .im_grouped_short .im_message_author_wrap,
.im_grouped_short .im_message_from_photo, .im_grouped_short .im_message_from_photo,
.im_grouped_short .im_message_author, .im_grouped .im_message_author_wrap,
.im_grouped .im_message_author_via,
.im_grouped .im_message_from_photo, .im_grouped .im_message_from_photo,
.im_grouped .im_message_author, .im_grouped_fwd .im_message_author_wrap,
.im_grouped_fwd .im_message_author_via,
.im_grouped_fwd .im_message_from_photo, .im_grouped_fwd .im_message_from_photo,
.im_grouped_fwd .im_message_author, .im_grouped_fwd_short .im_message_author_wrap,
.im_grouped_fwd_short .im_message_author_via, .im_grouped_fwd_short .im_message_from_photo {
.im_grouped_fwd_short .im_message_from_photo,
.im_grouped_fwd_short .im_message_author {
display: none; display: none;
} }
.im_grouped_short .im_message_body, .im_grouped_short .im_message_body,
@ -1546,10 +1542,10 @@ a.im_panel_peer_photo .peer_initials {
.im_grouped_fwd_short .im_message_fwd_from { .im_grouped_fwd_short .im_message_fwd_from {
display: none; display: none;
} }
.im_grouped_short .im_message_fwd .im_message_date, .im_grouped_short .im_message_fwd .im_message_meta,
.im_grouped .im_message_fwd .im_message_date, .im_grouped .im_message_fwd .im_message_meta,
.im_grouped_fwd .im_message_fwd .im_message_date, .im_grouped_fwd .im_message_fwd .im_message_meta,
.im_grouped_fwd_short .im_message_fwd .im_message_date { .im_grouped_fwd_short .im_message_fwd .im_message_meta {
display: none; display: none;
} }
.im_grouped_fwd_short .im_message_fwd { .im_grouped_fwd_short .im_message_fwd {

19
css/mobile.css
Unescape View File

@ -173,6 +173,9 @@ html {
.tg_modal_head .navbar-search-wrap { .tg_modal_head .navbar-search-wrap {
display: block; display: block;
} }
.navbar_peer_not_selected .tg_head_peer_menu_wrap {
display: none;
}
.tg_page_head .navbar-quick-nav { .tg_page_head .navbar-quick-nav {
display: block; display: block;
float: none; float: none;
@ -613,6 +616,9 @@ img.im_message_video_thumb,
font-weight: normal; font-weight: normal;
font-size: 13px; font-size: 13px;
} }
.im_message_reply_body {
font-size: 12px;
}
.im_message_fwd_header { .im_message_fwd_header {
font-size: 12px; font-size: 12px;
} }
@ -683,12 +689,19 @@ a.im_message_from_photo {
position: absolute; position: absolute;
margin-left: -45px; margin-left: -45px;
} }
.im_message_author_via { a.im_message_author_via {
color: #323232;
display: block; display: block;
font-size: 13px; font-size: 13px;
font-weight: normal; font-weight: normal;
margin-bottom: 3px; margin-bottom: 3px;
} }
.im_message_out a.im_message_author_via {
margin-left: 0;
}
a.im_message_author_via .im_message_fwd_author {
color: inherit;
}
.im_message_author { .im_message_author {
display: none; display: none;
} }
@ -711,7 +724,6 @@ a.im_message_from_photo {
.im_grouped_fwd_short a.im_message_author_via, .im_grouped_fwd_short a.im_message_author_via,
.im_message_out a.im_message_from_photo, .im_message_out a.im_message_from_photo,
.im_message_out a.im_message_author, .im_message_out a.im_message_author,
.im_message_out a.im_message_author_via,
.im_message_body_media a.im_message_author { .im_message_body_media a.im_message_author {
display: none; display: none;
} }
@ -1329,6 +1341,9 @@ img.composer_user_photo {
h4.media_modal_title_wrap { h4.media_modal_title_wrap {
color: inherit; color: inherit;
margin: 8px 0 11px 0; margin: 8px 0 11px 0;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
} }
.media_modal_info_wrap { .media_modal_info_wrap {
line-height: 16px; line-height: 16px;

12
js/app.js
View File

File diff suppressed because one or more lines are too long

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

@ -523,8 +523,8 @@
"message_forwarded_message": "Forwarded message", "message_forwarded_message": "Forwarded message",
"message_via_bot": "via {bot}", "message_via_bot": "via {bot}",
"message_forwarded_message_mobile": "Forwarded from {from}, {date}", "message_forwarded_message_mobile": "Forwarded from {from}",
"message_forwarded_via_message_mobile": "Forwarded from {from} via {bot}, {date}", "message_forwarded_via_message_mobile": "Forwarded from {from} via {bot}",
"message_attach_audio_message": "Voice message", "message_attach_audio_message": "Voice message",
"message_attach_audio_play": "Play", "message_attach_audio_play": "Play",

2
webogram.appcache
Unescape View File

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# Time: Mon Feb 08 2016 18:56:49 GMT+0000 (GMT) # Time: Wed Feb 10 2016 18:21:30 GMT+0000 (GMT)
CACHE: CACHE:

Write Preview
Loading…
Cancel
Save