From 3ff29b39bf30f35cdccd2361dd2cd867e17f82c1 Mon Sep 17 00:00:00 2001 From: Matt Mascarenhas Date: Wed, 21 Jun 2017 20:38:57 +0100 Subject: [PATCH] Namespace everything --- hmml_to_html/{style.css => cinera.css} | 0 hmml_to_html/{player.js => cinera.js} | 0 .../{default.css => cinera__default.css} | 0 .../{hmdshow.css => cinera__hdmshow.css} | 0 hmml_to_html/{hero.css => cinera__hero.css} | 0 hmml_to_html/{obbg.css => cinera__obbg.css} | 0 hmml_to_html/{riscy.css => cinera__riscy.css} | 0 hmml_to_html/cinera_icon_filter.png | Bin 0 -> 1688 bytes hmml_to_html/cinera_icon_patreon.png | Bin 0 -> 987 bytes .../{topics.css => cinera_topics.css} | 3 +++ hmml_to_html/hmml_to_html.c | 20 +++++++++--------- 11 files changed, 13 insertions(+), 10 deletions(-) rename hmml_to_html/{style.css => cinera.css} (100%) rename hmml_to_html/{player.js => cinera.js} (100%) rename hmml_to_html/{default.css => cinera__default.css} (100%) rename hmml_to_html/{hmdshow.css => cinera__hdmshow.css} (100%) rename hmml_to_html/{hero.css => cinera__hero.css} (100%) rename hmml_to_html/{obbg.css => cinera__obbg.css} (100%) rename hmml_to_html/{riscy.css => cinera__riscy.css} (100%) create mode 100644 hmml_to_html/cinera_icon_filter.png create mode 100644 hmml_to_html/cinera_icon_patreon.png rename hmml_to_html/{topics.css => cinera_topics.css} (88%) diff --git a/hmml_to_html/style.css b/hmml_to_html/cinera.css similarity index 100% rename from hmml_to_html/style.css rename to hmml_to_html/cinera.css diff --git a/hmml_to_html/player.js b/hmml_to_html/cinera.js similarity index 100% rename from hmml_to_html/player.js rename to hmml_to_html/cinera.js diff --git a/hmml_to_html/default.css b/hmml_to_html/cinera__default.css similarity index 100% rename from hmml_to_html/default.css rename to hmml_to_html/cinera__default.css diff --git a/hmml_to_html/hmdshow.css b/hmml_to_html/cinera__hdmshow.css similarity index 100% rename from hmml_to_html/hmdshow.css rename to hmml_to_html/cinera__hdmshow.css diff --git a/hmml_to_html/hero.css b/hmml_to_html/cinera__hero.css similarity index 100% rename from hmml_to_html/hero.css rename to hmml_to_html/cinera__hero.css diff --git a/hmml_to_html/obbg.css b/hmml_to_html/cinera__obbg.css similarity index 100% rename from hmml_to_html/obbg.css rename to hmml_to_html/cinera__obbg.css diff --git a/hmml_to_html/riscy.css b/hmml_to_html/cinera__riscy.css similarity index 100% rename from hmml_to_html/riscy.css rename to hmml_to_html/cinera__riscy.css diff --git a/hmml_to_html/cinera_icon_filter.png b/hmml_to_html/cinera_icon_filter.png new file mode 100644 index 0000000000000000000000000000000000000000..6d255273daa95c6d756f39aa2890b149e7302d3e GIT binary patch literal 1688 zcmV;J250$+P)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 zVoOIv|NsC0|NjYC_uK#g00(qQO+^Rc1q~1$0hA`06951OoJmAMR7l5-m3>gvRT{@X zzn6RA5*G>)l#*mOP%*7=Dhyl7UTn)9qOpR8Tq-Mqa3T>HF2yu!hIc42cNlb&C7sPQ zCu^#a^lDPUx+-eEt$J1Rg7R`fg8TBjufNkDNI5k-?(@%io-=38=X>Uv?|CGy5oOK! z4dUxb*0}6IGjWAQ2`;UlhzE-k>%B{Hq_id4yg7s+;dSjr61%b|F7R%p*VcI5zx_{A z)6%3A_3V>Q^i}+?`=#G*Jk(k06hf-G{&e_uj#li63wth*UYnb+UfYRkDxWmbYXeBy zS}l;H~ZYN7DH|zjeOS+Bfs26tQBQCyyty z{#1LHcuA_!w#QDTwWZfv7FopXx^~azh<~7(%DtV2d;tGE#Q_j*mQ(=wc@Y9Iwuh4e z)TZDT0454Q&8BjmRi5!A)V0fbYLfO%OK@%fMVB60ZfI#0)V*1ssa$slqvyKpZ*AdX-B95Kzb~6h#-KxP_qIk7AL@8Wv}z4 z#UIG6@@?L~oXi@du0oFNXx^pAPO=VfiOwOjHg~u`+5~Vp)x36Wja~~dd?9KLz(}j{ zM!*tqE18Vg-G)?s84kP0loyBwEXYg`&H+#@mns01>WgLoby4qKz&+~HK6`DhcrxwH z`X!UBs&7a1hM>E!DDX-sRqZ#KwFwdFat~-1jSbuZ!9S}F0BqnebY(~3o6G4%v#bX< zAD5;dGIMb3E&7hcI=v{PgphHegKgQU>ZfP#Olbopz0U%mG+f>U#7J9Q$)<9ilSZ_; zg)U%6S?_LJ0ep4CV1p1SpU0183LzDLQsw)P5Rr2?DPf1Go_uocqq--fl~fhHM2Ae82a&c5Vt#qs08d z0s1;w0O$d^YpmObId(TZ;Ga5>X1PgOq}8Dm0BU{9kbr7d{l9o%ctTQV4Uil&K`}$hN64UT=&tL^26ax?8vurZGot{;zN7a8M1Hq#SL#YQb!pM)wOiomD0&Yv zUiDd%8oSd|SBm0}!&ADs< z!|kU|02puh;RW6X)80<|wqqE2o+tD7LN=Uhx*sx1eq1*>54IicHYDs5$-F&yXWZ_< zY|vt_zuPqc;R7)l!!aNZm^ThDvo)%~{(%K8O`z-?{q9W((tsbW(~=f{a1iY7J7zee0i35UXG7{r^E-hvKpWpmUjPK`>Qn%q(Obz`h-&g% zM7&mST<@C}q(xly728iP__*>OQ1gGsHkR;9b1VsPKts>x-%_D07 z(tN`|0Nj!}(g1MtqR}8gVsIn}AnvTY6d)$YI|vZv(AGdzR@$^RC9tYP{#8IA*V$y9 z5Ax}OyEiTYWxw-N0Qp|uI*?|Bwj;pg35^0MOLZ$i=zX~Yz+0`x0=Tvs^8sAXM!g0w z`dQQjfRQfK-(cesr>r)Cb^bW@DgiT3AKEKcfbY^^W8q|w20Z4fED)<{)#}w3gC7G# zw1=kvC|72Heq|;E<|*9(-cG|a0Pf|+V$kZ{QiLC>vIZ-aQ7D|8mHO^6_;nbm{4S=& zxsF^paAXy5{=e|yNau!0z0Jw=(^8mk;}l==z3oX zK#O?gNaj2&XI(|$089^jx&0^iba{vGUC3HntbYx+4WjbSWWnpw>05UK!H!UzV zEip4xF*Z6gFgh?XD=;xSFfcWTr~d!|03~!qSaf7zbY(hiZ)9m^c>ppnF*hwRH7zkS iR53O>GcYM literal 0 HcmV?d00001 diff --git a/hmml_to_html/cinera_icon_patreon.png b/hmml_to_html/cinera_icon_patreon.png new file mode 100644 index 0000000000000000000000000000000000000000..f4681c43b92bdd414458696c3307ee66692abd14 GIT binary patch literal 987 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>uN@Ck7RDtP85HHv5y z0{{R2m%VH10Sx7mk|4ie2J3~7{{4M0*OYJB|G!V4{rxwWi|_Q)bRm)4mxnl)9TS!~ zH`Dt6Q|8#Ei^CZu-~82In7)1qW9gJfe}!TLWdC1%x^xD^r;qnGOk@1~@xPbi|4Y*u zs{0$Jd&z(JqiHUGZGtBQqeAtE9c=$Ueg6Mv!sjb1KVItB?3sAn6lgzVlDE4{>58lw zzkwX~5>H=O_J=HdOwt;&r?6B3g)Vx!IEF}EPEKH8a#Kqa3o|R@W8--6y^~3s9QW%yQ+Ti zu&K83WVxw2B;*`Qh)Oz^ke7HeA(V;j8jsnwG9I08JUn~?jP7je>Edld;cRT?9Szpa z?aRd{HEic^UO(U7>43Gu1jQ995?TU6ujIr|2*?RavWj-FS?Z{5Q|V*W5|}?>#*{fh zlV-6Adz?RUM(gA`#!r$(pCu$d6&DwCb9Hw){$j9Hwpi5jX{JBWbE+k-5hW>!C8<`) zMX5lF!N|bST-U%<*T^))(9Fuj#LB=x+rSV=Zr0YmgrXrgKP5A*5~{&O*U%)yz{twT z+{y&1!AL^45~x8EWJ7R%T1k0gQ7VIDN`6wRf@f}GdTLN=VoGJ<$y8vDV_@)f^>bP0 Hl+XkKz4dbJ literal 0 HcmV?d00001 diff --git a/hmml_to_html/topics.css b/hmml_to_html/cinera_topics.css similarity index 88% rename from hmml_to_html/topics.css rename to hmml_to_html/cinera_topics.css index 0115e01..14dc270 100644 --- a/hmml_to_html/topics.css +++ b/hmml_to_html/cinera_topics.css @@ -17,3 +17,6 @@ .marker .content .categories .category.inventory { border-color: hsl(278, 32%, 26%); background: hsl(278, 32%, 26%); } .marker .content .categories .category.font { border-color: hsl(161, 4%, 26%); background: hsl(161, 4%, 26%); } .marker .content .categories .category.mathematics { border-color: hsl(308, 4%, 26%); background: hsl(308, 4%, 26%); } +.category.inventory { border: 1px solid hsl(111, 79%, 26%); background: hsl(111, 79%, 26%); } +.category.hardware { border: 1px solid hsl(284, 94%, 26%); background: hsl(284, 94%, 26%); } +.category.math { border: 1px solid hsl(185, 74%, 26%); background: hsl(185, 74%, 26%); } diff --git a/hmml_to_html/hmml_to_html.c b/hmml_to_html/hmml_to_html.c index 03dfcbe..e602a79 100644 --- a/hmml_to_html/hmml_to_html.c +++ b/hmml_to_html/hmml_to_html.c @@ -71,12 +71,12 @@ typedef struct // TODO(matt): Parse this stuff out of a config file char *Credentials[ ][5] = { - { "Miblo", "Matt Mascarenhas", "http://miblodelcarpio.co.uk", "patreon_logo.png", "https://patreon.com/miblo"}, - { "miotatsu", "Mio Iwakura", "http://riscy.tv/", "patreon_logo.png", "https://patreon.com/miotatsu"}, + { "Miblo", "Matt Mascarenhas", "http://miblodelcarpio.co.uk", "cinera_icon_patreon.png", "https://patreon.com/miblo"}, + { "miotatsu", "Mio Iwakura", "http://riscy.tv/", "cinera_icon_patreon.png", "https://patreon.com/miotatsu"}, { "nothings", "Sean Barrett", "https://nothings.org/", "", ""}, - { "cmuratori", "Casey Muratori", "https://handmadehero.org", "patreon_logo.png", "https://patreon.com/cmuratori"}, + { "cmuratori", "Casey Muratori", "https://handmadehero.org", "cinera_icon_patreon.png", "https://patreon.com/cmuratori"}, { "fierydrake", "Mike Tunnicliffe", "", "", ""}, - { "abnercoimbre", "Abner Coimbre", "https://handmade.network/m/abnercoimbre", "patreon_logo.png", "https://patreon.com/handmade_dev"}, + { "abnercoimbre", "Abner Coimbre", "https://handmade.network/m/abnercoimbre", "cinera_icon_patreon.png", "https://patreon.com/handmade_dev"}, }; #define EDITION EDITION_SINGLE @@ -854,7 +854,7 @@ GenerateTopicColours(buffer *Colour, char *Topic) FILE *TopicsFile; char *TopicsBuffer; // TODO(matt): Consider (optionally) pulling this path from the config - if((TopicsFile = fopen("topics.css", "a+"))) + if((TopicsFile = fopen("cinera_topics.css", "a+"))) { fseek(TopicsFile, 0, SEEK_END); int TopicsLength = ftell(TopicsFile); @@ -1863,7 +1863,7 @@ ReferencesArray[i].Identifier[j].Timecode); CopyStringToBuffer(&FilterMenu, "
\n" -" \n" +" \n" "
\n" "
Filter mode:
\n" "
\n"); @@ -2185,10 +2185,10 @@ CategoryMedium[j][2] CopyStringToBuffer(&Header, "\n" // TODO(matt): Add the full name of the project, parsed from a config "\n" " \n" -" \n" -" \n" -" \n" -" ", +" \n" +" \n" +" \n" +" ", HMML.metadata.project); CopyStringToBuffer(&Script,