From bdd9204b3c6ba6f67a6196b4d606c99191d572aa Mon Sep 17 00:00:00 2001 From: Mary Kate Date: Tue, 4 Aug 2020 15:21:42 -0500 Subject: [PATCH 1/3] basic filter form component set up --- app/soapbox/components/sidebar_menu.js | Bin 9379 -> 9371 bytes .../features/compose/components/action_bar.js | Bin 4160 -> 4157 bytes app/soapbox/features/filters/index.js | Bin 1181 -> 7418 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/soapbox/components/sidebar_menu.js b/app/soapbox/components/sidebar_menu.js index f338023715ced119bbb64e9d085f7aa1b04f2a3a..12ae23f5764fb3f6b6c8803271a615391f54c8ff 100644 GIT binary patch delta 24 gcmZ4NIoorCto&pFY2C?w@&_kR5aZvhq|nF$0B$P?D*ylh delta 29 lcmbR3x!7}qtUPnIzSiUgqS}+)<&Ur^XzAB(=2n=%0sxd{2`~Tv diff --git a/app/soapbox/features/compose/components/action_bar.js b/app/soapbox/features/compose/components/action_bar.js index 411a30f17dc0ca73fbe0e970001684ead09ce254..fa763d806a19edf91a5e94f3b06202267b6b1fe5 100644 GIT binary patch delta 16 YcmX@0uvcM27SCjU9=*-8d6qH*05y{Z!TZI9bF68`RAG3XcBz*@VT1VOR2gSMOIF1RKabb|&(aWJ$N9r0FgCsElLhX4CL zLsAwg$=cpI5QePoR?=LnUzJQ=r<9q6>X{_qoCs7!4DH@mUgr*@?2nf?+VN- z5jP)Qu~=+mE?$Ycj^2y{f@sn3O z=^br^S|=}LszinTtpSu0=JK!~SixTaD2u#4-x%4>#?87a(vFsBr@NT0Dz)TGJ=8YEsdh&#G3s<;kl z&-=I&TfRJEBecuGh^>DaO)4rXlPao(wJ1K865Bs!(Jqf!{6%Y0v_Vi=V@Z*Tm6DlA zkx$1=dO~A{{|PJ9TCtYP<~Eh<2W|Jn#;m{5miqSdLdlI>M>_hCdF}~~*?#R>v7RF| zJ|OE(TlR#;EML1;tmPO1zT&77)iIA9kuj^BBB*w?f)OepMRlsE5?S#<#CEgyNs)>b z2mb?G9te*4_l~XU%o;I&V$-hiBU^u$U^^-iZLW41$6JfiGKumg6O~+3k@NngGWhTn z-3kIosRVR@1WRZ>>jb@kE$XMcUPp1f%EkS$BeKh50Q?lk^jh4LDKYN=s|7+-RdF<& z^x~MgUs#LqJQO&4klNmUb|{Xzl9((&edL08`TfNOs@!Xig@CKuBh2(P(j*zfJb4! zh*#|tdZOPjHc?s&<1h^NOTM@2)#5Ai*1T%!t?4F8ZUI7@a&)`=z9LmM+Lt}fnLs5i zn|m(fS4ESn>CEmzC9)3rXzH*D)lnPm z1Ewx-o_?am*(^lq&Zpp5mRFse{}M0JQ}A6r}SI#_g^yU>cPRNHnoTGC=LFUfcrXrWb) z@U~UcDlfnLqiB#IIPXB&5hbQ5-x6l3mIl)nx$qsGKhp(>od zE3D^bl#4WQHK3DRKB%%iYq%HjYt={DSykIE;NI3K6DKT59}=b z0d=rWV89QeVT;x%8d8a@UhcGrpp4~pEzz#wIG_?=7}+ZOC-G0Yp2FKze0G(OlB?@K$^PYW!7 zdgZRq36Bm#IZh#6y`8sBTs_;|J~+wh?di4EGx&Edc+|-720`Mr$-!52I#FSs#{6Im z@r#WnMQO#Hu|2XA_IT*vqU8Wz7O@`L8;x6&jGo+B&RP;-lTdg2(1H_s%EM?R3|%8B z+-}S)4b{euyVdzJFna9v1ROod&jqBXKHS^i1`?0bp8&*@`&>9Y<-ai)i0AIL(Frg- zxz7c|Q~s7<^m5{>O8(d7nezs06h*GZr)kIGP1vZuDOt`NE%B*`;Ocx!?7MDhetl)t z?nYwU9YkRL z4L%br10J~QKK4caYZ2kqM+L6vkl*%ZA9!~z1i5skL|?McGIlN7!7H@s)LdY+o$2>- zJ(oe4c>Ka#0MPa>!{QmPDKT;4eRlr|nho~GHc#HVuwR@*YN$PWd)ABR#kmi*cN9Gf ZkUf0qf}DQcq@6rB Date: Tue, 4 Aug 2020 21:15:16 -0500 Subject: [PATCH 2/3] add and remove muted words, filters --- app/soapbox/actions/filters.js | Bin 1240 -> 2071 bytes app/soapbox/features/filters/index.js | Bin 7418 -> 10860 bytes app/soapbox/features/forms/index.js | Bin 5557 -> 5684 bytes app/styles/application.scss | 1 + app/styles/components/filters.scss | 72 ++++++++++++++++++++++++++ 5 files changed, 73 insertions(+) create mode 100644 app/styles/components/filters.scss diff --git a/app/soapbox/actions/filters.js b/app/soapbox/actions/filters.js index cff647de3c9d04a742bb47481f159cf95eb63727..3448e391cb865ed3dcf377ed2f659d731edad73f 100644 GIT binary patch delta 502 zcmah_!AiqG5T!PV_T<5fVqx^Mu?AwHC&7cXD+oofX>UT@cDH09&4%5z4U}HRgPxn|W{EzL~G>*PWOBIv>SCYM6ow#N;Am8J@vViV+|sNZc2R zO9q;YNV#Oms`;xsDFzqg=;+qjGU4!-GOuM6jZF0a~M-0^(F%&%dk@p{cB_Pjqd zPq1027rWLHy*-qyjYc4eVh*q*=8`F&Xa@!&(k#iqBoHC*@@6Bw4oNRj@Y9@hD$|yQc z6YK7`5A$-kZES5Hm6zUR=#%nS+)-hX(N}!+#T25VeY70bdo8nR>LTJ SR;~7L3S(t*oSC_I>*xo?`k`?E delta 51 zcmbO(aD#J#)Z`6RdiZRoNl| D1M3pr diff --git a/app/soapbox/features/filters/index.js b/app/soapbox/features/filters/index.js index 0d603347a467d4e0944526305802fc17373c8967..c1a2a66f9d2d5aa4f09b94f4d724833a2fb3ac1d 100644 GIT binary patch literal 10860 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 delta 699 zcmah`O=}ZT6lIdA?GQsW-?g^4RG0>1l1XZ5qX`J2C`}jI;!1|snHOj1WZpRQ##BO3 zSFT*>-75uufH?RY1Vu0_w}QA3-AEULxNtIwUn}40-Sf^p_nz~6hG7 zBezGbK8g>8qRK2DY}|l;Fk*Cc)};zJy3{l*+JFu*T{;?%YjKzXuoyQwhDx}>Ecfqc z7M~La{{8qz0be9icqcJcnP``wr!$i(y})=0=&o%z)Kv(F0W^W@hFf+y;q(liOfJs< zrw9AVS$v$_!Q_z~UOoB_*Hf4AQ)(-s%Xm1w5LXnUX{RjOlUgDUbEWe^sRU)c?< z+4yaK0dK<6>2CPH|EvPQtaV1THgjmRAI7E=OEc*&aDaR8K-?zkj%O<>({Q+$#kVJt UnLiMfTK%zs0SZew{9L^E6No?M#Q*>R diff --git a/app/soapbox/features/forms/index.js b/app/soapbox/features/forms/index.js index 471a173f8672d1f23ffbcc68dc53c812d25f4f6f..e4f7a955a2b0e3ebca4a6330253ed1f676aef470 100644 GIT binary patch delta 77 zcmdn0y+vok8D^G@%)FA#rObvaJT|%@c8F1OWD@7|Q?v delta 55 zcmV-70LcHeEVV1J%mb5}4hpl}17iV`#sUzNgau8LVhb9Rhz${wtOE+O9tJxNlXDYE Nv%(V~0kiHDMgcsH6BGad diff --git a/app/styles/application.scss b/app/styles/application.scss index b040685c9e..79ba867276 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -72,3 +72,4 @@ @import 'components/video-player'; @import 'components/audio-player'; @import 'components/profile_hover_card'; +@import 'components/filters'; diff --git a/app/styles/components/filters.scss b/app/styles/components/filters.scss new file mode 100644 index 0000000000..9b99437f2f --- /dev/null +++ b/app/styles/components/filters.scss @@ -0,0 +1,72 @@ +.filter-settings-panel { + h1 { + font-size: 18px; + line-height: 1.25; + color: var(--primary-text-color); + font-weight: 400; + margin: 20px auto; + } + + .item-list article { + border-bottom: 1px solid var(--primary-text-color--faint); + + &:last-child { + border-bottom: 0; + } + + } + + .filter__container { + padding: 20px; + display: flex; + justify-content: space-between; + font-size: 14px; + + .filter__phrase, .filter__contexts, .filter__details { + padding: 5px 0; + } + + span.filter__list-label { + padding-right: 5px; + color: var(--primary-text-color--faint); + } + + span.filter__list-value span { + padding-right: 5px; + text-transform: capitalize; + + &::after { + content: ','; + } + + &:last-of-type { + &::after { + content: ''; + } + } + } + + .filter__delete { + display: flex; + margin: 10px; + align-items: baseline; + cursor: pointer; + height: 20px; + + span.filter__delete-label { + color: var(--primary-text-color--faint); + font-size: 14px; + font-weight: 800; + } + + .filter__delete-icon { + background: none; + color: var(--primary-text-color--faint); + padding: 0 5px; + margin: 0 auto; + font-size: 16px; + } + } + + } +} From ab3f53cb270f991675a1725d9b0ddc6466fb126a Mon Sep 17 00:00:00 2001 From: Mary Kate Date: Tue, 4 Aug 2020 21:57:54 -0500 Subject: [PATCH 3/3] styles on filter form --- app/soapbox/features/filters/index.js | Bin 10860 -> 11165 bytes app/styles/components/filters.scss | 27 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/app/soapbox/features/filters/index.js b/app/soapbox/features/filters/index.js index c1a2a66f9d2d5aa4f09b94f4d724833a2fb3ac1d..60b406a8237ae6d15d778e03de2c8f5d7b638064 100644 GIT binary patch delta 347 zcmaD8GBJ_~al_*~$N9MJJzA5faGED<~~dD9sXh~z5aY-7Y<`+;7WRJcKOpO?ueoAJU9oJ+ZdAZHYWRCFy02^9# AWB>pF delta 246 zcmbOm{w8EYsmSE(viy_RizrUsAgw(4tBA~GVNvPH2BLD414I=j>r07FZWonh(YNE` zn*3VS2&~9OOlI;bd8Ns1Vv3Vji>Xb%DrO8;s3