From 5a1ae36a8327c12e311e5b1913657ceb6495c6c2 Mon Sep 17 00:00:00 2001
From: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Date: Fri, 20 Oct 2023 20:55:50 +0900
Subject: [PATCH] Rules popup fix (#504)

---
 Content.Client/Info/RulesPopup.xaml           | 28 ++++++++++---------
 .../White/Rules/RulesWikiSection.xaml         | 19 +++++++------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/Content.Client/Info/RulesPopup.xaml b/Content.Client/Info/RulesPopup.xaml
index 9573589c30..26ab98ba18 100644
--- a/Content.Client/Info/RulesPopup.xaml
+++ b/Content.Client/Info/RulesPopup.xaml
@@ -5,19 +5,21 @@
          MouseFilter="Stop">
     <parallax:ParallaxControl />
     <Control MaxWidth="650" MaxHeight="150">
-        <PanelContainer StyleClasses="windowPanel" />
-        <ScrollContainer HScrollEnabled="False">
-            <BoxContainer Orientation="Vertical" SeparationOverride="10" VerticalAlignment="Center">
-                <info:RulesControl />
-                <Label Name="WaitLabel" />
-                <BoxContainer Orientation="Horizontal">
-                    <Button Name="AcceptButton"
-                            Text="{Loc 'ui-rules-accept'}"
-                            Disabled="True" />
-                    <Button Name="QuitButton"
-                            Text="{Loc 'ui-escape-quit'}" />
-                </BoxContainer>
+        <PanelContainer StyleClasses="BorderedWindowPanel" />
+        <BoxContainer Orientation="Vertical" SeparationOverride="10" VerticalAlignment="Center">
+            <info:RulesControl />
+            <Label Name="WaitLabel"
+                   HorizontalExpand="True"
+                   HorizontalAlignment="Center" />
+            <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+                <Button Name="AcceptButton"
+                        Text="{Loc 'ui-rules-accept'}"
+                        Disabled="True" />
+                <Button Name="QuitButton"
+                        HorizontalExpand="True"
+                        HorizontalAlignment="Right"
+                        Text="{Loc 'ui-escape-quit'}" />
             </BoxContainer>
-        </ScrollContainer>
+        </BoxContainer>
     </Control>
 </Control>
diff --git a/Content.Client/White/Rules/RulesWikiSection.xaml b/Content.Client/White/Rules/RulesWikiSection.xaml
index efb136fa3f..91130105e8 100644
--- a/Content.Client/White/Rules/RulesWikiSection.xaml
+++ b/Content.Client/White/Rules/RulesWikiSection.xaml
@@ -1,11 +1,12 @@
 <BoxContainer xmlns="https://spacestation14.io"
-              Orientation="Vertical">
-    <Label Text="Правила сервера White Dream" StyleClasses="LabelHeading"/>
-    <BoxContainer Orientation="Vertical">
-        <Button Name="RulesButton"
-                StyleClasses="ButtonColorRed"
-                MinHeight="40"
-                Text="Открыть правила"
-                Access="Public"/>
-    </BoxContainer>
+              Orientation="Vertical" HorizontalExpand="True">
+    <Label Text="Правила сервера White Dream"
+           StyleClasses="LabelHeading"
+           HorizontalExpand="True"
+           HorizontalAlignment="Center"/>
+    <Button Name="RulesButton"
+            StyleClasses="ButtonColorRed"
+            MinHeight="40"
+            Text="Открыть правила"
+            Access="Public"/>
 </BoxContainer>