From 5f66486244c086a188d41b13b014db70c75932f2 Mon Sep 17 00:00:00 2001
From: Kognise <felix.mattick@gmail.com>
Date: Wed, 11 Aug 2021 14:39:22 -0400
Subject: [PATCH] Align better with main branch and update changesets

---
 .changeset/dirty-beans-wonder.md |  5 -----
 .changeset/rude-pots-sort.md     |  2 +-
 .changeset/stale-dodos-chew.md   |  5 -----
 src/parts/_forms.css             | 27 +++++++++++++++++----------
 src/variables-dark.css           |  6 +++---
 src/variables-light.css          |  8 ++++----
 6 files changed, 25 insertions(+), 28 deletions(-)
 delete mode 100644 .changeset/dirty-beans-wonder.md
 delete mode 100644 .changeset/stale-dodos-chew.md

diff --git a/.changeset/dirty-beans-wonder.md b/.changeset/dirty-beans-wonder.md
deleted file mode 100644
index 111bae2..0000000
--- a/.changeset/dirty-beans-wonder.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"water.css": patch
----
-
-changed hover color close to base color
diff --git a/.changeset/rude-pots-sort.md b/.changeset/rude-pots-sort.md
index 568261e..6ce3df0 100644
--- a/.changeset/rude-pots-sort.md
+++ b/.changeset/rude-pots-sort.md
@@ -2,4 +2,4 @@
 "water.css": patch
 ---
 
-Added Contrast to the Buttons
+Update button colors for better contrast, especially in tables
\ No newline at end of file
diff --git a/.changeset/stale-dodos-chew.md b/.changeset/stale-dodos-chew.md
deleted file mode 100644
index 4a52517..0000000
--- a/.changeset/stale-dodos-chew.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"water.css": patch
----
-
-Better button color inside table.
diff --git a/src/parts/_forms.css b/src/parts/_forms.css
index ad5742a..868575c 100644
--- a/src/parts/_forms.css
+++ b/src/parts/_forms.css
@@ -1,6 +1,7 @@
 button,
 select,
 input[type='submit'],
+input[type='reset'],
 input[type='button'],
 input[type='checkbox'],
 input[type='range'],
@@ -8,11 +9,16 @@ input[type='radio'] {
   cursor: pointer;
 }
 
-input:not([type='checkbox']):not([type='radio']),
+input,
 select {
   display: block;
 }
 
+[type='checkbox'],
+[type='radio'] {
+  display: initial;
+}
+
 input,
 button,
 textarea,
@@ -31,12 +37,20 @@ select {
 
 button,
 input[type='submit'],
+input[type='reset'],
 input[type='button'] {
-  background-color: var(--background-btn);
+  background-color: var(--button-base);
   padding-right: 30px;
   padding-left: 30px;
 }
 
+button:hover,
+input[type='submit']:hover,
+input[type='reset']:hover,
+input[type='button']:hover {
+  background: var(--button-hover);
+}
+
 input[type='color'] {
   min-height: 2rem;
   padding: 8px;
@@ -102,14 +116,6 @@ select[multiple] {
   overflow-y: auto;
 }
 
-button:hover,
-input[type='submit']:hover,
-input[type='button']:hover {
-  background: var(--button-hover);
-
-  /* transform: scale(1.03); */
-}
-
 input:focus,
 select:focus,
 button:focus,
@@ -120,6 +126,7 @@ textarea:focus {
 input[type='checkbox']:active,
 input[type='radio']:active,
 input[type='submit']:active,
+input[type='reset']:active,
 input[type='button']:active,
 input[type='range']:active,
 button:active {
diff --git a/src/variables-dark.css b/src/variables-dark.css
index a3e2925..3b1b800 100755
--- a/src/variables-dark.css
+++ b/src/variables-dark.css
@@ -1,7 +1,6 @@
 :root {
   --background-body: #202b38;
   --background: #161f27;
-  --background-btn: #0c151c;
   --background-alt: #1a242f;
   --selection: #1c76c5;
   --text-main: #dbdbdb;
@@ -12,9 +11,10 @@
   --border: #526980;
   --code: #ffbe85;
   --animation-duration: 0.1s;
-  --button-hover: #0a121a;
+  --button-base: #0c151c;
+  --button-hover: #040a0f;
   --scrollbar-thumb: var(--button-hover);
-  --scrollbar-thumb-hover: color-mod(var(--scrollbar-thumb) lightness(+8%));
+  --scrollbar-thumb-hover: color-mod(var(--scrollbar-thumb) lightness(-30%));
   --form-placeholder: #a9a9a9;
   --form-text: #fff;
   --variable: #d941e2;
diff --git a/src/variables-light.css b/src/variables-light.css
index 84cc0b3..d0c2bad 100755
--- a/src/variables-light.css
+++ b/src/variables-light.css
@@ -1,7 +1,6 @@
 :root {
   --background-body: #fff;
   --background: #e2e2e2;
-  --background-btn: #d0cfcf;
   --background-alt: #f7f7f7;
   --selection: #9e9e9e;
   --text-main: #363636;
@@ -12,9 +11,10 @@
   --border: #dbdbdb;
   --code: #000;
   --animation-duration: 0.1s;
-  --button-hover: rgb(170, 170, 170);
-  --scrollbar-thumb: color-mod(var(--button-hover) lightness(-3%));
-  --scrollbar-thumb-hover: color-mod(var(--button-hover) lightness(-10%));
+  --button-base: #d0cfcf;
+  --button-hover: #9b9b9b;
+  --scrollbar-thumb: color-mod(var(--button-hover) lightness(+6%));
+  --scrollbar-thumb-hover: var(--button-hover);
   --form-placeholder: #949494;
   --form-text: rgb(29, 29, 29);
   --variable: #39a33c;