refactor: fmt; reorganise

catppuccin · Mar 30, 2024 · bc99673 · bc99673
1 parent c441864
commit bc99673
Showing 1 changed file with 25 additions and 48 deletions.
diff --git a/styles/mastodon/catppuccin.user.css b/styles/mastodon/catppuccin.user.css
@@ -99,10 +99,6 @@ domain("toot.wales") {
       --background-border-color: @surface0 !important;
     }
 
-    .column-header {
-      background-color: @base;
-    }
-
     &,
     .tabs-bar__wrapper,
     .admin-wrapper .sidebar-wrapper__inner,
@@ -120,10 +116,6 @@ domain("toot.wales") {
       background: transparent;
     }
 
-    .reply-indicator__content a {
-      color: @accent-color !important;
-    }
-
     .search-popout,
     .search-popout em,
     .dismissable-banner__message,
@@ -194,6 +186,11 @@ domain("toot.wales") {
       color: @accent-color;
     }
 
+    .emoji-mart-anchor-selected,
+    .reply-indicator__content a {
+      color: @accent-color !important;
+    }
+
     .privacy-dropdown__option:hover {
       background: @accent-color !important;
       .privacy-dropdown__option__content,
@@ -225,23 +222,17 @@ domain("toot.wales") {
       background: @accent-color !important;
     }
 
-    .privacy-dropdown.active .privacy-dropdown__value > button {
+    .privacy-dropdown.active .privacy-dropdown__value > button,
+    .privacy-dropdown__value-icon.active > i {
       color: @crust !important;
     }
 
-    .privacy-dropdown__value-icon.active > {
-      color: @crust !important;
-    }
-
-    .emoji-mart-anchor-selected {
-      color: @accent-color !important;
-    }
-
-    .emoji-mart-search > input, ::placeholder {
+    .emoji-mart-search > input {
       color: @text !important;
     }
 
-    .emoji-mart-search, .language-dropdown__dropdown__results {
+    .emoji-mart-search,
+    .language-dropdown__dropdown__results {
       background: @surface0;
     }
 
@@ -372,10 +363,6 @@ domain("toot.wales") {
       background: @base;
     }
 
-    .compose-form__highlightable {
-      background-color: @base;
-    }
-
     .dropdown-button {
       border-color: @accent-color;
       color: @accent-color;
@@ -494,6 +481,8 @@ domain("toot.wales") {
     .drawer__inner,
     .drawer__inner__mastodon,
     .compose-form .autosuggest-textarea__textarea,
+    .compose-form__highlightable,
+    .column-header,
     .explore__search-header .search__input {
       background-color: @base;
     }
@@ -511,42 +500,30 @@ domain("toot.wales") {
       color: @text !important;
     }
 
-    .autosuggest-textarea__suggestions__item.selected {
-      background: @accent-color !important;
-    }
-
-    .autosuggest-textarea__suggestions__item.selected
-      > .account.small
-      .display-name {
-      > span {
-        color: @crust !important;
-      }
-      > bdi > strong {
-        color: @crust !important;
-      }
-    }
-
-    .autosuggest-textarea__suggestions__item
-      > .account.small
-      .display-name
-      > span {
-      color: @text !important;
-    }
-
+    .autosuggest-textarea__suggestions__item.selected,
     .autosuggest-textarea__suggestions__item:hover {
       background: @accent-color !important;
       .account.small .display-name {
-        > span {
+        span {
           color: @crust !important;
         }
-        > bdi > strong {
+        bdi > strong {
           color: @crust !important;
         }
       }
     }
 
+    .autosuggest-textarea__suggestions__item {
+      .account.small .display-name {
+        span {
+          color: @text !important;
+        }
+      }
+    }
+
     .compose-form .autosuggest-textarea__textarea::placeholder,
-    .spoiler-input__input::placeholder {
+    .spoiler-input__input::placeholder,
+    .emoji-mart-search > input::placeholder {
       color: @subtext0 !important;
     }