From 6517b7b9f02f8590a8f9c5aa04e3ef9efeb4e757 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 25 Nov 2022 13:54:43 +0100
Subject: [PATCH 1/4] Fix pillbar buttons in light theme (#1972)

* Simplify pillbar button design and make it more consistent with toggles

* Fix pillbar buttons in light theme

Fixes #1970
---
 .../glitch/styles/components/columns.scss     | 35 ++++---------------
 .../glitch/styles/mastodon-light/diff.scss    | 20 +++++++++++
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/app/javascript/flavours/glitch/styles/components/columns.scss b/app/javascript/flavours/glitch/styles/components/columns.scss
index c61815e078..71edf7fb3b 100644
--- a/app/javascript/flavours/glitch/styles/components/columns.scss
+++ b/app/javascript/flavours/glitch/styles/components/columns.scss
@@ -558,6 +558,7 @@ $ui-header-height: 55px;
   border-radius: 4px;
   margin-bottom: 10px;
   align-items: stretch;
+  gap: 2px;
 }
 
 .pillbar-button {
@@ -565,7 +566,6 @@ $ui-header-height: 55px;
   color: #fafafa;
   padding: 2px;
   margin: 0;
-  margin-left: 2px;
   font-size: inherit;
   flex: auto;
   background-color: $ui-base-color;
@@ -578,43 +578,20 @@ $ui-header-height: 55px;
   }
 
   &:not([disabled]) {
-    &:hover {
+    &:hover,
+    &:focus {
       background-color: darken($ui-base-color, 10%);
     }
 
-    &:focus {
-      background-color: darken($ui-base-color, 15%);
-    }
-
-    &:active {
-      background-color: darken($ui-base-color, 20%);
-    }
-
     &.active {
-      background-color: $ui-highlight-color;
-      box-shadow: inset 0 5px darken($ui-highlight-color, 20%);
-
-      &:hover {
-        background-color: lighten($ui-highlight-color, 10%);
-        box-shadow: inset 0 5px darken($ui-highlight-color, 10%);
-      }
+      background-color: darken($ui-highlight-color, 2%);
 
+      &:hover,
       &:focus {
-        background-color: lighten($ui-highlight-color, 15%);
-        box-shadow: inset 0 5px darken($ui-highlight-color, 5%);
-      }
-
-      &:active {
-        background-color: lighten($ui-highlight-color, 20%);
-        box-shadow: inset 0 5px $ui-highlight-color;
+        background-color: $ui-highlight-color;
       }
     }
   }
-
-  /* TODO: check RTL? */
-  &:first-child {
-    margin-left: 0;
-  }
 }
 
 .limited-account-hint {
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
index 6489c2f805..9fc1aed2a2 100644
--- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
+++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
@@ -712,6 +712,26 @@ html {
 
 // Glitch-soc-specific changes
 
+.pillbar-button {
+  background: $ui-secondary-color;
+
+  &:not([disabled]) {
+    &:hover,
+    &:focus {
+      background: darken($ui-secondary-color, 10%);
+    }
+
+    &.active {
+      background-color: darken($ui-highlight-color, 2%);
+
+      &:hover,
+      &:focus {
+        background: lighten($ui-highlight-color, 10%);
+      }
+    }
+  }
+}
+
 .glitch.local-settings {
   background: $ui-base-color;
   border: 1px solid lighten($ui-base-color, 8%);

From cf4ef1d724a7d110e4648ea76362e2a195c9bac8 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 26 Nov 2022 14:24:05 +0100
Subject: [PATCH 2/4] Try Ruby 3.1.3 (requires OpenSSL 3)

---
 .gitignore    | 3 +++
 .ruby-version | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7d76b82751..882fd8de41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,6 @@ yarn-debug.log
 
 # Ignore Docker option files
 docker-compose.override.yml
+
+# Ignore for push
+.ruby-version
diff --git a/.ruby-version b/.ruby-version
index b0f2dcb32f..ff365e06b9 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.0.4
+3.1.3

From 21f4a310a7849ec312f47ac69f3945a85978f7ba Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 26 Nov 2022 14:37:19 +0100
Subject: [PATCH 3/4] Move to Ruby 3.0.5

---
 .gitignore    | 3 ---
 .ruby-version | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 882fd8de41..7d76b82751 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,3 @@ yarn-debug.log
 
 # Ignore Docker option files
 docker-compose.override.yml
-
-# Ignore for push
-.ruby-version
diff --git a/.ruby-version b/.ruby-version
index ff365e06b9..eca690e737 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.1.3
+3.0.5

From 0897c13799d5aa1499340c4b492b9b851cb322e8 Mon Sep 17 00:00:00 2001
From: Jeremy Kescher <jeremy@kescher.at>
Date: Sat, 26 Nov 2022 14:42:36 +0100
Subject: [PATCH 4/4] v4.0.2+1.0.5

---
 lib/mastodon/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 0435bb6b4d..4007b9030f 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -25,7 +25,7 @@ module Mastodon
     end
 
     def suffix_version
-      '+1.0.4'
+      '+1.0.5'
     end
 
     def to_a