Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rules popup fix (#504)

Browse Source
This commit is contained in:
Aviu00
2023-10-20 20:55:50 +09:00
committed by Aviu00
parent c61821b105
commit 5a1ae36a83
2 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Content.Client/Info/RulesPopup.xaml
View File

@@ -5,19 +5,21 @@
MouseFilter="Stop"> MouseFilter="Stop">
<parallax:ParallaxControl /> <parallax:ParallaxControl />
<Control MaxWidth="650" MaxHeight="150"> <Control MaxWidth="650" MaxHeight="150">
<PanelContainer StyleClasses="windowPanel" /> <PanelContainer StyleClasses="BorderedWindowPanel" />
<ScrollContainer HScrollEnabled="False"> <BoxContainer Orientation="Vertical" SeparationOverride="10" VerticalAlignment="Center">
<BoxContainer Orientation="Vertical" SeparationOverride="10" VerticalAlignment="Center"> <info:RulesControl />
<info:RulesControl /> <Label Name="WaitLabel"
<Label Name="WaitLabel" /> HorizontalExpand="True"
<BoxContainer Orientation="Horizontal"> HorizontalAlignment="Center" />
<Button Name="AcceptButton" <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
Text="{Loc 'ui-rules-accept'}" <Button Name="AcceptButton"
Disabled="True" /> Text="{Loc 'ui-rules-accept'}"
<Button Name="QuitButton" Disabled="True" />
Text="{Loc 'ui-escape-quit'}" /> <Button Name="QuitButton"
</BoxContainer> HorizontalExpand="True"
HorizontalAlignment="Right"
Text="{Loc 'ui-escape-quit'}" />
</BoxContainer> </BoxContainer>
</ScrollContainer> </BoxContainer>
</Control> </Control>
</Control> </Control>

19
Content.Client/White/Rules/RulesWikiSection.xaml
View File

@@ -1,11 +1,12 @@
<BoxContainer xmlns="https://spacestation14.io" <BoxContainer xmlns="https://spacestation14.io"
Orientation="Vertical"> Orientation="Vertical" HorizontalExpand="True">
<Label Text="Правила сервера White Dream" StyleClasses="LabelHeading"/> <Label Text="Правила сервера White Dream"
<BoxContainer Orientation="Vertical"> StyleClasses="LabelHeading"
<Button Name="RulesButton" HorizontalExpand="True"
StyleClasses="ButtonColorRed" HorizontalAlignment="Center"/>
MinHeight="40" <Button Name="RulesButton"
Text="Открыть правила" StyleClasses="ButtonColorRed"
Access="Public"/> MinHeight="40"
</BoxContainer> Text="Открыть правила"
Access="Public"/>
</BoxContainer> </BoxContainer>