From 4926afff651049d5d1ecf4c9e41797d33964e833 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Wed, 4 Jun 2014 20:59:46 +0400 Subject: [PATCH] New external buttons, Hotkeys update --- app/css/app.css | 45 ++++++++++++++++++++++++++++-- app/img/icons/AboutLogos_1x.png | Bin 0 -> 1766 bytes app/img/icons/AboutLogos_2x.png | Bin 0 -> 5947 bytes app/js/directives.js | 10 +++++++ app/partials/changelog_modal.html | 8 +++++- app/partials/settings_modal.html | 9 ++++-- 6 files changed, 66 insertions(+), 6 deletions(-) create mode 100644 app/img/icons/AboutLogos_1x.png create mode 100644 app/img/icons/AboutLogos_2x.png diff --git a/app/css/app.css b/app/css/app.css index 7bb51300..dbed3b7e 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -619,7 +619,7 @@ a.tg_radio_on:hover i.icon-radio { .tg_form_group { - padding: 8px 0; + padding: 6px 0; } .tg_form_group:first-child { padding-top: 0; @@ -2055,7 +2055,7 @@ img.img_fullsize { } .user_modal_header { font-weight: bold; - margin: 0 0 10px; + margin: 2px 0 7px; } .user_modal_status { color: #999; @@ -2641,6 +2641,46 @@ input.tg_range::-moz-range-thumb { 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_window .modal-dialog { max-width: 506px; @@ -3401,3 +3441,4 @@ ce671b orange .changelog_version_changes_list li { line-height: 20px; } + diff --git a/app/img/icons/AboutLogos_1x.png b/app/img/icons/AboutLogos_1x.png new file mode 100644 index 0000000000000000000000000000000000000000..5f8ee77a94659c285414d8f6066c0e53362d78e7 GIT binary patch literal 1766 zcmVFUGO2iP28jV$nL4O%FC?v*IQ$(t@9lta4UATR`dDE9B+B-cb`SSYSoVR@Uo^#i) z1*ufZ^d~Dc{mhiG63#OlkW40n*9HPrz;s{=P|WK;0Pg{HKrPVG7YHO0iFkwq=jFg6 zU}}i(0l=}q)xg`pZNU3JhxAOKAq&}{O{MQlUkOXiJ`D^9J^)%G?rEXVaNbkyRSp9~ zfQLz-4Y&;W1-K3v25hJAIA9m>7;qr40Vv|VmB8*C?>Y&X1so3i2D}BV0QLul0>6jc zQvw_hYy!Ro1_NgTzh+A(v`M3Im@NLt?@eKZ6KtI9c_BaO{)mqsPzH3dYrCBJ{hd?m(h%-oxQpFK z7^jA%kgo@tfkxm)MnDsNCa`^w<5}!Zmq|#w)1{Fy2)n*LnR4yNV=+JW4A$IEC%WeH z@7tO8gLp2{@hI?&lZrOHZ4~^$M%8}HQ>f7sm`(+@yDel%TC0db*!A5J;kV6c+zdx> zHWj)YzfR}lck|rZQs4&QW}X*>rV=*O|crUtu4#hQq{i)|zwy*8mr=R@(T05zM3F0HHNRlu5sNE(>uSpV`33cn~;< z`S%n1-m`%ZIa#S@W!UcUR^S`{K8H2f%6CXqe98io*8d!a@>1mUhICle)z#S$dY2EB zHEQbSKojnmoAn6`TGRHUL4BQA|DXP>vZ@pS1#Ard7g9SP3g(C9H&%uo70n zN>~XiVI{1Dm9P?4!k*cHs>Kb#YhI~%YO5>b5e}TIiYJSyipQHAHhHGvL7TKk#e@7- z6_2WTjAtqygz$2NZX=HSsCaO#n~Dd1s^ZBj6%T4uRXlm2;z6#4s(5f+RXqJh#e;m# zsCcF?s<$EJrHUu+Y)Mr-MpZoBOjSI(rlo|Huo70nN>~XiVI{1Dm9P?4!b(^PD`6$9 zg#TkpFXAPWNm;EQmPjPpqMYG3&t!J&4l$YCLs`s|odj8%ZpHl@eW_vDeXj?h(g?D$ z;x9XVvb8De*RpoK4EV%kHo7}~3TfHukZqMWK&&E!>}Zk-GbyAZ7JxT|Wm`qoYmXr5 z8vb9sHPKd#ig?ay)^?w_J?qjSC?b$q&Tq0uD|<<@yDmAtz;xf2b!|NIce788mh9JV zH<`_}(fm#JWTz2PCOh#R#uKw!E%L$hP0yqYL6dZ7^{O96IDTRFY9ZoU6Yk&TTMdid z!LDUajs_}d&w4r1LM@3_YH-Zam+Zo?@_A_aa*TULqfw25>hP8@KE9qKsf8xD1o2Mz zuk~{BfNsfctVB&S(Cn28h1mj-eZbqvgAD#bT9i8?SUD=f|0CdTkX>awHA`4VQ|;_e zPXi7!8U3{6rzmw~7WA4lP;A`1HI+OlVI{1Dm9P?4!b(^PD`6$9gq5%oR>DeH2`gdW zEWL(@ha8rcJfNWbl|10%V@V$1zt+pi z1G=Tyk_V9WTk-(XJ(fIxZ2yrwuyOO&RPvyNm9P@_%KjB#04gD*uw87CWdHyG07*qo IM6N<$g6UyI2><{9 literal 0 HcmV?d00001 diff --git a/app/img/icons/AboutLogos_2x.png b/app/img/icons/AboutLogos_2x.png new file mode 100644 index 0000000000000000000000000000000000000000..16538718991b15f3236e678386be6116941c5b98 GIT binary patch literal 5947 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 mK9uwSgw=3DL4?k+!zxp>*LUHc^ literal 0 HcmV?d00001 diff --git a/app/js/directives.js b/app/js/directives.js index cbd025df..37da2fd2 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -56,6 +56,16 @@ angular.module('myApp.directives', ['myApp.filters']) 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 (!searchFocused) { searchField.focus(); diff --git a/app/partials/changelog_modal.html b/app/partials/changelog_modal.html index 74ff2584..a78ac329 100644 --- a/app/partials/changelog_modal.html +++ b/app/partials/changelog_modal.html @@ -25,6 +25,12 @@
  • Browse userpic history (click on the photo in user info)
    • +
  • New GitHub, Twitter buttons in Settings
    • +
  • Updated keyboard shortcuts:
    • +
      +
    • Alt+Home - switch to first (most recent) conversation
      • +
    • Removed Alt+1, 2, 3.. shortcuts due to conflicts in different browsers
      • +
@@ -35,7 +41,7 @@
    -
  • Added this welcome message
    • +
  • Added version history to welcome screen
  • Added keyboard shortcuts:
    • Tab - set focus to message field
      • diff --git a/app/partials/settings_modal.html b/app/partials/settings_modal.html index 173705b1..c1f6dec4 100644 --- a/app/partials/settings_modal.html +++ b/app/partials/settings_modal.html @@ -101,11 +101,14 @@

      About

      -
      +
      +
      + + +

      - Webogram v{{version}}, Recent updates, Source code on GitHub
      + Recent updates (ver. )

      -

      Follow us on Twitter: @telegram_web