Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Default Color Adjustments and Consistency for Accessibility #514

Merged
merged 3 commits into from
Dec 11, 2024
Merged

Default Color Adjustments and Consistency for Accessibility #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6be5c9
Updated: LoaderSettingsWarning style to TextblockWithColourChange
dreamsyntax Dec 10, 2024
de03109
Updated: HalogenTheme update to themeBase 3.2.3
dreamsyntax Dec 10, 2024
3f0c7b9
Updated: Reloaded.WPF & Theme.Default
dreamsyntax Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/Reloaded.Mod.Launcher/Pages/BaseSubpages/SettingsPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
HorizontalAlignment="Center"
TextWrapping="Wrap"
FontSize="{DynamicResource FontSizeLarge}"
Style="{DynamicResource RIIDefaultTextBlock}"
Style="{DynamicResource TextblockWithColourChange}"
Margin="{DynamicResource CommonItemVerticalMargin}"/>

<!-- Settings -->
Expand Down
4 changes: 2 additions & 2 deletions source/Reloaded.Mod.Launcher/Reloaded.Mod.Launcher.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
</PackageReference>
<PackageReference Include="Reloaded.Input" Version="2.2.0" />
<PackageReference Include="Reloaded.Memory" Version="9.4.2" />
<PackageReference Include="Reloaded.WPF" Version="3.3.1" />
<PackageReference Include="Reloaded.WPF.Theme.Default" Version="3.2.1" />
<PackageReference Include="Reloaded.WPF" Version="3.3.2" />
<PackageReference Include="Reloaded.WPF.Theme.Default" Version="3.2.3" />
<PackageReference Include="Sewer56.UI.Controller.Core" Version="1.1.0" />
<PackageReference Include="Sewer56.UI.Controller.ReloadedInput.Configurator" Version="1.2.3" />
<PackageReference Include="Sewer56.UI.Controller.WPF" Version="1.1.3" />
Expand Down
13 changes: 10 additions & 3 deletions source/Reloaded.Mod.Launcher/Theme/Halogen/Styles.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,6 @@

<!-- Checkbox -->
<Style x:Key="DefaultCheckBoxBase" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource BaseStyle}">

<Setter Property="Background" Value="{StaticResource BorderColorBrush}"/>
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="Height" Value="{DynamicResource CheckboxSize}" />
Expand Down Expand Up @@ -532,9 +531,17 @@
</Style>

<Style x:Key="DefaultCheckBox" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource DefaultCheckBoxBase}">

<!-- Colour the checkbox. -->
<Style.Triggers>
<!-- Colour text content on IsMouseOver. -->
<Trigger Property="IsMouseOver" Value="True">
<Trigger.EnterActions>
<BeginStoryboard Storyboard="{StaticResource ForegroundFadeTextToAccentLightest}"/>
</Trigger.EnterActions>
<Trigger.ExitActions>
<BeginStoryboard Storyboard="{StaticResource ForegroundFadeAccentLightestToText}"/>
</Trigger.ExitActions>
</Trigger>
<!-- Colour the checkbox. -->
<Trigger Property="IsChecked" Value="True">
<Trigger.EnterActions>
<BeginStoryboard Storyboard="{StaticResource BackgroundFadeBorderToAccentLighter}"/>
Expand Down
Loading