fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-19 18:47:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: 调整外边距和背景颜色

Browse Source
This commit is contained in:
枫雨
2023-04-13 18:48:40 +08:00
parent 6fddb85e43
commit c12a8709cd
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/MaaWpfGui/Res/Themes/Dark.xaml
View File

@@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="PallasBrush" Color="#CDD1FF" />
<SolidColorBrush x:Key="ErrorViewBackgroundBrush" Color="#2d2d30" />
<!-- See https://github.com/ghost1372/HandyControls/blob/v3.4.5/src/Shared/HandyControl_Shared/Themes/Basic/Colors/Dark.xaml -->
<!-- Latest Doc https://ghost1372.github.io/handycontrol/basic_xaml/brushes/ -->

1
src/MaaWpfGui/Res/Themes/Light.xaml
View File

@@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<SolidColorBrush x:Key="PallasBrush" Color="#6A6AAB" />
<SolidColorBrush x:Key="ErrorViewBackgroundBrush" Color="#E6E6E6" />
<SolidColorBrush x:Key="SecondaryRegionBrush" Color="#ffffff" />
</ResourceDictionary>

20
src/MaaWpfGui/Views/UI/ErrorView.xaml
View File

@@ -13,7 +13,7 @@
Title="{DynamicResource UnknownErrorOccurs}"
Width="628"
Height="475"
Background="#FFE6E6E6"
Background="{DynamicResource ErrorViewBackgroundBrush}"
ResizeMode="NoResize"
Topmost="True"
WindowStartupLocation="CenterScreen"
@@ -28,7 +28,7 @@
<controls:TextBlock
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="115,20,0,0"
Margin="75,20,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
FontWeight="Bold"
@@ -39,11 +39,11 @@
Grid.ColumnSpan="2"
Width="455"
MaxHeight="40"
Margin="140,45,0,0"
Margin="100,45,0,0"
Padding="0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Background="#FFE6E6E6"
Background="{DynamicResource ErrorViewBackgroundBrush}"
BorderThickness="0"
Text="{DynamicResource UnknownErrorOccurs}"
TextWrapping="Wrap" />
@@ -51,7 +51,7 @@
<controls:TextBlock
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="115,95,0,0"
Margin="75,95,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
FontWeight="Bold"
@@ -62,11 +62,11 @@
Grid.ColumnSpan="2"
Width="455"
MaxHeight="150"
Margin="140,120,0,0"
Margin="100,120,0,0"
Padding="0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Background="#FFE6E6E6"
Background="{DynamicResource ErrorViewBackgroundBrush}"
BorderThickness="0"
Text="{DynamicResource UnknownErrorOccurs}"
TextWrapping="Wrap" />
@@ -74,7 +74,7 @@
<controls:TextBlock
Grid.Column="0"
Grid.ColumnSpan="2"
Margin="115,170,0,0"
Margin="75,170,0,0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
FontWeight="Bold"
@@ -85,11 +85,11 @@
Grid.ColumnSpan="2"
Width="455"
MaxHeight="150"
Margin="140,195,0,0"
Margin="100,195,0,0"
Padding="0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Background="#FFE6E6E6"
Background="{DynamicResource ErrorViewBackgroundBrush}"
BorderThickness="0"
Text="{DynamicResource UnknownErrorOccurs}"
TextWrapping="Wrap" />