Browse Source

New external buttons, Hotkeys update

master
Igor Zhukov 11 years ago
parent
commit
4926afff65
  1. 45
      app/css/app.css
  2. BIN
      app/img/icons/AboutLogos_1x.png
  3. BIN
      app/img/icons/AboutLogos_2x.png
  4. 10
      app/js/directives.js
  5. 8
      app/partials/changelog_modal.html
  6. 9
      app/partials/settings_modal.html

45
app/css/app.css

@ -619,7 +619,7 @@ a.tg_radio_on:hover i.icon-radio {
.tg_form_group { .tg_form_group {
padding: 8px 0; padding: 6px 0;
} }
.tg_form_group:first-child { .tg_form_group:first-child {
padding-top: 0; padding-top: 0;
@ -2055,7 +2055,7 @@ img.img_fullsize {
} }
.user_modal_header { .user_modal_header {
font-weight: bold; font-weight: bold;
margin: 0 0 10px; margin: 2px 0 7px;
} }
.user_modal_status { .user_modal_status {
color: #999; color: #999;
@ -2641,6 +2641,46 @@ input.tg_range::-moz-range-thumb {
display: none; display: none;
} }
.settings_about_section_body {
padding-right: 0;
}
.settings_about_section_body p {
margin-top: 7px;
margin-bottom: 3px;
}
.settings_external_service {
line-height: 0;
display: inline-block;
padding: 7px 9px;
}
.icon-github {
display: inline-block;
width: 59px;
height: 18px;
background: url(../img/icons/AboutLogos_2x.png) no-repeat 0 -5px;
background-size: 60px 136px;
}
a:hover .icon-github {
background-position: 0 -43px;
}
.icon-twitter {
display: inline-block;
width: 20px;
height: 15px;
margin-top: 1px;
background: url(../img/icons/AboutLogos_2x.png) no-repeat 0 -81px;
background-size: 60px 136px;
}
a:hover .icon-twitter {
background-position: 0 -116px;
}
.is_1x .icon-github,
.is_1x .icon-twitter {
background-image: url(../img/icons/AboutLogos_1x.png);
}
/* Contacts modal */ /* Contacts modal */
.contacts_modal_window .modal-dialog { .contacts_modal_window .modal-dialog {
max-width: 506px; max-width: 506px;
@ -3401,3 +3441,4 @@ ce671b orange
.changelog_version_changes_list li { .changelog_version_changes_list li {
line-height: 20px; line-height: 20px;
} }

BIN
app/img/icons/AboutLogos_1x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/img/icons/AboutLogos_2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

10
app/js/directives.js

@ -56,6 +56,16 @@ angular.module('myApp.directives', ['myApp.filters'])
return true; return true;
} }
if (e.keyCode == 36 && !e.shiftKey && !e.ctrlKey && e.altKey) { // Alt + Home
var currentSelected = $(scrollableWrap).find('.im_dialog_wrap a')[0];
if (currentSelected) {
currentSelected.click();
scrollableWrap.scrollTop = 0;
$(dialogsWrap).nanoScroller({flash: true});
}
return cancelEvent(e);
}
if (e.keyCode == 27 || e.keyCode == 9 && e.shiftKey) { // ESC or Shift + Tab if (e.keyCode == 27 || e.keyCode == 9 && e.shiftKey) { // ESC or Shift + Tab
if (!searchFocused) { if (!searchFocused) {
searchField.focus(); searchField.focus();

8
app/partials/changelog_modal.html

@ -25,6 +25,12 @@
<div class="modal_section_body changelog_version_changes"> <div class="modal_section_body changelog_version_changes">
<ul class="list-unstyled changelog_version_changes_list"> <ul class="list-unstyled changelog_version_changes_list">
<li>Browse userpic history (click on the photo in user info)</li> <li>Browse userpic history (click on the photo in user info)</li>
<li>New <a href="https://github.com/zhukov/webogram" target="_blank" title="Source code on GitHub">GitHub</a>, <a href="https://twitter.com/telegram_web" target="_blank" title="Follow us on Twitter!">Twitter</a> buttons in Settings</li>
<li>Updated keyboard shortcuts:</li>
<ul>
<li><strong>Alt+Home</strong> - switch to first (most recent) conversation</li>
<li>Removed <strong>Alt+1, 2, 3..</strong> shortcuts due to conflicts in different browsers</li>
</ul>
</ul> </ul>
</div> </div>
</div> </div>
@ -35,7 +41,7 @@
</h3> </h3>
<div class="modal_section_body changelog_version_changes"> <div class="modal_section_body changelog_version_changes">
<ul class="list-unstyled changelog_version_changes_list"> <ul class="list-unstyled changelog_version_changes_list">
<li>Added this welcome message</li> <li>Added version history to welcome screen</li>
<li>Added keyboard shortcuts:</li> <li>Added keyboard shortcuts:</li>
<ul> <ul>
<li><strong>Tab</strong> - set focus to message field</li> <li><strong>Tab</strong> - set focus to message field</li>

9
app/partials/settings_modal.html

@ -101,11 +101,14 @@
<div class="modal_section"> <div class="modal_section">
<h3 class="modal_section_header">About</h3> <h3 class="modal_section_header">About</h3>
<div class="modal_section_body"> <div class="modal_section_body settings_about_section_body">
<div class="settings_external_services pull-right">
<a href="https://github.com/zhukov/webogram" target="_blank" title="Source code on GitHub" class="settings_external_service"><i class="icon icon-github"></i></a>
<a href="https://twitter.com/telegram_web" target="_blank" title="Follow us on Twitter!" class="settings_external_service"><i class="icon icon-twitter"></i></a>
</div>
<p> <p>
<strong>Webogram</strong> v{{version}}, <a ng-click="openChangelog()">Recent updates</a>, Source code on <a href="https://github.com/zhukov/webogram" target="_blank">GitHub</a></br> <a ng-click="openChangelog()">Recent updates (ver. <span ng-bind="version"></span>)</a>
</p> </p>
<p>Follow us on Twitter: <a target="_blank" href="https://twitter.com/telegram_web">@telegram_web</a></p>
</div> </div>
</div> </div>

Loading…
Cancel
Save