From 266e3e04e9386cedf455945f0f4dd4c94ae91dd1 Mon Sep 17 00:00:00 2001
From: end-4 <97237370+end-4@users.noreply.github.com>
Date: Fri, 26 Jan 2024 21:37:34 +0700
Subject: [PATCH] ags: sync

---
 .../specials/_material_badapple.scss          |  4 +--
 .config/ags/scss/_common.scss                 | 11 +++-----
 .config/ags/scss/_sidebars.scss               | 18 ++++++-------
 .config/ags/scss/main.scss                    |  1 +
 .config/ags/style.css                         | 25 +++++++++----------
 5 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/.config/ags/scripts/color_generation/specials/_material_badapple.scss b/.config/ags/scripts/color_generation/specials/_material_badapple.scss
index 5f6dc5e6..cfab8e9f 100644
--- a/.config/ags/scripts/color_generation/specials/_material_badapple.scss
+++ b/.config/ags/scripts/color_generation/specials/_material_badapple.scss
@@ -18,9 +18,9 @@ $onErrorContainer: #e2e2e2;
 $colorbarbg: #000000;
 $background: #000000;
 $onBackground: #e2e2e2;
-$surface: #000000;
+$surface: #161616;
 $onSurface: #e2e2e2;
-$surfaceVariant: #202020;
+$surfaceVariant: #242424;
 $onSurfaceVariant: #e2e2e2;
 $outline: #a1a1a1;
 $shadow: #000000;
diff --git a/.config/ags/scss/_common.scss b/.config/ags/scss/_common.scss
index 1b3d0a44..65d3887f 100644
--- a/.config/ags/scss/_common.scss
+++ b/.config/ags/scss/_common.scss
@@ -26,13 +26,6 @@
     }
 }
 
-tooltip {
-    animation-name: appear;
-    animation-duration: 100ms;
-    animation-timing-function: ease-out;
-    animation-iteration-count: 1;
-}
-
 menu {
     @include elevation-border-softer;
     padding: 0.681rem;
@@ -90,6 +83,10 @@ radio:checked {
 }
 
 tooltip {
+    animation-name: appear;
+    animation-duration: 100ms;
+    animation-timing-function: ease-out;
+    animation-iteration-count: 1;
     @include normal-rounding;
     background-color: $surfaceVariant;
     color: $onSurfaceVariant;
diff --git a/.config/ags/scss/_sidebars.scss b/.config/ags/scss/_sidebars.scss
index 6a5288cf..fdec7bc8 100644
--- a/.config/ags/scss/_sidebars.scss
+++ b/.config/ags/scss/_sidebars.scss
@@ -1,4 +1,5 @@
 $sidebar_chat_textboxareaColor: mix($onSurfaceVariant, $surfaceVariant, 40%);
+$textboxColor: mix($surface, $surfaceVariant, 80%);
 $system: $secondary;
 $onSystem: $onSecondary;
 $chatgpt: $primary;
@@ -510,7 +511,8 @@ $onChatgpt: $onPrimary;
 
 .sidebar-chat-textarea {
     @include normal-rounding;
-    border: 0.068rem solid $sidebar_chat_textboxareaColor;
+    background-color: $textboxColor;
+    color: $onSurfaceVariant;
     padding: 0.682rem;
 }
 
@@ -526,20 +528,15 @@ $onChatgpt: $onPrimary;
     min-width: 1.705rem;
     min-height: 1.705rem;
     border-radius: $rounding_medium - 0.681rem;
-    background-color: $sidebar_chat_textboxareaColor;
 }
 
 .sidebar-chat-send:hover,
 .sidebar-chat-send:focus {
-    background-color: mix($sidebar_chat_textboxareaColor,
-            $t_onSecondaryContainer,
-            97%);
+    background-color: $surfaceVariant;
 }
 
 .sidebar-chat-send:active {
-    background-color: mix($sidebar_chat_textboxareaColor,
-            $t_onSecondaryContainer,
-            80%);
+    background-color: mix($surfaceVariant, $onBackground, 80%);
 }
 
 .sidebar-chat-send-available {
@@ -679,7 +676,8 @@ $onChatgpt: $onPrimary;
 }
 
 .sidebar-chat-chip-action {
-    border: 0.068rem solid $sidebar_chat_textboxareaColor;
+    background-color: $textboxColor;
+    color: $onSurfaceVariant;
 }
 
 .sidebar-chat-chip-action:hover,
@@ -700,7 +698,7 @@ $onChatgpt: $onPrimary;
     @include menu_decel;
     @include small-rounding;
     padding: 0.341rem 0.477rem;
-    background-color: $t_surfaceVariant;
+    background-color: $textboxColor;
     color: $onSurfaceVariant;
 }
 
diff --git a/.config/ags/scss/main.scss b/.config/ags/scss/main.scss
index 034f91bf..83a2e2de 100644
--- a/.config/ags/scss/main.scss
+++ b/.config/ags/scss/main.scss
@@ -2,6 +2,7 @@
 * {
     all: unset;
 }
+// *:not(tooltip) { all: unset; }
 
 // Colors
 @import './material'; // Material colors
diff --git a/.config/ags/style.css b/.config/ags/style.css
index 7d5ad52a..cf6b9815 100644
--- a/.config/ags/style.css
+++ b/.config/ags/style.css
@@ -414,12 +414,6 @@
   to {
     opacity: 1; } }
 
-tooltip {
-  animation-name: appear;
-  animation-duration: 100ms;
-  animation-timing-function: ease-out;
-  animation-iteration-count: 1; }
-
 menu {
   border-top: 1px solid rgba(60, 57, 61, 0.121);
   border-left: 1px solid rgba(60, 57, 61, 0.121);
@@ -470,6 +464,10 @@ radio:checked {
   border: 0.477rem solid #eccbff; }
 
 tooltip {
+  animation-name: appear;
+  animation-duration: 100ms;
+  animation-timing-function: ease-out;
+  animation-iteration-count: 1;
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
   background-color: #38343a;
@@ -1837,7 +1835,8 @@ tooltip {
 .sidebar-chat-textarea {
   border-radius: 1.159rem;
   -gtk-outline-radius: 1.159rem;
-  border: 0.068rem solid #746d75;
+  background-color: #242125;
+  color: #cdc3ce;
   padding: 0.682rem; }
 
 .sidebar-chat-entry {
@@ -1850,15 +1849,14 @@ tooltip {
   transition: 300ms cubic-bezier(0.1, 1, 0, 1);
   min-width: 1.705rem;
   min-height: 1.705rem;
-  border-radius: 0.478rem;
-  background-color: #746d75; }
+  border-radius: 0.478rem; }
 
 .sidebar-chat-send:hover,
 .sidebar-chat-send:focus {
-  background-color: #787079; }
+  background-color: #38343a; }
 
 .sidebar-chat-send:active {
-  background-color: #8c838f; }
+  background-color: #5b565c; }
 
 .sidebar-chat-send-available {
   background-color: #eccbff;
@@ -1979,7 +1977,8 @@ tooltip {
   padding: 0.341rem 0.477rem; }
 
 .sidebar-chat-chip-action {
-  border: 0.068rem solid #746d75; }
+  background-color: #242125;
+  color: #cdc3ce; }
 
 .sidebar-chat-chip-action:hover,
 .sidebar-chat-chip-action:focus {
@@ -1997,7 +1996,7 @@ tooltip {
   border-radius: 0.818rem;
   -gtk-outline-radius: 0.818rem;
   padding: 0.341rem 0.477rem;
-  background-color: rgba(56, 52, 58, 0.31);
+  background-color: #242125;
   color: #cdc3ce; }
 
 .sidebar-chat-chip-toggle:focus,