From 6aa7522c343b55457a1ed196561d1b251e848225 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 6 Nov 2020 11:54:31 -0800 Subject: [PATCH 01/14] Put status form in a visual distinct box on book page and clean up create status markup --- bookwyrm/templates/book.html | 2 +- .../templates/snippets/create_status.html | 206 +++++++++--------- 2 files changed, 102 insertions(+), 106 deletions(-) diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html index d271f9c1..063116c1 100644 --- a/bookwyrm/templates/book.html +++ b/bookwyrm/templates/book.html @@ -112,7 +112,7 @@ {% endfor %} {% if request.user.is_authenticated %} -
+
{% include 'snippets/create_status.html' with book=book hide_cover=True %}
diff --git a/bookwyrm/templates/snippets/create_status.html b/bookwyrm/templates/snippets/create_status.html index 9055e2d4..62285c6b 100644 --- a/bookwyrm/templates/snippets/create_status.html +++ b/bookwyrm/templates/snippets/create_status.html @@ -1,109 +1,105 @@ {% load humanize %} {% load fr_display %} -
-
-
- -
- -
- - -
- -
- - -
- -
- - -
-
+
+ +
+ +
+ + +
+ +
+ + +
+ +
+ +
From 8b5b6e13a5ae9dec98e9b6409ec23ae4f945c505 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 6 Nov 2020 11:55:32 -0800 Subject: [PATCH 02/14] Use check icon instead of unicode character --- bookwyrm/static/css/fonts/icomoon.eot | Bin 7408 -> 7504 bytes bookwyrm/static/css/fonts/icomoon.svg | 1 + bookwyrm/static/css/fonts/icomoon.ttf | Bin 7244 -> 7340 bytes bookwyrm/static/css/fonts/icomoon.woff | Bin 7320 -> 7416 bytes bookwyrm/static/css/icons.css | 13 ++++++++----- .../templates/snippets/shelve_button.html | 9 +++++++-- 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/bookwyrm/static/css/fonts/icomoon.eot b/bookwyrm/static/css/fonts/icomoon.eot index e031e7d2809291c6b0ef32a7cb71e378b36a853e..c787c9bd3a1e38e2cea1ba9525da78986c10f49c 100644 GIT binary patch delta 356 zcmexhdBKV`K$d}F%|upnmZcXKFQ4d8E_juJfng62CnV=47BH;a^K;?}nfjG1y(tU~ zj2#RN5*8V$i78Tlzx6OMNFD&HGs^%9aB#C|1NlFIe3gvcl8Ul+wucN1QZhh(OHO`r zVth^d4j_L4knfV4SW&>B#RQa-dIIDtnAOp06 zL4kppnepP}6vl2w@yQ<;<(a36xos9=S}q#J$gqB>$Uug4o@kl0_<%=&Yjpw)d%D@eD7ZBV&9mxZuC+kR=Gb&C_k;-S> hIr)N=j}X@v?l|r~?p@qBcw`tDfyxv&>q#GC1OTJBS+xKF delta 263 zcmca$^}&+$gA4sL< zV+R9+_??W@#1yID0xAp)k|{uSW*I;M4sI4LAb$>!uac2lQc={-rUB$10P-7h@{<$e z&qVhzFi1H7`A)fs6$K2MOh9|3T7Z0oyu{qpnO>Z~f&3*vJK75Ji%S@ofies-Iv{xl zW@g3JZ7CYdg8udng^HeVUISwLDCZl8R514d8o nkTPdfn0!Dgf3mT(rx3RRcLH}0_bTppKn09ItgyLH`Vb=k_lQT; diff --git a/bookwyrm/static/css/fonts/icomoon.svg b/bookwyrm/static/css/fonts/icomoon.svg index 0323df05..e58847cd 100644 --- a/bookwyrm/static/css/fonts/icomoon.svg +++ b/bookwyrm/static/css/fonts/icomoon.svg @@ -30,6 +30,7 @@ + diff --git a/bookwyrm/static/css/fonts/icomoon.ttf b/bookwyrm/static/css/fonts/icomoon.ttf index d112fb65cef4b0db4ca7b386f19122adb5c42b98..8ba512dafca6e0fdb7df3268717d65f8b8160cdd 100644 GIT binary patch delta 381 zcmX?OvBt8VfsuiMft#U$ftkU;KUm+0Ux@80P-G7fCnV=47BH;a^OJ#rQ3l9QNlz>; z0MY_Leglx^NYANETglR!0_1lvFi2Qrq$Z|F{r%R%z#w@5C~uYl6yV@y(FXE=0Qo8z zxg`~4?Q9Pj7^FbvwdCX{J0`~0r0)O}Dyiu+s+pOaiODlE+A)gDF|srAF)C{@8ZxdFl;hei#33PWEmXm%&u=9u$tUn{ z7N?vLBU3sb-zRZvK_L$D`Hasbc?E!ye-H5sZ59@fWRh9F_`=e7ew(ih+(1_W!R^zL uJTQ84hom{9;^YI8`HVX!>qz+saed*A; z0MY_Leglx^NYANE+nsup4ao0cU=Y8Pk(!ty^;- zzXWJWTS0zt3DBWHAfp44XJBT&F!4Y)qu690MtSC`Vy>I>7?+D~E))-ElIimH`Wnw~ z^Ob>{1*C!D_Q|I=VD#iClIDyGlVzmxC-+Nv3UM27Cvf+0ui}0OQ~(MOh0U*|4lx1% D@MA~w diff --git a/bookwyrm/static/css/fonts/icomoon.woff b/bookwyrm/static/css/fonts/icomoon.woff index bbac704f0c03b1494336fc8f0784d85de2f24270..50261c68144a70fa796fde8870fdea600c8a0969 100644 GIT binary patch delta 437 zcmbPX`NLAA+~3WOfsp|SWPUJkgXuMs8)d{NYKzogP0md$U|?X(01Bso@wz=f(-Vt9 zVrPJS4k#8#oUid|t~kgx#Zl`Op}8L5dtJyJYCHD(|z_4iv(22cBafGAiuZ-=$jjGb<98(GxNpCJdE9p;*)1E$}>+BbKAU&ak*#|Bg0OH zbY^d64F*XD22~|BeMU7ib2Bk{Mn*eEaXChIMm|PmEk;Aem4b3y+l4qJ#I1!Y81?zB zBqjL-{>|c)6Jlga=i~b%ZY?OpAwHk+nIx|OQ1b5~exc3r;*m@;%NJi*8qaU@m4TZD z=m-Xe+ovNz0RpBcUy(FtRGiEsmCv|ya)p$S4A&R#IPN~~UEDW#WWZ6P$Rq_0V+IB$ NV3Y`N{w%eW5deVEUu6IQ delta 344 zcmexiIm1$<+~3WOfsp|SWM(jMgK3}14`swBYKzogNzP3yU|?X(01Bso@!CD#(-Vt9 zVrPJS4k#8#oUid|t~5WfS$yHk&{Wuzto^+;|2sxbp$sow%B89+gx*b5+E1%x@c zS+p{8ODY%`q^Wiu)Z< Z0V5DAFiC-ffq{Vu7;3_sgQb@;0sz#7P>cWo diff --git a/bookwyrm/static/css/icons.css b/bookwyrm/static/css/icons.css index 1f34f78c..09c22e1a 100644 --- a/bookwyrm/static/css/icons.css +++ b/bookwyrm/static/css/icons.css @@ -1,10 +1,10 @@ @font-face { font-family: 'icomoon'; - src: url('fonts/icomoon.eot?ouoizu'); - src: url('fonts/icomoon.eot?ouoizu#iefix') format('embedded-opentype'), - url('fonts/icomoon.ttf?ouoizu') format('truetype'), - url('fonts/icomoon.woff?ouoizu') format('woff'), - url('fonts/icomoon.svg?ouoizu#icomoon') format('svg'); + src: url('fonts/icomoon.eot?aeb2zb'); + src: url('fonts/icomoon.eot?aeb2zb#iefix') format('embedded-opentype'), + url('fonts/icomoon.ttf?aeb2zb') format('truetype'), + url('fonts/icomoon.woff?aeb2zb') format('woff'), + url('fonts/icomoon.svg?aeb2zb#icomoon') format('svg'); font-weight: normal; font-style: normal; font-display: block; @@ -25,6 +25,9 @@ -moz-osx-font-smoothing: grayscale; } +.icon-check:before { + content: "\e917"; +} .icon-dots-three:before { content: "\e916"; } diff --git a/bookwyrm/templates/snippets/shelve_button.html b/bookwyrm/templates/snippets/shelve_button.html index b09ba297..bf1db9b6 100644 --- a/bookwyrm/templates/snippets/shelve_button.html +++ b/bookwyrm/templates/snippets/shelve_button.html @@ -5,7 +5,9 @@ {% active_shelf book as active_shelf %}
{% if active_shelf.identifier == 'read' %} - + {% elif active_shelf.identifier == 'reading' %}