Merge pull request #240 from MattMadness/master

Fixed themes and alphabetized them.

Author: marzavec

client/client.js

@@ -941,6 +941,7 @@ function userIgnore(nick) {
 /* color scheme switcher */
 
 var schemes = [
+	'amoled',
 	'android',
 	'android-white',
 	'andromeda',
@@ -952,12 +953,18 @@ var schemes = [
 	'banana',
 	'bright',
 	'bubblegum',
+	'carrot',
+	'catppuccin',
 	'chalk',
 	'default',
 	'eighties',
 	'fresh-green',
+	'fried-egg',
+	'flamingo',
 	'greenscreen',
+	'gruvbox-light',
 	'hacker',
+	'lax',
 	'maniac',
 	'mariana',
 	'military',
@@ -970,21 +977,14 @@ var schemes = [
 	'omega',
 	'pop',
 	'railscasts',
+	'rainbow',
+	'retro',
 	'solarized',
 	'sunlight',
 	'tomorrow',
 	'tk-night',
-	'carrot',
-	'catppuccin',
-	'lax',
-	'Ubuntu',
-	'gruvbox-light',
-	'fried-egg',
-	'rainbow',
-	'amoled',
-	'retro',
-	'Waifu',
-	'flamingo'
+	'ubuntu',
+	'waifu'
 ];
 
 var highlights = [

client/imgs/makima.svg

@@ -6,11 +6,12 @@ input,
 textarea {
   color: #a6a28c;
 }
-.message {
-  border-left: #000000;
+.refmessage, .message, #sidebar {
+  border-left: 1px solid #404040;
+  background: #000000;
 }
-.refmessage {
-  border-left: #000000;
+#chatform {
+  border-top: 1px solid #404040;
 }
 .nick {
   color: #778fd8;
@@ -41,10 +42,3 @@ textarea {
 #footer {
   background: #000000;
 }
-#sidebar {
-  background: #000000;
-  border-color: #000000;
-}
-#chatform {
-  border-color: #000000;
-}

client/schemes/amoled.css

@@ -35,4 +35,4 @@ body{
 .warn .nick,
 .warn .text {
   color: #ff6c6c;
-}
+}

client/schemes/nebula.css

@@ -116,7 +116,7 @@ label[for=pin-sidebar] {
   left: 36px;
   height: 14px;
   padding: 2px 3px;
-  content: "#programming [+ver 1.0] :: https://hack.chat - The Next Frontier of Unknown Pleasures";
+  content: "#programming [+ver 1.0] :: https://hack.chat - a minimal, distraction-free chat application";
   border: 2px solid gray;
   border-bottom: 2px solid gray;
   background: linear-gradient(to right, #000080, #1084d0);
@@ -131,38 +131,54 @@ label[for=pin-sidebar] {
 }
 #sidebar {
   width: 195px;
+  color: #7F7F7F;
 }
 #users li {
   list-style-type: none!important;
   margin-left: -1.3em;
   margin-top: 0.5em;
 }
+#sidebar-content hr {
+  border:none;
+  height:12px;
+  color:#7F7F7F;
+  background-color:#7F7F7F;
+  flex:0 0 100%;
+}
 #sidebar-content {
   display: flex;
+  flex-wrap: wrap;
   flex-direction: column-reverse;
   justify-content:start;
   align-items:start;
 }
-#sidebar-content hr {
-  display:none;
+#sidebar-content > :nth-child(21) {
+  display: none;
+}
+#sidebar-content > :nth-child(1) {
+  display: none;
 }
 #sidebar-content select, #sidebar-content button {
   border-radius: 0;
   margin-bottom: 0.5em;
 }
-#sidebar-content > :nth-child(19) {
-  /*         border: 1px solid red; */
-  margin-top: 80vh;
-  margin-bottom: 2.5em;
-}
-#sidebar-content > :nth-child(22) {
-  display: none;
+#sidebar-content > :nth-child(19) > button {
+  border: 2px outset red;
+  background-color:darkred;
 }
-#sidebar-content > :nth-child(21) {
-  display: none;
+#sidebar:hover {
+  #sidebar-content > :nth-child(-n+22) {
+    display:block;
+  }
+  #sidebar-content > :nth-child(1) {
+    display: none;
+  }
+  #sidebar-content > :nth-child(21) {
+    display: none;
+  }
 }
-#sidebar-content > :nth-child(1) {
-  display: none;
+#sidebar-content > :nth-child(-n+22) {
+  display:none;
 }
 
 /* chat form */
@@ -282,4 +298,3 @@ pre {
   margin-left: 320px;
 }
 
-

client/schemes/retro.css

@@ -27,20 +27,20 @@ body {
   padding: 10px;
 }
 
-/* Add Makima in the top right corner */
+/* Add Makima on the bottom left */
 body::after {
   content: "";
   display: block;
   position: fixed;
-  top: 10px;
-  right: 10px;
-  width: 50px;
-  height: 50px;
-  background: url('https://static.wikia.nocookie.net/chainsaw-man/images/d/d9/Makima_anime_design_2.png/revision/latest?cb=20220919121118') no-repeat;
-  background-size: cover;
-  border-radius: 50%;
-  z-index: 9999;
-  filter: drop-shadow(2px 2px 4px #000);
+  bottom: -125px;
+  left: 10px;
+  width: 200px;
+  background: url('/imgs/makima.svg') no-repeat;
+  background-size: contain;
+  background-position:bottom left;
+  z-index: 1;
+  height: 598px;
+  filter:opacity(75%);
 }
 
 /* Additional styles for a kawaii touch */
@@ -54,3 +54,4 @@ body::after {
   border-radius: 10px;
   box-shadow: 0 0 5px rgba(0, 0, 0, 0.5);
 }
+