From e71a5e3bdfe6a4077ddcbbffcf392f09519c44bc Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Sun, 27 Feb 2022 00:00:22 -0800 Subject: [PATCH] Add barcode icon and use other icons Minor formatting and messaging tweaks --- .../css/bookwyrm/components/_barcode.scss | 1 + bookwyrm/static/css/fonts/icomoon.eot | Bin 10460 -> 10688 bytes bookwyrm/static/css/fonts/icomoon.svg | 1 + bookwyrm/static/css/fonts/icomoon.ttf | Bin 10296 -> 10524 bytes bookwyrm/static/css/fonts/icomoon.woff | Bin 10372 -> 10600 bytes bookwyrm/static/css/vendor/icons.css | 3 +++ bookwyrm/static/js/bookwyrm.js | 1 + bookwyrm/templates/search/barcode_modal.html | 9 ++++++++- 8 files changed, 14 insertions(+), 1 deletion(-) diff --git a/bookwyrm/static/css/bookwyrm/components/_barcode.scss b/bookwyrm/static/css/bookwyrm/components/_barcode.scss index b6b41697..8c77d525 100644 --- a/bookwyrm/static/css/bookwyrm/components/_barcode.scss +++ b/bookwyrm/static/css/bookwyrm/components/_barcode.scss @@ -4,6 +4,7 @@ position: relative; max-width: 100%; text-align: center; + height: calc(70vh - 200px); video { height: calc(70vh - 200px); diff --git a/bookwyrm/static/css/fonts/icomoon.eot b/bookwyrm/static/css/fonts/icomoon.eot index 7b1f2d9d9f9d3ff8805e56d83c6c2ceba7654a8f..69628662beb9b527fe62d38c0d177366773ad879 100644 GIT binary patch delta 613 zcmaKoPe>F|9LK+J->74Ia7Wu2YZrHP++8IsVq<5avIp5E5{wKz1U0DbB90EYko^JY zw5JGUPTdv?jJgEVDI%tGm+BITcCuhOqEud-Ol^n<>*oP{Al;j@Eoal-oCR2#_-WZ%b;uLMugK-{(!=`~-j|k%-vYy> z%7QhY*=@MZS3KitIWCA&zc(`I$*ItfyUnQO(ez&wTX9Z6_-yr@&e8;xd9E_ih z(Z}-BRM3|#d*S)@?!Uw|l+~P-)hak87->W~IREO+v&XliWA)R)IAk#BVKUT1Gkg@* z!mYg%d&TB{vl(?!f>3KG-wzYk{Gmx2SAVK+)VeyQ4kmxoB<6h@IptrAU1pLoG-UWS zo*7uDe}|C31#Rd;96jiRh7>X|kjELELjfi(;tJ4LP>iEuZH}CiBJU_94YRE*d8B;X z;ktnkt`PKQXxYI`pzHLox~@0strF!-{8!+*2P7``-I#m4sN={2{1=0Yluk`9mhbjl z`h~dEx~(0tedykotjWeaIp=kN(vnxtX`Y{(O7$mRD<_o+#ZjIq-+JZVG#E9F#ZDvP I59B|xf82kgdjJ3c delta 369 zcmX>Qd?%3Yjs^pRg~miSGnPQzr#B}$l-C&V3Yy!ThbGY z3xKo$kiP&(bEM}~rs-XX-vQ*WU|>*A$Vg30kr$E&s#oOz%9~{X1vt1_%z%6cAYUaT zx1?f$9j7ypp917>$jMJm+`ntbGzJDW5gp$3c?M?Y3zJhAtF<$LJTaidm>Jj@7#S2^ioR5MS@p8*<*ip- zugw1c{r?}N2Pn?)QhYKWlQ`!pvH4>DVhW;PCmS$HZ}w%fWn@uOR#w{F$1E?mxmAgu zMds#H-N1N$o39MqEMUENujbAHF+lX>4Ql3$I+I_hO`cq@o}pwXutMO5Ad8@qV4C0@ e!3{t~j6kfzB*g#<1qKEthKUX$n`Jc?GXemcjbGRR diff --git a/bookwyrm/static/css/fonts/icomoon.svg b/bookwyrm/static/css/fonts/icomoon.svg index 7dbbe0dc..c67c8b22 100644 --- a/bookwyrm/static/css/fonts/icomoon.svg +++ b/bookwyrm/static/css/fonts/icomoon.svg @@ -39,6 +39,7 @@ + diff --git a/bookwyrm/static/css/fonts/icomoon.ttf b/bookwyrm/static/css/fonts/icomoon.ttf index 151f2b782e011873be7120240fc65777f3771917..12c79d551739bdbfe9e7246ae713b4d23545fdce 100644 GIT binary patch delta 595 zcmaJU9_nZ0RBhqb_2X~G7O7tX17r1h zXRfr-ZUE*6^P_bdskCANgF5v<-EFKq8Sg$#JxTp)VQKc16W)Dymc}m{)2_4PVO-+R zDwnDCMaP|gc&7U|H9soWyrty^8)Xc&lRRYk{e$pMKIy8LeaT319zDuOdSnIX#r}#F z-Hz6xkDGfpN8_zHhKRowl!B~%(_UyzZAvTWf3ivh<)K3Bv6v8w(cf>hzDT8ms~i)y z0@>z)F0Lqp917?|2?i=Sgb`F>;RGgtTvau8Lv(b)GLi6}YTmFqFv$rj9ft3Rw(Z+C z-vT?deI?X&KBB4X?dFcfys-Zw^!;r@wzquA|36rP2y=Hw5g6^;pf zwm<#j;IL_l;b6`T1cLA8&2n$gb9J9Ose0;t^+Pt5Epo}guyi1~3Ji(s%e8{Rr{WLv CgOqUq delta 367 zcmbOev?HLNfsuiMft#U$ftkU;KUm+0Ux?iRD6$8L6OwZi3ofsnxQ2m&Q3l9wNlz>; z0MY_L{sJJ)k)BhTrgtHJ2avylfk8PTBQ-HaUPvCOUX=qVZy_F6zyJR;F#dlm&LYk%wn}Win7^2U=vSb6#>o>I#W$~Hv}I&bQdU;l{EA6lZu3J$ zeioUVPjv(1`E9;3aI=6cWVm}ZcMgo6%%f(`s599`Z8D?9p+9LIa$+?LI3=E7JK&c)OUY@%= zB0aGfB=!Z!=YV2?^qk5xpx7S<1{DhsHrZv7myw#7!oZ+r0#suL!tyWvlw<$}fnqs8 zz6uC)aI=_a zCYij%+*F|00ifk=AUxBH^LIghaS6~z9&mNcKo&Fe#mPL3)uBKW7$g`37?^>MXJk-# zDf&|3rTNRMmu)X^z2bUh_W$qy|3DQ$8(uQJ6o<-Ohs!Yje=N=-&Mfv;Y_-?|u>dhe z(QiPL7-39C) zX3%FaW-w>4X0T^q5H=Q6M#hX#K8R)pVi3)0EUIh{#i~FWgw>%mLqo#>2Zsg+2O!DF z0H*$hA5c&LBE|&@3V#-Wg@E#m4iJ2xq2V78GduikU~0gRfjW=?1H)!-ML`xBY2U2$ zcz&C&4BRZ>5WDAa2To6}P&H@NoxDMHG9$xe2eoWP34v9DB7!c01%iEomxMTkWEdEM ViglT!fKdSgOrRj#d|z!TBLME8r#Aoq delta 413 zcmaD6)DkFC?(gQtz{mgu8Z8XmVA^7Gpr-glZIOC|0tal-PM@DL53Il^`2vCg~2+Iq}ugL%k0>yfOd=(Jp z;ASz)$StV=ifsV$!FYikr*lqzGEkkLS^`io3WWFX+A%FRu>xqZ+8!WZ0gO$VWbzVo zQ-NZ4fR?v`@Juhx-v#-_B|zT*Er+UO2C|r$FHGiPtQH1&MT|j!fti5~=xc?SqAwLD z&ta5Qu6o(_^7<>TS7!hJ{{PRw`2Vpui#W5`DzW)u{$dKEUxDfwL7}qwE2AwVi;}Xk z(q=PedAZHHO8hJ`H=pVT#`D{JW#DE3n$Ey*_iFAO7(F>c&74tZ@&vWXlhxHT6zv37 n2;2~45mXXP6PzOm@-HJ0>o7@y!;*o4Y4Srx;mwEDmofqX)LCPK diff --git a/bookwyrm/static/css/vendor/icons.css b/bookwyrm/static/css/vendor/icons.css index 4bc7cca5..6477aee5 100644 --- a/bookwyrm/static/css/vendor/icons.css +++ b/bookwyrm/static/css/vendor/icons.css @@ -149,3 +149,6 @@ .icon-download:before { content: "\ea36"; } +.icon-barcode:before { + content: "\e937"; +} diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index f6811614..efd5cfff 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -687,6 +687,7 @@ let BookWyrm = new (class { }, }, (err) => { if (err) { + scannerNode.replaceChildren(); console.log(err); toggleStatus('access-denied'); return; diff --git a/bookwyrm/templates/search/barcode_modal.html b/bookwyrm/templates/search/barcode_modal.html index 9480197f..3f7b01ce 100644 --- a/bookwyrm/templates/search/barcode_modal.html +++ b/bookwyrm/templates/search/barcode_modal.html @@ -12,19 +12,26 @@
- +