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
991d17dc12
commit
85c64be15e
7 changed files with 106 additions and 75 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. 12
      css/app.css
  3. 56
      css/desktop.css
  4. 89
      css/mobile.css
  5. 14
      js/app.js
  6. 6
      js/locales/en-us.json
  7. 2
      webogram.appcache

2
app.manifest
Unescape View File

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# Time: Thu Jul 09 2015 20:07:30 GMT+0300 (MSK) # Time: Fri Jul 10 2015 19:42:39 GMT+0300 (MSK)
CACHE: CACHE:

12
css/app.css
Unescape View File

@ -1492,8 +1492,16 @@ a.im_message_fwd_photo{position:absolute;margin-top:1px}
.im_send_form{margin:0 auto;position:absolute;bottom:0} .im_send_form{margin:0 auto;position:absolute;bottom:0}
.im_attach_input,.im_media_attach_input{cursor:pointer;font-size:120px!important;opacity:.01;position:absolute;z-index:100;margin:0;padding:0;top:0;right:0} .im_attach_input,.im_media_attach_input{cursor:pointer;font-size:120px!important;opacity:.01;position:absolute;z-index:100;margin:0;padding:0;top:0;right:0}
.im_send_dropbox_wrap{background:#fff;display:none;padding:17px 10px 0;border:1px dashed #999;overflow:hidden;text-align:center;color:#999;position:absolute} .im_send_dropbox_wrap{background:#fff;display:none;padding:17px 10px 0;border:1px dashed #999;overflow:hidden;text-align:center;color:#999;position:absolute}
.im_send_field_wrap{position:relative}
textarea.im_message_field{font-size:12px;margin-bottom:10px;padding:6px;min-height:50px;height:50px;resize:none} textarea.im_message_field{font-size:12px;margin-bottom:10px;padding:6px;min-height:50px;height:50px;resize:none}
.icon-online{background:#6ec26d;border:1px solid #fff;display:block;width:11px;height:11px;border-radius:6px;overflow:hidden;position:absolute;margin-top:-7px;margin-left:33px} .icon-online{background:#6ec26d;border:1px solid #fff;display:block;width:11px;height:11px;border-radius:6px;overflow:hidden;position:absolute;margin-top:-7px;margin-left:33px}
.im_send_reply_wrap{margin-bottom:5px}
.im_send_reply_form_wrap a.im_panel_own_photo,.im_send_reply_form_wrap a.im_panel_peer_photo{margin-top:41px}
.im_send_reply_cancel{float:right;display:block;width:18px;height:18px;margin-right:6px;margin-top:5px;-webkit-transform:translate3d(0,0,0);padding-top:7px}
.im_send_reply_cancel .icon-reply-bar{display:block;background:#999;width:18px;height:2px;transform-origin:50% 50%}
.im_send_reply_cancel:hover .icon-reply-bar{background:#44a1e8}
.icon-reply-bar:first-child{-webkit-transform:rotate(-45deg);-moz-transform:rotate(-45deg);-o-transform:rotate(-45deg);-ms-transform:rotate(-45deg);transform:rotate(-45deg);transform-origin:50% 50%}
.icon-reply-bar:last-child{-webkit-transform:translate3d(0,-2px,0) rotate(45deg);-moz-transform:translate3d(0,-2px,0) rotate(45deg);-o-transform:translate3d(0,-2px,0) rotate(45deg);-ms-transform:translate3d(0,-2px,0) rotate(45deg);transform:translate3d(0,-2px,0) rotate(45deg)}
.img_fullsize_wrap,a.img_fullsize{display:block;text-align:center} .img_fullsize_wrap,a.img_fullsize{display:block;text-align:center}
img.img_fullsize{margin:0 auto} img.img_fullsize{margin:0 auto}
.document_modal_image_wrap{overflow:auto} .document_modal_image_wrap{overflow:auto}
@ -1573,6 +1581,7 @@ span.composer_user_photo .peer_initials{line-height:32px;font-size:14px}
a.composer_command_option.composer_autocomplete_option_active .composer_command_desc,a.composer_command_option:hover .composer_command_desc{color:#698192} a.composer_command_option.composer_autocomplete_option_active .composer_command_desc,a.composer_command_option:hover .composer_command_desc{color:#698192}
.composer_command_desc .emoji{vertical-align:text-bottom} .composer_command_desc .emoji{vertical-align:text-bottom}
.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{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:first-child{margin-top:0}
.composer_stickerset_title:hover{color:#444} .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}
@ -1664,6 +1673,9 @@ img.chat_modal_participant_photo{width:40px;height:40px}
.stickerset_modal_loading{text-align:center;color:#999;font-size:16px;line-height:18px;padding:1px 50px;margin:0} .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_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}
.im_message_focus .im_message_outer_wrap{background-color:#f2f6fa;animation-name:im_message_focus_fade;animation-duration:5s}
@keyframes im_message_focus_fade{from{background-color:#f2f6fa}
to{background-color:rgba(242,246,250,0)}}
.user_color_1,.user_color_1:hover{color:#8365ab} .user_color_1,.user_color_1:hover{color:#8365ab}
.user_color_2,.user_color_2:hover{color:#539e4f} .user_color_2,.user_color_2:hover{color:#539e4f}
.user_color_3,.user_color_3:hover{color:#ae9661} .user_color_3,.user_color_3:hover{color:#ae9661}

56
css/desktop.css
Unescape View File

@ -1017,7 +1017,6 @@ a.im_panel_peer_photo .peer_initials {
} }
.im_send_field_wrap { .im_send_field_wrap {
margin-bottom: 13px; margin-bottom: 13px;
position: relative;
padding-bottom: 2px; padding-bottom: 2px;
overflow-x: hidden; overflow-x: hidden;
} }
@ -1111,48 +1110,6 @@ a.im_panel_peer_photo .peer_initials {
background-position: -10px -427px; background-position: -10px -427px;
opacity: 1; opacity: 1;
} }
.im_send_reply_wrap {
margin-bottom: 5px;
}
.im_send_reply_form_wrap a.im_panel_own_photo,
.im_send_reply_form_wrap a.im_panel_peer_photo {
margin-top: 41px;
}
.im_send_reply_cancel {
float: right;
display: block;
width: 18px;
height: 18px;
margin-right: 6px;
margin-top: 5px;
-webkit-transform: translate3d(0, 0, 0);
padding-top: 7px;
}
.im_send_reply_cancel .icon-reply-bar {
display: block;
background: #999;
width: 18px;
height: 2px;
transform-origin: 50% 50%;
}
.im_send_reply_cancel:hover .icon-reply-bar {
background: #44a1e8;
}
.icon-reply-bar:first-child {
-webkit-transform: rotate(-45deg);
-moz-transform: rotate(-45deg);
-o-transform: rotate(-45deg);
-ms-transform: rotate(-45deg);
transform: rotate(-45deg);
transform-origin: 50% 50%;
}
.icon-reply-bar:last-child {
-webkit-transform: translate3d(0, -2px, 0) rotate(45deg);
-moz-transform: translate3d(0, -2px, 0) rotate(45deg);
-o-transform: translate3d(0, -2px, 0) rotate(45deg);
-ms-transform: translate3d(0, -2px, 0) rotate(45deg);
transform: translate3d(0, -2px, 0) rotate(45deg);
}
@media (max-height: 600px) { @media (max-height: 600px) {
a.im_panel_peer_photo, a.im_panel_peer_photo,
a.im_panel_own_photo { a.im_panel_own_photo {
@ -1523,19 +1480,6 @@ a.im_panel_peer_photo .peer_initials {
.im_message_selected .im_message_outer_wrap { .im_message_selected .im_message_outer_wrap {
background: #f2f6fa; background: #f2f6fa;
} }
.im_message_focus .im_message_outer_wrap {
background-color: #f2f6fa;
animation-name: im_message_focus_fade;
animation-duration: 5s;
}
@keyframes im_message_focus_fade {
from {
background-color: #f2f6fa;
}
to {
background-color: rgba(242, 246, 250, 0);
}
}
.im_history_selectable .im_message_outer_wrap { .im_history_selectable .im_message_outer_wrap {
cursor: pointer; cursor: pointer;
} }

89
css/mobile.css
Unescape View File

@ -69,7 +69,6 @@ html {
.tg_page_head .navbar-inverse .navbar-form { .tg_page_head .navbar-inverse .navbar-form {
border-color: #497495; border-color: #497495;
} }
.tg_page_head .navbar-inverse .navbar-toggle:hover,
.tg_page_head .navbar-inverse .navbar-toggle:active, .tg_page_head .navbar-inverse .navbar-toggle:active,
.tg_page_head .navbar-inverse .navbar-toggle:focus { .tg_page_head .navbar-inverse .navbar-toggle:focus {
background-color: rgba(255, 255, 255, 0.1); background-color: rgba(255, 255, 255, 0.1);
@ -99,7 +98,9 @@ html {
padding: 12px 20px 11px; padding: 12px 20px 11px;
border-radius: 0; border-radius: 0;
} }
.tg_page_head .navbar-inverse .navbar-toggle:hover, .tg_page_head .navbar-inverse .navbar-toggle:hover {
background-color: rgba(0, 0, 0, 0);
}
.tg_page_head .navbar-inverse .open .navbar-toggle { .tg_page_head .navbar-inverse .open .navbar-toggle {
background-color: rgba(0, 0, 0, 0.1); background-color: rgba(0, 0, 0, 0.1);
} }
@ -150,8 +151,6 @@ html {
border: 1px solid transparent; border: 1px solid transparent;
border-radius: 4px; border-radius: 4px;
} }
.navbar-search-wrap:hover,
.navbar-search-wrap:link,
.navbar-search-wrap:active { .navbar-search-wrap:active {
background-color: rgba(0, 0, 0, 0.1); background-color: rgba(0, 0, 0, 0.1);
} }
@ -393,9 +392,6 @@ html {
.im_message_selected { .im_message_selected {
background: #e1e9f0; background: #e1e9f0;
} }
.im_message_focus .im_message_outer_wrap {
background: rgba(225, 233, 240, 0.35);
}
.im_message_body { .im_message_body {
padding: 7px 10px; padding: 7px 10px;
border-radius: 3px; border-radius: 3px;
@ -704,11 +700,15 @@ a.im_message_from_photo {
.contacts_modal_search_field { .contacts_modal_search_field {
font-size: 1.2em; font-size: 1.2em;
} }
.im_edit_start_actions {
text-align: center;
}
.im_edit_selected_actions { .im_edit_selected_actions {
text-align: center; text-align: center;
} }
.im_edit_delete_btn, .im_edit_delete_btn,
.im_edit_forward_btn { .im_edit_forward_btn,
.im_start_btn {
border-radius: 2px; border-radius: 2px;
font-weight: normal; font-weight: normal;
line-height: 18px; line-height: 18px;
@ -725,6 +725,9 @@ a.im_message_from_photo {
.im_edit_delete_btn { .im_edit_delete_btn {
color: #c3584d !important; color: #c3584d !important;
} }
.im_start_btn {
color: #497495 !important;
}
.im_edit_delete_btn strong, .im_edit_delete_btn strong,
.im_edit_forward_btn strong { .im_edit_forward_btn strong {
font-weight: normal; font-weight: normal;
@ -1048,7 +1051,6 @@ a.mobile_modal_action .tg_checkbox_label {
height: 32px; height: 32px;
padding: 3px 13px 4px 16px; padding: 3px 13px 4px 16px;
} }
.im_attach:hover .icon-paperclip,
.im_attach:active .icon-paperclip { .im_attach:active .icon-paperclip {
background-position: -12px -100px; background-position: -12px -100px;
opacity: 1; opacity: 1;
@ -1137,6 +1139,9 @@ a.mobile_modal_action .tg_checkbox_label {
.composer_emoji_tooltip_tab { .composer_emoji_tooltip_tab {
margin: 0 5px; margin: 0 5px;
} }
.composer_emoji_tooltip .scroller_native_scrollable {
height: 106px;
}
.icon-tooltip-tail { .icon-tooltip-tail {
display: none; display: none;
} }
@ -1149,6 +1154,35 @@ a.mobile_modal_action .tg_checkbox_label {
max-width: 64px; max-width: 64px;
max-height: 64px; max-height: 64px;
} }
.composer_dropdown_wrap {
box-shadow: none;
}
.composer_dropdown a.composer_command_option,
.composer_dropdown a.composer_mention_option {
padding: 5px 12px;
font-size: 12px;
line-height: 25px;
}
.composer_user_name,
.composer_user_mention {
line-height: 25px;
}
span.composer_user_photo,
img.composer_user_photo {
width: 25px;
height: 25px;
}
.composer_dropdown a.composer_emoji_option {
padding: 5px 12px;
font-size: 13px;
line-height: 26px;
}
.composer_dropdown a.composer_emoji_option .emoji {
vertical-align: top;
}
.composer_emoji_shortcut {
line-height: 26px;
}
.contacts_modal_search { .contacts_modal_search {
padding: 3px 0 12px; padding: 3px 0 12px;
} }
@ -1169,9 +1203,15 @@ a.mobile_modal_action .tg_checkbox_label {
.contacts_modal_members_list li:last-child a { .contacts_modal_members_list li:last-child a {
border-bottom: 0; border-bottom: 0;
} }
.sessions_modal_wrap .mobile_modal_body { .modal-content .sessions_modal_wrap .mobile_modal_body {
padding: 0; padding: 0;
} }
.sessions_modal_session {
padding: 8px 15px;
}
.sessions_modal_terminate_all_wrap {
margin-left: 15px;
}
.mobile_modal .peer_select_modal_wrap .modal-body { .mobile_modal .peer_select_modal_wrap .modal-body {
padding: 0; padding: 0;
} }
@ -1326,3 +1366,32 @@ a.media_modal_date:hover {
width: 64px; width: 64px;
height: 64px; height: 64px;
} }
.message_actions_modal_window {
max-width: 220px;
margin: 0 auto;
}
.message_actions_wrap {
padding: 10px 20px;
}
.im_send_reply_wrap {
margin-left: 38px;
margin-right: 10px;
}
.im_send_field_wrap_2ndbtn .composer_rich_textarea,
.im_send_field_wrap_2ndbtn .composer_textarea {
padding-right: 35px;
}
.im_send_field_panel {
position: relative;
}
.composer_command_btn {
right: 10px;
top: 6px;
}
.composer_keyboard_btn {
right: 10px;
top: 6px;
}
.im_send_keyboard_wrap {
padding: 0 5px;
}

14
js/app.js
View File

File diff suppressed because one or more lines are too long

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

@ -284,6 +284,12 @@
"message_service_unsupported_action": "unsupported action {action}", "message_service_unsupported_action": "unsupported action {action}",
"message_service_bot_intro_header": "What can this bot do?", "message_service_bot_intro_header": "What can this bot do?",
"message_action_reply": "Reply",
"message_action_delete": "Delete",
"message_action_forward": "Forward",
"message_action_select": "Select",
"message_action_cancel": "Cancel",
"error_modal_warning_title": "Warning", "error_modal_warning_title": "Warning",
"error_modal_bad_request_title": "Error", "error_modal_bad_request_title": "Error",
"error_modal_unauthorized_title": "Unauthorized", "error_modal_unauthorized_title": "Unauthorized",

2
webogram.appcache
Unescape View File

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# Time: Thu Jul 09 2015 20:07:30 GMT+0300 (MSK) # Time: Fri Jul 10 2015 19:42:39 GMT+0300 (MSK)
CACHE: CACHE:

Write Preview
Loading…
Cancel
Save