From bee19349bba0c601f7024b05287775bfeedf57ff Mon Sep 17 00:00:00 2001
From: Rhiannon Morris <rhi@rhiannon.website>
Date: Mon, 15 Aug 2022 03:51:49 +0200
Subject: [PATCH] contact info stuff

---
 Makefile          |  2 +-
 base.css          |  2 ++
 media/cohost.svg  | 67 +++++++++++++++++++++++++++++++++++
 media/donphan.png |  3 --
 media/lockpen.png |  3 ++
 media/types.png   |  3 --
 where.css         | 35 ++++++-------------
 where.html        | 89 +++++++++++++++--------------------------------
 8 files changed, 111 insertions(+), 93 deletions(-)
 create mode 100644 media/cohost.svg
 delete mode 100644 media/donphan.png
 create mode 100644 media/lockpen.png
 delete mode 100644 media/types.png

diff --git a/Makefile b/Makefile
index a151a38..ba403ce 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ CSS    = base.css index.css where.css comms.css ANGELF~1.CSS
 PAGES  = index.html where.html comms.html ANGELF~1.HTM pubkey.txt
 MEDIA  = $(patsubst %,media/%, \
     bg.png bg_2x.png bg_dim.png bg_2x_dim.png snugl.png \
-    mlem.gif mlem_static.png cybre.png donphan.png types.png \
+    mlem.gif mlem_static.png cybre.png lockpen.png \
     niss-nisse.mp3 niss-nisse.ogg \
     comm-examples.png \
   ) \
diff --git a/base.css b/base.css
index 3be57cd..3654cc5 100644
--- a/base.css
+++ b/base.css
@@ -115,6 +115,8 @@ dl {
   display: grid;
   grid-template-columns: repeat(4, auto);
   grid-row-gap: 6px;
+  grid-column-gap: 1em;
+  justify-content: center;
 }
 
 dt {
diff --git a/media/cohost.svg b/media/cohost.svg
new file mode 100644
index 0000000..32076b7
--- /dev/null
+++ b/media/cohost.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   class="hidden h-8 lg:block"
+   role="img"
+   aria-label="cohost"
+   viewBox="0 0 177.2231 127.84343"
+   fill="none"
+   version="1.1"
+   id="svg12"
+   sodipodi:docname="cohost.svg"
+   width="177.2231"
+   height="127.84343"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs16" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     id="namedview14"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="1.479249"
+     inkscape:cx="253"
+     inkscape:cy="64"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg12"
+     inkscape:document-rotation="0" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="m 142.814,106.403 c -11.109,6.803 -23.917,12.149 -38.424,16.036 -16.112102,4.317 -31.298102,6.048 -45.558302,5.192 -14.2601,-0.856 -26.4095,-4.576 -36.4483,-11.16 C 12.344598,109.887 5.5763384,100.068 2.0786784,87.0142 -1.4390516,73.886 -0.49201364,61.9799 4.9197984,51.2958 10.331598,40.6118 19.008298,31.3714 30.949998,23.5747 c 11.9417,-7.7968 25.9685,-13.8537797 42.0804,-18.1709097 16.0373,-4.29719 31.162602,-6.03147505 45.375602,-5.20286805 9.549,0.556762 18.162,2.40187805 25.84,5.53533805 3.749,1.53031 7.275,3.36788 10.578,5.5127397 10.066,6.5368 16.848,16.332 20.346,29.3856 3.497,13.0536 2.527,24.9461 -2.912,35.6774 -0.76,1.4992 -1.583,2.9703 -2.469,4.4141 -0.626,-2.8187 -1.883,-5.2764 -3.771,-7.3731 -0.927,-1.0294 -1.957,-1.9746 -3.092,-2.8358 -2.323,-1.7634 -5.081,-3.1743 -8.274,-4.2327 -4.754,-1.5753 -10.05,-2.3629 -15.889,-2.3629 -5.867,0 -11.183,0.7808 -15.95,2.3425 -4.767,1.5618 -8.556,3.9111 -11.367,7.0481 -2.811,3.137 -4.216,7.0956 -4.216,11.8758 0,4.7531 1.405,8.7048 4.216,11.8554 2.811,3.1506 6.6,5.5206 11.367,7.1096 4.767,1.588 10.083,2.383 15.95,2.383 1.38,0 2.73,-0.044 4.051,-0.133 z M 91.994398,97.9397 c -1.1136,1.1951 -3.0759,2.4643 -5.887,3.8093 -2.8111,1.344 -6.1993,2.478 -10.1647,3.402 -3.9654,0.923 -8.2295,1.385 -12.7925,1.385 -3.9925,0 -7.9036,-0.387 -11.7332,-1.161 -3.8295,-0.774 -7.2925,-2.003 -10.3887,-3.687 -3.0963,-1.684 -5.5611,-3.8841 -7.3944,-6.6001 -1.8333,-2.716 -2.75,-6.016 -2.75,-9.8999 0,-3.9382 0.9167,-7.2653 2.75,-9.9814 1.8333,-2.716 4.2981,-4.9024 7.3944,-6.5591 3.0962,-1.6568 6.5592,-2.8587 10.3887,-3.6056 3.8296,-0.7469 7.7407,-1.1203 11.7332,-1.1203 4.5901,0 8.8271,0.4074 12.711,1.2222 3.8839,0.8148 7.2178,1.8808 10.0017,3.1981 2.784,1.3173 4.8006,2.7228 6.05,4.2166 l -10.4295,6.8443 c -1.521,-1.6567 -3.8296,-2.9807 -6.9259,-3.9721 -3.0962,-0.9913 -6.8579,-1.487 -11.285,-1.487 -2.1728,0 -4.366,0.1698 -6.5796,0.5092 -2.2136,0.3396 -4.2438,0.9167 -6.0907,1.7315 -1.8468,0.8148 -3.3339,1.9555 -4.461,3.4222 -1.1272,1.4666 -1.6908,3.3271 -1.6908,5.5814 0,2.2271 0.5636,4.0673 1.6908,5.5203 1.1271,1.4531 2.6142,2.6074 4.461,3.4629 1.8469,0.8556 3.8771,1.4599 6.0907,1.813 2.2136,0.3531 4.4068,0.5296 6.5796,0.5296 4.3456,0 8.1141,-0.5432 11.3054,-1.6296 3.1913,-1.0864 5.4388,-2.3358 6.7425,-3.7481 z M 138.763,96.3508 c 5.676,0 10.076,-1.0185 13.2,-3.0555 3.123,-2.037 4.685,-4.7394 4.685,-8.1073 0,-3.4494 -1.569,-6.1586 -4.706,-8.1277 -3.137,-1.9691 -7.53,-2.9537 -13.179,-2.9537 -5.677,0 -10.097,0.9846 -13.261,2.9537 -3.164,1.9691 -4.746,4.6783 -4.746,8.1277 0,3.4222 1.582,6.1382 4.746,8.1481 3.164,2.0098 7.584,3.0147 13.261,3.0147 z"
+     fill="currentColor"
+     id="path2"
+     style="fill:#ffffff;fill-opacity:1" />
+</svg>
diff --git a/media/donphan.png b/media/donphan.png
deleted file mode 100644
index 20033ce..0000000
--- a/media/donphan.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:912d92c7357b4f55a0d36f5a0b06ad419ee2743d041b72ac52ec45ba42fdc7c8
-size 440
diff --git a/media/lockpen.png b/media/lockpen.png
new file mode 100644
index 0000000..5079b58
--- /dev/null
+++ b/media/lockpen.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:538ed0370a0b6116181dcaf30cbbb9d130ca3780d9807356bebf9a0384b9c7e6
+size 5331
diff --git a/media/types.png b/media/types.png
deleted file mode 100644
index e680de9..0000000
--- a/media/types.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f3b2d383aae0de5e300e82d314b5fcb1efe7f8888a3ce24ff850ca6fe22bef38
-size 6538
diff --git a/where.css b/where.css
index 7002661..1dc9398 100644
--- a/where.css
+++ b/where.css
@@ -1,34 +1,19 @@
 @import url(base.css);
 
+main { max-width: 1100px; }
 
-main {
-    max-width: 1100px;
-}
+#headerpic { filter: drop-shadow(0 0 30px var(--glow-col)); }
 
-#headerpic {
-  filter: drop-shadow(0 0 30px var(--glow-col));
-}
-
-dl.contact {
+.contact {
+  grid-template-columns: repeat(3, 3em auto);
   width: 100%;
-  row-gap: 1em;
 }
+.contact dd { margin-left: 8px; }
 
-.contact .at {
-  --shadow-filter: drop-shadow(2px 2px 2px hsla(0, 0%, 0%, 80%));
-  vertical-align: -0.2em;
-  max-width: 1em;
-  max-height: 1em;
-  padding: 0 0.1em;
-  filter: var(--shadow-filter);
-  z-index: -1;
-}
-
-.at.outline {
+.o {
   filter:
-    drop-shadow(0.3px 0.3px black)
-    drop-shadow(-0.3px 0.3px black)
-    drop-shadow(-0.3px -0.3px black)
-    drop-shadow(0.3px -0.3px black)
-    var(--shadow-filter);
+    drop-shadow(0.5px 0.5px black)
+    drop-shadow(-0.5px 0.5px black)
+    drop-shadow(-0.5px -0.5px black)
+    drop-shadow(0.5px -0.5px black);
 }
diff --git a/where.html b/where.html
index c21de55..e30d084 100644
--- a/where.html
+++ b/where.html
@@ -18,75 +18,42 @@
   </header>
 
   <dl class=contact>
-    <dt> fedi
-    <dd>
-      <a href=https://cybre.space/@g>
-        <img src=media/cybre.png alt='' class='at outline'>
-        g@cybre.space
-      </a>
-    <!-- dont use these much any more
-      <br>
-      <a href=https://donphan.social/@g>
-        <img src=media/donphan.png alt='' class=at>
-        g@donphan.social
-      </a>
-      <br>
-      <a href=https://types.pl/@g>
-        <img src=media/types.png alt='' class='at outline'>
-        g@types.pl
-      </a>
-    -->
+    <dt> <img src=media/cybre.png alt=fedi class='emojo o'>
+    <dd> <a href=https://cybre.space/@g>g@cybre.space</a>
 
-    <dt> twitter
-    <dd>
-      <a href=https://twitter.com/2_gecs>
-        <img src=media/dove.svg alt='' class=at>
-        @2_gecs
-      </a>
+    <dt> <img src=media/dove.svg alt=twitter title=twitter class=emojo>
+    <dd> <a href=https://twitter.com/2_gecs>@2_gecs</a>
 
-    <dt> <img src=media/18_plus.svg alt=lewd class=emojo> fedi
-    <dd>
-      <a href=https://cybre.space/@g>
-        <img src=media/dragncool.svg alt='' class='at outline'>
-        g@scalie.business
-      </a>
+    <dt> <img src=media/cohost.svg alt=cohost title=cohost class='emojo o'>
+    <dd> <a href=https://cohost.org/niss>@niss</a>
 
-    <dt> <img src=media/18_plus.svg alt=lewd class=emojo> twitter
-    <dd>
-      <a href=https://twitter.com/squishygecs>
-        <img src=media/dove.svg alt='' class=at>
-        @squishygecs
-      </a>
+    <dt> <img src=media/matrix.svg alt=matrix title=matrix class='emojo o'>
+    <dd> <a href=https://matrix.to/#/@g:cybre.space>g:cybre.space</a>
 
-    <dt> matrix
-    <dd>
-      <a href=https://matrix.to/#/@g:cybre.space>
-        <img src=media/matrix.svg alt='' class='at outline'>
-        g:cybre.space
-      </a>
+    <dt>
+      <span title='lewd fedi'>
+        <img src=media/dragncool.svg alt=fedi class='emojo o'>
+        <img src=media/18_plus.svg alt='[lewd]' class=emojo>
+      </span>
+    <dd> <a href=https://scalie.business/@g>g@scalie.business</a>
 
-    <dt> xmpp
-    <dd>
-      <b>
-        <img src=media/light_bulb.svg alt='' class=at>
-        niss <img src=media/club_suit.svg alt=at class=emojo> yummy.cricket
-        <!-- there is no email address there yet
-             but there might be in future -->
-      </b>
+    <dt>
+      <span title='lewd twitter'>
+        <img src=media/dove.svg alt=twitter class=emojo>
+        <img src=media/18_plus.svg alt='[lewd]' class=emojo>
+      </span>
+    <dd> <a href=https://twitter.com/squishygecs>@squishygecs</a>
 
-    <dt> email
+    <dt> <img src=media/light_bulb.svg alt=xmpp title=xmpp class=emojo>
     <dd>
-      <b>
-        <img src=media/love_letter.svg alt='' class=at>
-        niss <img src=media/club_suit.svg alt=at class=emojo> niss.website
-      </b>
+      <b>niss <img src=media/club_suit.svg alt=at class=emojo> yummy.cricket</b>
 
-    <dt> pgp key
+    <dt> <img src=media/love_letter.svg alt=email title=email class=emojo>
     <dd>
-      <a href=pubkey.txt>
-        <img src=media/green_tick.svg alt='' class=at>
-        here
-      </a>
+      <b>niss <img src=media/club_suit.svg alt=at class=emojo> niss.website</b>
+
+    <dt> <img src=media/lockpen.png alt='pgp key' class=emojo>
+    <dd> <a href=pubkey.txt>here</a>
   </dl>
 
   <hr>
@@ -100,7 +67,7 @@
     <dt>deviantart  <dd><a href=//www.deviantart.com/2gecs>2gecs</a>
     <dt>tumblr      <dd><a href=//2gecsart.tumblr.com/>2gecsart</a>
     <dt>ko-fi       <dd><a href=//ko-fi.com/nissss>nissss</a>
-    <dt>art fight   <dd><a href=//artfight.net/~nissss>nissss</a>
+    <!-- <dt>art fight   <dd><a href=//artfight.net/~nissss>nissss</a> -->
   </dl>
 
   <hr>