From 4ed4547f4a14aa912054edcb8ee669c3eceae9fc Mon Sep 17 00:00:00 2001 From: Marie Date: Sat, 3 Aug 2024 22:45:49 +0000 Subject: [PATCH 1/7] upd: add icon for moving files/folders --- .../sharkey-icons/custom-sharkey-icons.svg | 3 ++- .../sharkey-icons/custom-sharkey-icons.ttf | Bin 1896 -> 2180 bytes .../sharkey-icons/custom-sharkey-icons.woff | Bin 1292 -> 1520 bytes .../assets/fonts/sharkey-icons/style.css | 4 ++++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg b/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg index 9d21137072..777fe5ab05 100644 --- a/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg +++ b/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg @@ -7,5 +7,6 @@ - + + diff --git a/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.ttf b/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.ttf index a2601e0f1b00c4f2e72249911b911e48c55d6de1..e48ffbdf738227d81b408fa91500cfd0b1b673cc 100644 GIT binary patch delta 887 zcmYLITS${(7=GXH^zYy{Z3i``Qx_f(oo>z`+d*%)q1NW0|)>XxCtCa zB9V*d?r)pE02mVFb@%t3jX(nw5g#C4IefwAAO1FZ0|3W~kH(VG74d=35Z@ykT!^Mu zj*qDm7{U}cEG%!#Z$Ald0q`mS_8<|D&egtAHi~^DYfmKNnWzvSCgZcOw}JqYHo#g}Qt7p$x;ria?H9!d za>LPpcmKR9pSE@V1T!Nyz~^_fJNZ@RfK3;8nk$&m!#L3p!^7i4XvX))N0gL3ANulz z`IT@ZxytoDY{HoS12ZV~tL%|B3j25-VAsv>VTMCF*zf?KQF04R1K5@3bn^-f1%jb! zXLZo)bdS zNk1rz}ihRC;dYmMgT!S>MK?;)41Zn+}d~6F4 z>LByemH44ex2pzYpsAzD-{NlreNcw=O%)T_`_?O&=M0IFHo}l0Mc delta 582 zcmYLG%}Z2K6#t$3zNW@fLt5xy2E*WBQ{ywTFL0n5!HS6#vl8?-VtC%fgk$jsmwc>@9cAJ^t zBPn#!WtM&3N~y3=1I*8WI$tS=)yeO_CIEYv{^i5w*xwd@3>N!o$k-Cyuu}CbzC_PW^hqkh7UD7;VVnAE4ou7=REC+egBAKQ5n%(1 zSdFmBI|mWAa8j;B*v7CdponJ(QAHU6G6?l!`+e^?(I{N*F0zaW yK|io_T02EidQhDj;8(B^B}xn{^u4ERPOut=Yo!f#n~M#Ispn&fuK)9E?EeK-t#9uD diff --git a/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.woff b/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.woff index d9f471fa35a861eb745fb136094ffd9c90b7922f..2ac8730e3e83adc2dc0b1c9de10f631e9a3bb9e6 100644 GIT binary patch delta 1329 zcmYk5c~H|w6vy|M01^m-fE2=EM2v`ngIWbG4ipH893pa<0nI_e6$o-hw1gvpf^j&5 z!6YIgh&Tu>rH#rZBoHHqsFcA-<+5s}3JMfjkZ$~=)1CRu&iDJ?UT@y=b>?)9(*uY^ zfB-l&=YXDi*5;NN+a3{B=)Csw@FW6&_(Id_3p)WeAZX8C=rN&ohlB*ohJQzkrzAqJ z8EPLm`)H_2GVmOfBLJuy6}Mak(R4~A02)p(ZVx#?=+n}Vh9>l)p|*h7XlS4`qvKQ9 z(BneA31X}TfCrOBQ|Aex-lztt2mSFBHat(G9%}Wy@ZcDrB~aq&&{IJD37+dn_39RU zoybZ~fe&kg=6;Cx{Ek8swwOjHlOsXSZB|5j)*G+T(z>2#5GvK)0yETwz(PzQD5%gt zvy6+L$V?#3k*+xmLgph#qO2zGoDY5L!d18V=a>DJZ8#Fy8bBYbToRS-sHN966 z84`FFNw9DZ3D1}rtTtS~Mh&tfw$uy{p07E#?|b~E{o*dn$HzMNavm4rY}}8`;FQ*! zCe*ZCnPOhovt2tkQBSL2f-w2e;<^Lg{P;#gr-#Jp@$q@vN4+%*c*{#enbJ(-MOFv@ zIc0hBmc7&cj7U3D)L1QZ@j*jD<>z|Af!`c|_BT)ZD|1?Ii5YrHTI{`DCGkHP)Vr5! z;K<6`bivIi1wHOw?~@l}eezi1zT|rtPFXC;?_yj22>Ufd;r{TGFx#vrC-%8^*qXG)Pc46Vl zuG+);AE<+^2>bI?%rPYn!{8o|Gbz53GV->wFipJNQchtHmOddR*7O`7R9O-oIEO}` z6CEsiO70HP7fiQS>5go7Jn4CAF}TyBKE!l^jJ8XbBnj{2=AE;!aWO5IuX+=XN++}q zHYy)3;FwohZ4*559~@x1wep@O4K&Lls=U9Nm>m0u?kk#ocQ7`{S14avns$gX7d5>S zMJcUq_)AMW9|#Ybrlrl+O>uuUj%{HC z8Kz@SU49f07E!Nll*D&7;oEDp^U%$f!88+k|Gu@|zH{+irfZs&`JvBX^QhZ1l1v6u zJ3G@=y`NMU=o1Vo$X2)Mw&7J@EI%}R{|0mz4!8?-cwh3%O3~XmS|>^YauR-o|BVpP zkDT~#M>5TuOlAOtfM-O40_Ut1EWl=gCUv~F=!aO8n?YXZNKmnjR%+22#gq!}Z;(Q*HAa_<=IcE(w!Cke|9`nn)=G#TR!5y0xtMbka(x2TIqRr>yc02QCc(S{> ztJ2rk1%@Gi+ZTOoW6|%`>WfIKw#T|_qf+Z3zZfQ^cCuR@O2wW?8?LLA2ZxPRr*;gt zv`H5(vcgswHDBsXb=Bfy-(>0SR>~AIMZcn(BrXXnA1D!>3KvUAF$zINRaq&iTy&;F K2V|~ee*70FWFaO1 delta 1095 zcmeys-NPkP?(gQtz{mgutUL_7Aeud6qKJmwOsR{j-CbPW7#J9RfP!*htjWObAFOW# z6w3kfoq;&a|3XYna&BS)P;3K`?+K*6Sgua2QmAK)0fnpPYd>J5CVPRon&B!gO0E(>v@&$odh>d|kJ10LGr0xKa&jZF`3}gnNR_Di-H@s-S-1o2LB16m`PHmtHP(XmJ5d&f-Adi`WWpVM4_do4E?`MaH!4 z(|wQZdgLeSdUg4_AotUe|1=MoSm$@l+kVUG%66UlcZsEW@1j4=-hX3~MHd4DC=yc= z5*Qw}o|9B8{P@Q#UUJ7w35N#{w=A}wn31c-c5Jo7tY$_XUIw#Rt_zb>Sv2a?5`a;2 zodKA55dfH$pe7}xawI0CF)*qrq@^%)S~mRTVc@o8SOl_ZY5!SZJc_jLe<|OwOIt7I ztXG$TVrREg?2gym9Cu3=s$-~L z7i14lssDX~d0nKt+@w!}l}E1Jag{61oTu!+WdF%bH}Rmf+EtGkx7)bNeex2mR5_pi z#L)bi;is0Fl?xwuICnp95Po|@;6`xKrQMhIFQ4XDm=jfBa5hi)+tZVwt?QTm6a4Wo z=3CY6`;BY=Oq=7v9WA!%Ki{Xf^Sn<_DPI-xbphMHyy0b_SH|AB&o<4bJo4Qq zlki7p?uHw&)rRjqn>8;_IxICqEB>~Q=lR@^tm!M#LFpe9GD!|>Jv=WOM0HLbIdSB~ bnW#AvBc`04H#;(B&fF+Y2G!}TwhRma`(UT$ diff --git a/packages/backend/assets/fonts/sharkey-icons/style.css b/packages/backend/assets/fonts/sharkey-icons/style.css index 7fb0f94504..4cae7787d4 100644 --- a/packages/backend/assets/fonts/sharkey-icons/style.css +++ b/packages/backend/assets/fonts/sharkey-icons/style.css @@ -29,3 +29,7 @@ .sk-icons.sk-misskey:before { content: "\62"; } + +.sk-icons.sk-foldermove:before { + content: "\63"; +} From 9d4d2a1fad27abe853b90cb4bab5ba9ea331fe23 Mon Sep 17 00:00:00 2001 From: Marie Date: Tue, 6 Aug 2024 15:35:52 +0000 Subject: [PATCH 2/7] upd: align font with new repo --- .../sharkey-icons/custom-sharkey-icons.svg | 12 -- .../sharkey-icons/custom-sharkey-icons.ttf | Bin 2180 -> 0 bytes .../sharkey-icons/custom-sharkey-icons.woff | Bin 1520 -> 0 bytes .../assets/fonts/sharkey-icons/shark-font.svg | 30 +++++ .../assets/fonts/sharkey-icons/shark-font.ttf | Bin 0 -> 2652 bytes .../fonts/sharkey-icons/shark-font.woff | Bin 0 -> 1736 bytes .../assets/fonts/sharkey-icons/style.css | 117 +++++++++++++++--- 7 files changed, 128 insertions(+), 31 deletions(-) delete mode 100644 packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg delete mode 100644 packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.ttf delete mode 100644 packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.woff create mode 100644 packages/backend/assets/fonts/sharkey-icons/shark-font.svg create mode 100644 packages/backend/assets/fonts/sharkey-icons/shark-font.ttf create mode 100644 packages/backend/assets/fonts/sharkey-icons/shark-font.woff diff --git a/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg b/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg deleted file mode 100644 index 777fe5ab05..0000000000 --- a/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.ttf b/packages/backend/assets/fonts/sharkey-icons/custom-sharkey-icons.ttf deleted file mode 100644 index e48ffbdf738227d81b408fa91500cfd0b1b673cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2180 zcmdT`O>7%Q6n<}Jf1I`B-P&INBzEH3)JeS9N!GPp`j<#FZfQV`C`}73ZC%&-p>Z79 zE@}@54iqF#9B4t}hCqN2RWJNVNE{FXAypLzass4^3ml4250yYj4R6+)HbQ`kI5G0f zeDA&Q&Ahj>`^JC(&R~z+H zpIs~h$h1EjUum{GH-}yd1E{}}eIJP2sK4_2C$SUy&RgJRqyYHgn^UiDm~{rYO0oyK zX2-|TNHG36>4~W?KAp$DVU%~PFdEE0LU?o}0e`(?6NRyKQocKC^58nf1WmTA$ipW3M8GY&oO zTYAXAr!HzezO!HV_s6p)wX72>z%;#gAHY_45Do&AQ$v}QYKByWV$STst>sd=RImrx z02XYDxnNVI;RN0xWK>1?6p1KoA=QsGIRtlsPg91ZVIa^S3kJNtfL9v`PB5-YiZ&Tc zXr%B31ATqL0Q&tunE_olB4NWY0#;r(3|$PbB^1RXLLk_8BV-sJ9-ii0(x$`QW9a6M zuEp~E6ITo)5^=l?L))ZBFGLKn+=ZwpAapJ<(D52xrt=wt697R)HRC*iyj0L?ET83h_$i;?~km+(nPYR4D04cmj80c{j@x z^W>%O4{}3CJbL@BB$ImO4?mK;663NaA3l$Ws2{sL0R$#W4+U8S>Hct+j6hOn9?KvB6}sCh;u$_Bu~mcsu^XR zUtWC#@umJE_2Iz13c9E+@zHWB+*zI@$G$M0`tk3x8J{D^Lgz%r1a+_u6X#y(p;dA-?W& z0q29Fsj<*&hT0j9&hlauC6pR3^VXoJC_^d*sL-f0Appq9L(CzyWjAe0!|2pt0OYM; zjtOKxp%1MV22JRNL9Gihl9!iL2#Zc&LN62QjgU=f034ziL9#p+)T%O&2GAc(Wx{#o z8=#i0*#H~`K{3>5I`o84f0WHl>n{B=mJy!->(U0jeGt;ZjyxQb9Ymo}fdg-wme}km^DlHwlJ@fBcer!rSk60F4fuq zyzSdyBU=$bV9n*2Y#UEk##3AM@v$Mk+guZ;l|zWZJ0;@xh8OAer9Z)8kn{lK>P7{J z$@D^XC#(3z6$R27!bdz$Au+nvz5!=v2CFrsRWvVSVoS~N;JKPJmfsj$+Q;T$79T6! zPk)?;H?sd~1}`$aBR4G&CFs=mY*);PRYB)Y5GEh$UN<$+@le&UdPtleA79w{sJBL9 zpm%8~g`2WziP4e&g1Rz!)5Pk**RIV+`hsYx+f#IJh%V9ETB$s;-Q3&p_>xbjZiBCugn}}T=ftsYXJntzHL}qv z5v-92N4OK{15Kib5`5Iv)}1j9IbHjs>{_#)#tk&{11m{iOiYgbL3gQ`dv_qh%Y`La zUY<4$)v37ix*}9$Xq3OaysL|KP%9~Eu6`=>xpw48zzuZlqn%mq-J#DG!~@!4>+d|T zwGafX(J}oHFOAcf<5wQJ`v*2CYR2VT4fM|=YOpV8seqvP9DS@9Al|SY{}aBTA364S@4(IrBEj7c5Q0HSFvzt|UBv=y zD!3ziURUs4gq)pvcISv!p%JH+)LKZ)Y-dO2^$<9T#ub^Vx;ds(CUcyuy@gJ~L$8aT z&|gMv{#rdi>u2$WPh%Y9_NwivgL&pp`8F}kBQIyuhWOe+iIq%V=~=hKo7Mx_#yYtc zxq&<0pX&3P`ijBjmoqyw)VMzMsjZqz&VsZu)uAoh?$TW;P6M9r-F~@7OlY(hueOK( z_^$a@L9b88#-+;alY{hU4_GLjg~&bDSu + + + + + + + + + + + + + + + diff --git a/packages/backend/assets/fonts/sharkey-icons/shark-font.ttf b/packages/backend/assets/fonts/sharkey-icons/shark-font.ttf new file mode 100644 index 0000000000000000000000000000000000000000..0fdf04df082cc5724a7c94b19b299cfd5a317040 GIT binary patch literal 2652 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 literal 0 HcmV?d00001 diff --git a/packages/backend/assets/fonts/sharkey-icons/style.css b/packages/backend/assets/fonts/sharkey-icons/style.css index 4cae7787d4..593337e992 100644 --- a/packages/backend/assets/fonts/sharkey-icons/style.css +++ b/packages/backend/assets/fonts/sharkey-icons/style.css @@ -1,35 +1,114 @@ -@charset "UTF-8"; - @font-face { - font-family: "custom-sharkey-icons"; - src: url("./custom-sharkey-icons.woff") format("woff"), - url("./custom-sharkey-icons.ttf") format("truetype"), - url("./custom-sharkey-icons.svg#custom-sharkey-icons") format("svg"); - font-weight: normal; + font-display: auto; + font-family: "shark-font"; font-style: normal; - font-display: block; + font-weight: normal; + + src: url("./shark-font.woff") format("woff"), url("./shark-font.ttf") format("truetype"), url("./shark-font.svg#shark-font") format("svg"); } .sk-icons { - font-family: "custom-sharkey-icons" !important; - font-style: normal; + display: inline-block; + font-family: "shark-font"; font-weight: normal; + font-style: normal; font-variant: normal; - text-transform: none; + text-rendering: auto; line-height: 1; - speak: none; - -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; } -.sk-icons.sk-shark:before { - content: "\61"; +.sk-icons-lg { + font-size: 1.33333em; + line-height: 0.75em; + vertical-align: -0.0667em; } -.sk-icons.sk-misskey:before { - content: "\62"; +.sk-icons-xs { + font-size: 0.75em; } -.sk-icons.sk-foldermove:before { - content: "\63"; +.sk-icons-sm { + font-size: 0.875em; } + +.sk-icons-1x { + font-size: 1em; +} + +.sk-icons-2x { + font-size: 2em; +} + +.sk-icons-3x { + font-size: 3em; +} + +.sk-icons-4x { + font-size: 4em; +} + +.sk-icons-5x { + font-size: 5em; +} + +.sk-icons-6x { + font-size: 6em; +} + +.sk-icons-7x { + font-size: 7em; +} + +.sk-icons-8x { + font-size: 8em; +} + +.sk-icons-9x { + font-size: 9em; +} + +.sk-icons-10x { + font-size: 10em; +} + +.sk-icons-fw { + text-align: center; + width: 1.25em; +} + +.sk-icons-border { + border: solid 0.08em #eee; + border-radius: 0.1em; + padding: 0.2em 0.25em 0.15em; +} + +.sk-icons-pull-left { + float: left; +} + +.sk-icons-pull-right { + float: right; +} + +.sk-icons.sk-icons-pull-left { + margin-right: 0.3em; +} + +.sk-icons.sk-icons-pull-right { + margin-left: 0.3em; +} + + +.sk-icons.sk-foldermove::before { + content: "\ea01"; +} + +.sk-icons.sk-misskey::before { + content: "\ea02"; +} + +.sk-icons.sk-shark::before { + content: "\ea03"; +} \ No newline at end of file From 6d7cebb61c506c155da8ca30a97a263dbe7798ba Mon Sep 17 00:00:00 2001 From: Marie Date: Tue, 6 Aug 2024 15:39:19 +0000 Subject: [PATCH 3/7] chore: add icon font to contributing --- CONTRIBUTING.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2acacd6dfa..1999828755 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -94,6 +94,12 @@ The owner [@syuilo](https://github.com/syuilo) merges the PR into the develop br If your language is not listed in Crowdin, please open an issue. +## Icon Font (Shark Font) +Sharkey has its own Icon Font called Shark Font which can be found at https://activitypub.software/TransFem-org/shark-font +Build Instructions can all be found over there in the `README`. + +If you have an Icon Suggestion or want to add an Icon please open an issue over at that repo. + ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg) ## Development From 45611e504c074fbb9cbcffc4dffc042967aeedf2 Mon Sep 17 00:00:00 2001 From: Marie Date: Tue, 6 Aug 2024 15:43:15 +0000 Subject: [PATCH 4/7] chore: fix positioning in contributing --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1999828755..f75fbd05fd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -94,13 +94,13 @@ The owner [@syuilo](https://github.com/syuilo) merges the PR into the develop br If your language is not listed in Crowdin, please open an issue. +![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg) + ## Icon Font (Shark Font) Sharkey has its own Icon Font called Shark Font which can be found at https://activitypub.software/TransFem-org/shark-font Build Instructions can all be found over there in the `README`. -If you have an Icon Suggestion or want to add an Icon please open an issue over at that repo. - -![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg) +If you have an Icon Suggestion or want to add an Icon please open an issue/merge request over at that repo. ## Development During development, it is useful to use the From d79880987506f4cfb8b69c8134fc5beb6083e42c Mon Sep 17 00:00:00 2001 From: Marie Date: Tue, 6 Aug 2024 15:54:18 +0000 Subject: [PATCH 5/7] upd: add back in timestamps on src --- packages/backend/assets/fonts/sharkey-icons/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend/assets/fonts/sharkey-icons/style.css b/packages/backend/assets/fonts/sharkey-icons/style.css index 593337e992..7168702e5a 100644 --- a/packages/backend/assets/fonts/sharkey-icons/style.css +++ b/packages/backend/assets/fonts/sharkey-icons/style.css @@ -4,7 +4,7 @@ font-style: normal; font-weight: normal; - src: url("./shark-font.woff") format("woff"), url("./shark-font.ttf") format("truetype"), url("./shark-font.svg#shark-font") format("svg"); + src: url("./shark-font.woff?1722899913909") format("woff"), url("./shark-font.ttf?1722899913909") format("truetype"), url("./shark-font.svg?1722899913909#shark-font") format("svg"); } .sk-icons { From 1033436349371f2bf4d0eda9da5794030a9ab7b2 Mon Sep 17 00:00:00 2001 From: Marie Date: Tue, 6 Aug 2024 15:58:56 +0000 Subject: [PATCH 6/7] chore: add note about updating css and font files --- CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f75fbd05fd..d7aaa4f555 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -102,6 +102,10 @@ Build Instructions can all be found over there in the `README`. If you have an Icon Suggestion or want to add an Icon please open an issue/merge request over at that repo. +When Updating the Font make sure to copy **all generated files** from the `dest` folder into `packages/backend/assets/fonts/sharkey-icons` + +For the CSS simply copy the file content and replace the old content in `style.css` and for the WOFF, TTF and SVG simply replace them. + ## Development During development, it is useful to use the From e82cc99528f7c9fe9e8e8c82d02a8240b46d6a77 Mon Sep 17 00:00:00 2001 From: Marie Date: Tue, 6 Aug 2024 15:59:24 +0000 Subject: [PATCH 7/7] chore: remove space --- CONTRIBUTING.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d7aaa4f555..053fffcaeb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -103,7 +103,6 @@ Build Instructions can all be found over there in the `README`. If you have an Icon Suggestion or want to add an Icon please open an issue/merge request over at that repo. When Updating the Font make sure to copy **all generated files** from the `dest` folder into `packages/backend/assets/fonts/sharkey-icons` - For the CSS simply copy the file content and replace the old content in `style.css` and for the WOFF, TTF and SVG simply replace them. ## Development