Merge pull request #802 from nextlevelbanana/main

badges in profile fix; new color cheme; chat message padding tweaks
Roguelike-Celebration · Sep 10, 2023 · d6f81c0 · d6f81c0
2 parents 9cc4a4d + 020edf4
commit d6f81c0
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 7 deletions.
diff --git a/src/components/ProfileView.tsx b/src/components/ProfileView.tsx
@@ -114,8 +114,8 @@ export default function ProfileView (props: { user: PublicUser, whispers: Whispe
             <button className='close-profile' onClick={() => dispatch(HideProfileAction())}>X</button>
           </div>
           <section className="badges">
-            {user.unlockedBadges.map(badge => {
-              <BadgeView emoji={badge.emoji} description={badge.description} isCustom={badge.isCustom} />
+            {user.unlockedBadges?.map(badge => {
+              return (<BadgeView key={badge.emoji} emoji={badge.emoji} description={badge.description} isCustom={badge.isCustom} />)
             })}
           </section>
           <section className="profile-details">

diff --git a/src/components/SettingsView.tsx b/src/components/SettingsView.tsx
@@ -103,6 +103,16 @@ export default function SettingsView (props: Props) {
           />
           <label htmlFor="monochrome-green">Green CRT</label>
         </div>
+        <div className="radio">
+          <input
+            type="radio"
+            id="vaporwave"
+            value="vaporwave"
+            checked={selectedTheme === 'vaporwave'}
+            onChange={handleThemeSelection}
+          />
+          <label htmlFor="vaporwave">Vaporwave</label>
+        </div>
       </div>
       <div className="form" id="simpleNamesSelectionForm">
         <label htmlFor="simpleNamesSelectionForm" className='form-header'>Username Display Mode:</label>

diff --git a/style/chat.css b/style/chat.css
@@ -8,6 +8,10 @@
   text-transform: lowercase;
 }
 
+.message-wrapper {
+  padding: 0.25rem;
+}
+
 .message-wrapper .time.show-on-hover {
   opacity: 0;
 }

diff --git a/style/nameView.css b/style/nameView.css
@@ -42,11 +42,6 @@ span.name {
   font-style: normal;
 }
 
-.mod {
-  background-color: var(--mod-line);
-  color: var(--main-text);
-}
-
 .name.Blue {
   color: var(--blue)
 }

diff --git a/style/style.css b/style/style.css
@@ -117,6 +117,31 @@
   --link: #66FF66;
   }
 
+  /* vaporwave light bg: #e7eef4;, good puprel: #6b3097*/
+.vaporwave {
+  --main-background: #302c7b;
+  --main-font:#B1ECE5; ;
+  --gray-text:#3c88cc;
+  --alternate-background: #1e1c4f;
+  --alternate-translucent: rgba(10,10,10,0.8);
+  --green:#20b2aa;
+  --highlight-line: #f440ac;
+  --highlighted-line-font: #231b54;
+  --mod-line: #3c88cc ;
+  --pink: lightpink;
+  --blue: #87ceeb;
+  --cyan: #00ffff;
+  --magenta: #ff00ff;
+  --orange: #ffa500;
+  --red: #ff0000;
+  --violet: #ee82ee;
+  --yellow: #ffff00;
+  --link-decoration: underline;
+  --link-style: dashed; 
+  --active: #1e1c4f;
+  --link: #ee82ee; 
+  }
+
 body {
   background-color: var(--main-background);
   color: var(--main-font);