From e074ed8060a93b901f3f085af2d346953b2d8c47 Mon Sep 17 00:00:00 2001
From: Alejandro Gomez <alejandro@strike.me>
Date: Tue, 10 Jan 2023 10:18:46 +0100
Subject: [PATCH] css variables with light and dark variants

---
 src/Text.js                  |  2 +-
 src/element/Copy.css         | 13 ++++----
 src/element/Copy.js          | 18 +++++++-----
 src/element/Invoice.css      |  7 +++--
 src/element/LNURLTip.css     |  6 ++--
 src/element/Modal.css        |  4 +--
 src/element/Note.css         | 25 ++++++++++++----
 src/element/Note.js          |  7 ++---
 src/element/NoteCreator.css  |  2 +-
 src/element/NoteReaction.css |  4 +--
 src/element/Relay.css        |  4 +--
 src/element/Relay.js         |  4 +--
 src/element/Thread.js        |  2 +-
 src/index.css                | 57 ++++++++++++++++++++++++++++--------
 src/pages/ProfilePage.css    | 11 ++++++-
 src/pages/ProfilePage.js     |  2 +-
 src/pages/Root.css           |  2 +-
 src/pages/SettingsPage.css   |  3 +-
 18 files changed, 113 insertions(+), 60 deletions(-)

diff --git a/src/Text.js b/src/Text.js
index 58a3c151..e5b3dd6b 100644
--- a/src/Text.js
+++ b/src/Text.js
@@ -85,7 +85,7 @@ export function extractMentions(fragments, tags, users) {
                             }
                         }
                     }
-                    return <b style={{ color: "red" }}>{matchTag[0]}?</b>;
+                    return <b style={{ color: "var(--error)" }}>{matchTag[0]}?</b>;
                 } else {
                     return match;
                 }
diff --git a/src/element/Copy.css b/src/element/Copy.css
index 3a949667..2ed09ebc 100644
--- a/src/element/Copy.css
+++ b/src/element/Copy.css
@@ -1,14 +1,15 @@
 .copy {
     user-select: none;
     cursor: pointer;
+    -webkit-tap-highlight-color: transparent;
 }
 
 .copy .body {
     font-family: monospace;
     font-size: 14px;
-    margin: 0;
-    width: 18em;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-}
\ No newline at end of file
+    background: var(--gray-secondary);
+    color: var(--font-color);
+    padding: 2px 4px;
+    border-radius: 10px;
+    margin: 0 4px 0 0;
+}
diff --git a/src/element/Copy.js b/src/element/Copy.js
index f70d8803..4bc922b4 100644
--- a/src/element/Copy.js
+++ b/src/element/Copy.js
@@ -3,19 +3,21 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faCopy, faCheck } from "@fortawesome/free-solid-svg-icons";
 import { useCopy } from "../useCopy";
 
-export default function Copy(props) {
-
+export default function Copy({ text, maxSize = 32 }) {
     const { copy, copied, error } = useCopy();
+    const sliceLength = maxSize / 2
+    const trimmed = text.length > maxSize ? `${text.slice(0, sliceLength)}:${text.slice(-sliceLength)}` : text
+
     return (
-        <div className="flex flex-row copy" onClick={() => copy(props.text)}>
+        <div className="flex flex-row copy" onClick={() => copy(text)}>
+            <span className="body">
+                {trimmed}
+            </span>
             <FontAwesomeIcon
                 icon={copied ? faCheck : faCopy}
                 size="xs"
-                style={{ color: copied ? 'green' : 'currentColor', marginRight: '2px' }}
+                style={{ color: copied ? 'var(--success)' : 'currentColor', marginRight: '2px' }}
             />
-            <p className="body">
-                {props.text}
-            </p>
         </div>
     )
-}
\ No newline at end of file
+}
diff --git a/src/element/Invoice.css b/src/element/Invoice.css
index 3f2021fe..9651fa5b 100644
--- a/src/element/Invoice.css
+++ b/src/element/Invoice.css
@@ -1,6 +1,7 @@
 .note-invoice {
+    background: var(--bg-color);
     border-radius: 10px;
-    border: 1px solid #444;
+    border: 1px solid var(--gray-tertiary);
     padding: 10px;
 }
 
@@ -9,5 +10,5 @@
 }
 
 .note-invoice small {
-    color: #666;
-}
\ No newline at end of file
+    color: var(--gray-medium);
+}
diff --git a/src/element/LNURLTip.css b/src/element/LNURLTip.css
index 785f3195..3fea13cb 100644
--- a/src/element/LNURLTip.css
+++ b/src/element/LNURLTip.css
@@ -1,5 +1,5 @@
 .lnurl-tip {
-    background-color: #222;
+    background-color: var(--gray-secondary);
     padding: 10px;
     border-radius: 10px;
     width: 500px;
@@ -12,7 +12,7 @@
 }
 
 .lnurl-tip .btn:hover {
-    background-color: #333;
+    background-color: var(--gray);
 }
 
 .lnurl-tip .invoice {
@@ -39,4 +39,4 @@
     .lnurl-tip .invoice .actions {
         text-align: center;
     }
-}
\ No newline at end of file
+}
diff --git a/src/element/Modal.css b/src/element/Modal.css
index 55be6fec..d690343b 100644
--- a/src/element/Modal.css
+++ b/src/element/Modal.css
@@ -4,8 +4,8 @@
     position: fixed;
     top: 0;
     left: 0;
-    background-color: rgba(0,0,0, 0.8);
+    background-color: var(--modal-bg-color);
     display: flex;
     justify-content: center;
     align-items: center;
-}
\ No newline at end of file
+}
diff --git a/src/element/Note.css b/src/element/Note.css
index 232379ee..d32478fe 100644
--- a/src/element/Note.css
+++ b/src/element/Note.css
@@ -1,10 +1,15 @@
 .note {
     margin-bottom: 10px;
-    border-bottom: 1px solid #333;
+    border-bottom: 1px solid var(--gray);
+}
+
+.note.thread {
+    border-bottom: none;
 }
 
 .note.active {
-    background-color: #222;
+    background-color: var(--gray-secondary);
+    border-left: 3px solid var(--highlight);
 }
 
 .note > .header > .pfp {
@@ -13,13 +18,13 @@
 
 .note > .header .reply {
     font-size: small;
-    color: #999;
+    color: var(--gray-light);
 }
 
 .note > .header > .info {
     font-size: small;
     white-space: nowrap;
-    color: #999;
+    color: var(--gray-light);
 }
 
 .note > .body {
@@ -48,6 +53,14 @@
 }
 
 .indented {
-    border-left: 3px solid #444;
+    border-left: 3px solid var(--gray-tertiary);
     padding-left: 2px;
-}
\ No newline at end of file
+}
+.indented .note {
+    border-bottom: none;
+    padding: 0 4px;
+}
+
+.note .body a {
+    color: var(--highlight);
+}
diff --git a/src/element/Note.js b/src/element/Note.js
index 085fe74b..c78b0a7c 100644
--- a/src/element/Note.js
+++ b/src/element/Note.js
@@ -12,12 +12,9 @@ import NoteTime from "./NoteTime";
 
 export default function Note(props) {
     const navigate = useNavigate();
-    const data = props.data;
     const opt = props.options;
     const dataEvent = props["data-ev"];
-    const reactions = props.reactions;
-    const deletion = props.deletion;
-    const hightlight = props.hightlight;
+    const { data, isThread, reactions, deletion, hightlight } = props
 
     const users = useSelector(s => s.users?.users);
     const ev = dataEvent ?? Event.FromObject(data);
@@ -81,7 +78,7 @@ export default function Note(props) {
     }
 
     return (
-        <div className={`note ${hightlight ? "active" : ""}`}>
+        <div className={`note ${hightlight && "active"} ${isThread && "thread"}`}>
             {options.showHeader ?
                 <div className="header flex">
                     <ProfileImage pubkey={ev.RootPubKey} subHeader={replyTag()} />
diff --git a/src/element/NoteCreator.css b/src/element/NoteCreator.css
index 866700ab..95aacdff 100644
--- a/src/element/NoteCreator.css
+++ b/src/element/NoteCreator.css
@@ -1,6 +1,6 @@
 .note-creator {
     margin-bottom: 10px;
-    background-color: #333;
+    background-color: var(--gray);
     border-radius: 10px;
     overflow: hidden;
 }
diff --git a/src/element/NoteReaction.css b/src/element/NoteReaction.css
index 8c47124b..ecc03962 100644
--- a/src/element/NoteReaction.css
+++ b/src/element/NoteReaction.css
@@ -4,7 +4,7 @@
 
 .reaction > .note {
     margin: 5px;
-    border: 1px solid #333;
+    border: 1px solid var(--gray);
     border-radius: 10px;
     padding: 5px;
 }
@@ -20,4 +20,4 @@
 .reaction > .header > .info {
     color: #999;
     font-size: small;
-}
\ No newline at end of file
+}
diff --git a/src/element/Relay.css b/src/element/Relay.css
index 93e1f796..7ff20731 100644
--- a/src/element/Relay.css
+++ b/src/element/Relay.css
@@ -1,10 +1,10 @@
 .relay {
     margin-bottom: 10px;
-    background-color: #222;
+    background-color: var(--gray-secondary);
     border-radius: 5px;
     text-align: start;
 }
 
 .relay > div {
     padding: 5px;
-}
\ No newline at end of file
+}
diff --git a/src/element/Relay.js b/src/element/Relay.js
index 2d3ac597..7ab13828 100644
--- a/src/element/Relay.js
+++ b/src/element/Relay.js
@@ -24,7 +24,7 @@ export default function Relay(props) {
         <>
             <div className="flex relay w-max">
                 <div>
-                    <FontAwesomeIcon icon={faPlug} color={state?.connected ? "green" : "red"} />
+                    <FontAwesomeIcon icon={faPlug} color={state?.connected ? "var(--success)" : "var(--error)"} />
                 </div>
                 <div className="f-grow f-col">
                     <b>{name}</b>
@@ -47,4 +47,4 @@ export default function Relay(props) {
             </div>
         </>
     )
-}
\ No newline at end of file
+}
diff --git a/src/element/Thread.js b/src/element/Thread.js
index 0a8a9380..313a710b 100644
--- a/src/element/Thread.js
+++ b/src/element/Thread.js
@@ -47,7 +47,7 @@ export default function Thread(props) {
 
     function renderRoot() {
         if (root) {
-            return <Note data-ev={root} reactions={reactions(root.Id)} deletion={reactions(root.Id, EventKind.Deletion)} />
+            return <Note data-ev={root} reactions={reactions(root.Id)} deletion={reactions(root.Id, EventKind.Deletion)} isThread />
         } else {
             return <NoteGhost>
                 Loading thread root.. ({notes.length} notes loaded)
diff --git a/src/index.css b/src/index.css
index 6635e421..fe1c44fe 100644
--- a/src/index.css
+++ b/src/index.css
@@ -1,12 +1,38 @@
 @import url('https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&display=swap');
 
+:root {
+    --font-color: #fff;
+    --bg-color: #000;
+    --modal-bg-color: rgba(0,0,0, 0.8);
+    --gray-superlight: #eee;
+    --gray-light: #999;
+    --gray-medium: #666;
+    --gray: #333;
+    --gray-secondary: #222;
+    --gray-tertiary: #444;
+    --highlight: #bada55;
+    --error: red;
+    --success: green;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+     --font-color: #000;
+     --bg-color: #fff;
+     --highlight: #ff9900;
+     --gray: #ccc;
+     --gray-secondary: #ddd;
+     --gray-tertiary: #eee;
+  }
+}
+
 body {
   margin: 0;
   font-family: 'Montserrat', sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  background-color: #000;
-  color: #fff;
+  background-color: var(--bg-color);
+  color: var(--font-color);
 }
 
 code {
@@ -42,19 +68,20 @@ code {
   border-radius: 5px;
   cursor: pointer;
   user-select: none;
-  background-color: #000;
+  background-color: var(--bg-color);
   border: 1px solid;
   display: inline-block;
 }
 
 .btn.active {
   border: 2px solid;
-  background-color: #222;
+  background-color: var(--gray-secondary);
+  color:  var(--font-color);
   font-weight: bold;
 }
 
 .btn:hover {
-  background-color: #333;
+  background-color: var(--gray);
 }
 
 .btn-sm {
@@ -73,8 +100,12 @@ input[type="text"], input[type="password"], input[type="number"], textarea {
   padding: 10px;
   border-radius: 5px;
   border: 0;
-  background-color: #333;
-  color: #eee;
+  background-color: var(--gray);
+  color: var(--font-color);
+}
+
+textarea:placeholder {
+  color: var(--gray-superlight);
 }
 
 .flex {
@@ -122,7 +153,7 @@ a {
 
 span.pill {
   display: inline-block;
-  background-color: #333;
+  background-color: var(--gray);
   padding: 2px 10px;
   border-radius: 10px;
   user-select: none;
@@ -130,7 +161,8 @@ span.pill {
 }
 
 span.pill.active {
-  background-color: #444;
+  background-color: var(--gray-tertiary);
+  color:  var(--font-color);
   font-weight: bold;
 }
 
@@ -186,7 +218,7 @@ div.form-group > div:nth-child(2) input {
 .modal .modal-content > div {
   padding: 10px;
   border-radius: 10px;
-  background-color: #333;
+  background-color: var(--gray);
   margin-top: 5vh;
 }
 
@@ -225,10 +257,9 @@ body.scroll-lock {
 }
 
 .tabs > div.active {
-  background-color: #222;
   font-weight: bold;
 }
 
 .error {
-  color: red;
-}
\ No newline at end of file
+  color: var(--error);
+}
diff --git a/src/pages/ProfilePage.css b/src/pages/ProfilePage.css
index de0b0918..f40eddbd 100644
--- a/src/pages/ProfilePage.css
+++ b/src/pages/ProfilePage.css
@@ -19,7 +19,7 @@
 }
 
 .profile .avatar-wrapper {
-  margin: 10px;
+    margin: auto 10px;
 }
 
 .profile .avatar {
@@ -32,10 +32,12 @@
 .profile .details {
     margin-top: auto;
     margin-bottom: auto;
+    overflow: hidden;
 }
 
 .profile .website {
     margin-bottom: 10px;
+    color: var(--highlight);
 }
 
 .profile .website::before {
@@ -53,3 +55,10 @@
         width: 100%;
     }
 }
+
+@media(max-width: 420px) {
+      .profile .name { flex-direction: column; }
+      .profile .name .btn {
+          margin-top: 5px;
+      }
+}
diff --git a/src/pages/ProfilePage.js b/src/pages/ProfilePage.js
index 13810a61..c013b28d 100644
--- a/src/pages/ProfilePage.js
+++ b/src/pages/ProfilePage.js
@@ -78,4 +78,4 @@ export default function ProfilePage() {
             <Timeline pubkeys={id} />
         </>
     )
-}
\ No newline at end of file
+}
diff --git a/src/pages/Root.css b/src/pages/Root.css
index c85ce5d6..2b72028f 100644
--- a/src/pages/Root.css
+++ b/src/pages/Root.css
@@ -1,5 +1,5 @@
 .root-tabs > div {
   padding: 5px 0;
-  background-color: #333;
+  background-color: var(--gray);
   border-radius: 10px;
 }
diff --git a/src/pages/SettingsPage.css b/src/pages/SettingsPage.css
index b747e050..cf2c2efa 100644
--- a/src/pages/SettingsPage.css
+++ b/src/pages/SettingsPage.css
@@ -1,4 +1,3 @@
-
 .settings .avatar {
     width: 256px;
     height: 256px;
@@ -15,7 +14,7 @@
     width: 100%;
     height: 100%;
     opacity: 0;
-    background-color: black;
+    background-color: var(--bg-color);
 }
 
 .settings .avatar .edit:hover {