Merge branch 'xMAC94x/mastodon' into 'master'

add mastodon color scheme See merge request veloren/airshipper!91
veloren · Nov 29, 2022 · 90daa44 · 90daa44
2 parents b4fa4ec + 713add3
commit 90daa44
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/client/src/gui/components/server_browser_panel.rs b/client/src/gui/components/server_browser_panel.rs
@@ -454,6 +454,9 @@ impl ServerBrowserPanelComponent {
                                             {
                                                 button.style(YoutubeBrowserButtonStyle)
                                             },
+                                            "mastodon" => {
+                                                button.style(MastodonBrowserButtonStyle)
+                                            },
                                             _ => button.style(ExtraBrowserStyle),
                                         };
                                         extras = extras.push(button);

diff --git a/client/src/gui/style.rs b/client/src/gui/style.rs
@@ -26,6 +26,7 @@ pub const DARK_WHITE: Color = Color::from_rgb(0.9, 0.9, 0.9);
 const BACKGROUND_BLUE: Color = Color::from_rgb(0.14, 0.21, 0.41);
 const LIME_GREEN: Color = Color::from_rgb(0.41, 0.64, 0.26);
 const DISCORD_BLURPLE: Color = rgb8(88, 101, 242);
+const MASTODON_PURPLE: Color = rgb8(99, 100, 255);
 const REDDIT_ORANGE: Color = rgb8(255, 69, 0);
 const YOUTUBE_RED: Color = rgb8(255, 0, 0);
 const CORNFLOWER_BLUE: Color = Color::from_rgb(0.19, 0.4, 0.85);
@@ -268,6 +269,17 @@ impl button::StyleSheet for DiscordBrowserButtonStyle {
     }
 }
 
+pub struct MastodonBrowserButtonStyle;
+impl button::StyleSheet for MastodonBrowserButtonStyle {
+    fn active(&self) -> Style {
+        Style {
+            background: Some(Background::Color(MASTODON_PURPLE)),
+            border_radius: 25.0,
+            ..button::Style::default()
+        }
+    }
+}
+
 pub struct RedditBrowserButtonStyle;
 impl button::StyleSheet for RedditBrowserButtonStyle {
     fn active(&self) -> Style {