From 7db7d2a2abfacdb70b23e066bce6a3b1afe2c33f Mon Sep 17 00:00:00 2001 From: Joe Reeve Date: Mon, 8 Jul 2019 13:18:07 +0100 Subject: [PATCH] Switch caret to image and move JS to separate file --- static/server/caret.png | Bin 0 -> 1388 bytes static/server/home.html.tmpl | 1 + static/server/include.html.part | 1 + static/server/resources_list.txt | 2 ++ static/server/taskbar.css | 26 +++++++-------- static/server/taskbar.html.part | 54 ++----------------------------- static/server/taskbar.js | 49 ++++++++++++++++++++++++++++ 7 files changed, 66 insertions(+), 67 deletions(-) create mode 100644 static/server/caret.png create mode 100644 static/server/taskbar.js diff --git a/static/server/caret.png b/static/server/caret.png new file mode 100644 index 0000000000000000000000000000000000000000..96b67db35080e721f9ce735ba311fc05ace51b41 GIT binary patch literal 1388 zcmV-y1(W)TP)m6P-+qae8b;M9tiQ7vM+Sxa*b4EIKYGej8mI+-X`{6cDhD zrY}Jwy6^@x8g(^_^FA|Hhc+TrP^an~cz;Q!MT#mse@+Qih^8^d7-Nhv#u#IaF~%5U zj4{R-Q`ytg)4Omu{5SpY)7VciCL0?Y7@K!m0d&nGY$y;29G;(_|9W(E^b1`Mc|4v+ zjr|v+t*tF`d3hN)IXP*k%N;Z}|7fDn2K1hup6`CY|H=3_JUkrbneu;(*4EZ&_Sj5K zO?}6hSy_+ig|XsbF!+sT#&6l*kHunvk&%%|InR{rnUVedm6a8Y)i=8ScN&`qGwU)H z1TjLPP%52Hx4(8hqKuA??$UC>a*OgjGj^}8uDV~lo}#qVn51aAKg>kQ8w4@>`uY;5 zr>7lnEfH&8pE)# zu+XLJdd??7`fD2;931>gF#=i&@N#VQmm3@y7}z>KJ`QR& zD5WSEo0gWA-J6@6qGA~4=H`MvpKpuSJD5E-diDk>#utjwr`ZTm#>dCs+;7SbW7FK+ z9J{@}Eoc{>%k=bgAI+36wEjPhvH1~XVq)SG#pu@rh(sdzL6nRlDu!WpcDBE%sp%7a z`4=w#2=e~@`_D93U33RbJ;k+3#VDdAn=!zv<-T){L>U_!i^~uNF}Ak0;v!>IR#v_l13dXw;>7NY4q)!nA%z~Z=M3y- z#JIk`wshRi3dBezlX;K!<_!X+97U!WU@8cdVieh8faxGmN>OBt0hWS5DMXPq23QUP z_<`2e*5VHj55j&RIv;Z|KR^G`?kKqLo12>nI%+HI0aaC1wVy~N3VJ{l6a-X^B6|!d zI0&c|MTHnpR1i=h3hv|j`g-F2{$5xNzu&*Vx3^dH@4cdffXq=;iUGC+0U4vH76WVx z0y0Ix@v+9nMx|natwF$vD80SChl`7gIp3Oz7<5`Rb$55yp$Q@)2G|}1+>D}f3=k3o z+=!xj3=kFsoQ#66RgVEegMbrJ8X6i7FD@=L)nkD0Ab=?0a5(z-_$cgboJch_HOXi+ z+Uvw=0Y`!W-aJrSTN_g?%5x0I-i+Z`5Kt|O(=ou&AfQSVH)4R}K|uB>Zp8psf`F`1 z+>8OP1p(QjxE%vr4Fa-6ks$`S9t7NuB1;UAA_%w@MWz_w)g*xdNvG2RpU;=n98zCj zFI5bXW`-CrQ|M8gwwDc6N58`(sq;f`I5Kvc>=@gMg?gGRFXEgMi&p zWRC$-2LZdHs1O6B4+6zTQ6&Z_5d;d2qEZY{CJ0!KqFM})=7pgd7}&G3v!K`O-OINu zz35Xe1}HT{4EbgXVr*}3EBOgTN(O;kQB;nhJVdFku8td@lN$tFW*-v&&Eb0000 + diff --git a/static/server/include.html.part b/static/server/include.html.part index 7996fcb..635e6f9 100644 --- a/static/server/include.html.part +++ b/static/server/include.html.part @@ -25,3 +25,4 @@ jk("html").addClass("cybook"); } + \ No newline at end of file diff --git a/static/server/resources_list.txt b/static/server/resources_list.txt index 9df07e1..078bb6f 100644 --- a/static/server/resources_list.txt +++ b/static/server/resources_list.txt @@ -19,6 +19,8 @@ jquery-ui/jquery-ui.theme.min.css jquery-ui/jquery-ui.min.css home.html.tmpl include.html.part +caret.png +taskbar.js taskbar.css taskbar.html.part global_taskbar.html.part diff --git a/static/server/taskbar.css b/static/server/taskbar.css index 1efc6f3..37f8d36 100644 --- a/static/server/taskbar.css +++ b/static/server/taskbar.css @@ -52,16 +52,6 @@ display: none; } -#button_show_toggle:not(:checked)~label:after { - content: '⌃'; - transform: rotate(180deg); -} - -#button_show_toggle:checked~label:after { - content: '⌃'; -} - - #button_show_toggle:checked~label~.kiwix_button_cont, #button_show_toggle:checked~label~.kiwix_button_cont>a { display: block; @@ -71,12 +61,18 @@ display: none; } -label[for="button_show_toggle"]:after { - transition: 0.1s; +label[for="button_show_toggle"] { display: inline-block; - font-size: 30px; - line-height: 21px; - vertical-align: middle; + height: 26px; +} + +label[for="button_show_toggle"] img { + transition: 0.1s; + height: 26px; +} + +#button_show_toggle:checked~label img { + transform: rotate(-180deg); } label[for="button_show_toggle"], diff --git a/static/server/taskbar.html.part b/static/server/taskbar.html.part index 63a3717..c7f819d 100644 --- a/static/server/taskbar.html.part +++ b/static/server/taskbar.html.part @@ -9,7 +9,7 @@ - +
@@ -19,54 +19,4 @@
-
- \ No newline at end of file +
\ No newline at end of file diff --git a/static/server/taskbar.js b/static/server/taskbar.js new file mode 100644 index 0000000..bf35a1a --- /dev/null +++ b/static/server/taskbar.js @@ -0,0 +1,49 @@ + +(function ($) { + if ($(window).width() < 520) { + var didScroll; + var lastScrollTop = 0; + var delta = 5; + // on scroll, let the interval function know the user has scrolled + $(window).scroll(function (event) { + didScroll = true; + }); + // run hasScrolled() and reset didScroll status + setInterval(function () { + if (didScroll) { + hasScrolled(); + didScroll = false; + } + }, 250); + function hasScrolled() { + var st = $(this).scrollTop(); + + // Make sure they scroll more than delta + if (Math.abs(lastScrollTop - st) <= delta) + return; + + // If they scrolled down and are past the navbar, add class .nav-up. + // This is necessary so you never see what is "behind" the navbar. + if (st > lastScrollTop) { + // Scroll Down + $('#kiwixtoolbar').css({ top: '-100%' }); + } else { + // Scroll Up + $('#kiwixtoolbar').css({ top: '0' }); + } + + lastScrollTop = st; + } + } + + $('#kiwixsearchbox').on({ + focus: function () { + $('.kiwix_searchform').addClass('full_width'); + $('label[for="button_show_toggle"], .kiwix_button_cont').addClass('searching'); + }, + blur: function () { + $('.kiwix_searchform').removeClass('full_width'); + $('label[for="button_show_toggle"], .kiwix_button_cont').removeClass('searching'); + } + }); +})(jQuery); \ No newline at end of file