Merge pull request #684 from fospas/new_lobby

new color lobby
fospas · Dec 9, 2024 · 6468162 · 6468162
2 parents 2d0ffb3 + c7bdf08
commit 6468162
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 33 deletions.
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml.cs b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
@@ -76,4 +76,4 @@ public enum LobbyGuiState : byte
             CharacterSetup
         }
     }
-}
+}
diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
@@ -90,20 +90,18 @@ public sealed class StyleNano : StyleBase
 
         public static readonly Color PanelDark = Color.FromHex("#1E1E22");
 
-        public static readonly Color NanoGold = Color.FromHex("#A88B5E");
+        public static readonly Color NanoGold = Color.FromHex("#5d95a6");
         public static readonly Color GoodGreenFore = Color.FromHex("#31843E");
         public static readonly Color ConcerningOrangeFore = Color.FromHex("#A5762F");
         public static readonly Color DangerousRedFore = Color.FromHex("#BB3232");
-        public static readonly Color DisabledFore = Color.FromHex("#5A5A5A");
+        public static readonly Color DisabledFore = Color.FromHex("#73b5ca");
 
-        // BACKMEN EDIT START
-        public static readonly Color ButtonColorDefault = Color.FromHex("#29282f");
-        public static readonly Color ButtonColorDefaultRed = Color.FromHex("#992327");
-        public static readonly Color ButtonColorHovered = Color.FromHex("#3f3d48");
-        public static readonly Color ButtonColorHoveredRed = Color.FromHex("#4D5D53");
-        public static readonly Color ButtonColorPressed = Color.FromHex("#0f0f0f");
-        public static readonly Color ButtonColorDisabled = Color.FromHex("#0f0f0f");
-        // BACKMEN EDIT END
+        public static readonly Color ButtonColorDefault = Color.FromHex("#363847");
+        public static readonly Color ButtonColorDefaultRed = Color.FromHex("#f39c3e");
+        public static readonly Color ButtonColorHovered = Color.FromHex("#aec3c4");
+        public static readonly Color ButtonColorHoveredRed = Color.FromHex("#DF6B6B");
+        public static readonly Color ButtonColorPressed = Color.FromHex("#598a78");
+        public static readonly Color ButtonColorDisabled = Color.FromHex("#12362e");
 
 
         public static readonly Color ButtonColorCautionDefault = Color.FromHex("#ab3232");
@@ -121,8 +119,8 @@ public sealed class StyleNano : StyleBase
 
         // Context menu button colors
         public static readonly Color ButtonColorContext = Color.FromHex("#1119");
-        public static readonly Color ButtonColorContextHover = Color.DarkSlateGray;
-        public static readonly Color ButtonColorContextPressed = Color.LightSlateGray;
+        public static readonly Color ButtonColorContextHover = Color.FromHex("#575b61");
+        public static readonly Color ButtonColorContextPressed = Color.FromHex("#3e6c45");
         public static readonly Color ButtonColorContextDisabled = Color.Black;
 
         // Examine button colors
@@ -155,7 +153,7 @@ public sealed class StyleNano : StyleBase
         public const string StyleClassButtonColorRed = "ButtonColorRed";
         public const string StyleClassButtonColorGreen = "ButtonColorGreen";
 
-        public static readonly Color ChatBackgroundColor = Color.FromHex("#25252ADD");
+        public static readonly Color ChatBackgroundColor = Color.FromHex("#151a23");
 
         //Bwoink
         public const string StyleClassPinButtonPinned = "pinButtonPinned";
@@ -509,7 +507,7 @@ public StyleNano(IResourceCache resCache) : base(resCache)
             var sliderFillBox = new StyleBoxTexture
             {
                 Texture = sliderFillTex,
-                Modulate = Color.FromHex("#663399")
+                Modulate = Color.FromHex("#3E6C45")
             };
 
             var sliderBackBox = new StyleBoxTexture
@@ -1428,7 +1426,7 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                 // Different Background shapes ---
                 Element<PanelContainer>().Class(ClassAngleRect)
                     .Prop(PanelContainer.StylePropertyPanel, BaseAngleRect)
-                    .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#0f0f0f")), // BACKMEN EDIT
+                    .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#25252A")),
 
                 Element<PanelContainer>().Class("BackgroundOpenRight")
                     .Prop(PanelContainer.StylePropertyPanel, BaseButtonOpenRight)
@@ -1443,7 +1441,7 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                 Element<PanelContainer>().Class(ClassLowDivider)
                     .Prop(PanelContainer.StylePropertyPanel, new StyleBoxFlat
                     {
-                        BackgroundColor = Color.FromHex("#25252A"),
+                        BackgroundColor = Color.FromHex("#444"),
                         ContentMarginLeftOverride = 2,
                         ContentMarginBottomOverride = 2
                     }),
@@ -1474,11 +1472,11 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                 //The lengths you have to go through to change a background color smh
                 Element<PanelContainer>().Class("PanelBackgroundBaseDark")
                     .Prop("panel", new StyleBoxTexture(BaseButtonOpenBoth) { Padding = default })
-                    .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#1F1F23")),
+                    .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#111212")),
 
                 Element<PanelContainer>().Class("PanelBackgroundLight")
                     .Prop("panel", new StyleBoxTexture(BaseButtonOpenBoth) { Padding = default })
-                    .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#2F2F3B")),
+                    .Prop(Control.StylePropertyModulateSelf, Color.FromHex("#24252e")),
 
                 // Window Footer
                 Element<TextureRect>().Class("NTLogoDark")
@@ -1743,7 +1741,6 @@ public StyleNano(IResourceCache resCache) : base(resCache)
                     {
                         new StyleProperty(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Bwoink/un_pinned.png"))
                     })
-
             }).ToList());
         }
     }

diff --git a/Content.Client/UserInterface/Controls/MenuButton.cs b/Content.Client/UserInterface/Controls/MenuButton.cs
@@ -15,14 +15,13 @@ public sealed class MenuButton : ContainerButton
     public const string StyleClassLabelTopButton = "topButtonLabel";
     public const string StyleClassRedTopButton = "topButtonLabel";
 
-    private static readonly Color ColorNormal = Color.FromHex("#5a5a5a");
-    private static readonly Color ColorRedNormal = Color.FromHex("#640000");
-    private static readonly Color ColorHovered = Color.FromHex("#646464");
-    private static readonly Color ColorRedHovered = Color.FromHex("#960000");
-    private static readonly Color ColorPressed = Color.FromHex("#464646");
-
-    private const float HorPad = 8f;
-    private const float VertPad = 4f;
+    private static readonly Color ColorNormal = Color.FromHex("#7b7e7e");
+    private static readonly Color ColorRedNormal = Color.FromHex("#FEFEFE");
+    private static readonly Color ColorHovered = Color.FromHex("#969999");
+    private static readonly Color ColorRedHovered = Color.FromHex("#FFFFFF");
+    private static readonly Color ColorPressed = Color.FromHex("#789B8C");
+
+    private const float VertPad = 8f;
     private Color NormalColor => HasStyleClass(StyleClassRedTopButton) ? ColorRedNormal : ColorNormal;
     private Color HoveredColor => HasStyleClass(StyleClassRedTopButton) ? ColorRedHovered : ColorHovered;
 
@@ -51,7 +50,7 @@ public MenuButton()
         IoCManager.InjectDependencies(this);
         _buttonIcon = new TextureRect()
         {
-            TextureScale = new Vector2(1f, 1f),
+            TextureScale = new Vector2(0.5f, 0.5f),
             HorizontalAlignment = HAlignment.Center,
             VerticalAlignment = VAlignment.Center,
             VerticalExpand = true,
@@ -68,7 +67,7 @@ public MenuButton()
         };
         _root = new BoxContainer
         {
-            Orientation = BoxContainer.LayoutOrientation.Horizontal,
+            Orientation = BoxContainer.LayoutOrientation.Vertical,
             Children =
             {
                 _buttonIcon,

diff --git a/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml b/Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml
@@ -30,7 +30,7 @@
         </LayoutContainer>
         <PanelContainer Name="SeparatedChatPanel" MinWidth="300">
             <PanelContainer.PanelOverride>
-                <graphics:StyleBoxFlat BackgroundColor="#1e1e22" />
+                <graphics:StyleBoxFlat BackgroundColor="#2B2C3B" />
             </PanelContainer.PanelOverride>
 
             <BoxContainer Orientation="Vertical" HorizontalExpand="True" SeparationOverride="10" Margin="10">

diff --git a/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterButton.cs b/Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterButton.cs
@@ -7,8 +7,8 @@ namespace Content.Client.UserInterface.Systems.Chat.Controls;
 
 public sealed class ChannelFilterButton : ChatPopupButton<ChannelFilterPopup>
 {
-    private static readonly Color ColorNormal = Color.FromHex("#4b4e66");
-    private static readonly Color ColorHovered = Color.FromHex("#777ba6");
+    private static readonly Color ColorNormal = Color.FromHex("#7b7e9e");
+    private static readonly Color ColorHovered = Color.FromHex("#9699bb");
     private static readonly Color ColorPressed = Color.FromHex("#789B8C");
     private readonly TextureRect? _textureRect;
     private readonly ChatUIController _chatUIController;

diff --git a/Resources/Fonts/NASDAQER.ttf b/Resources/Fonts/NASDAQER.ttf
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,4 +76,4 @@ public enum LobbyGuiState : byte @@
                 CharacterSetup
             }
         }
-    }
+    }