Fix navbar colors
MODIFY
WalletWasabi.Fluent/Controls/NavBarItem.axaml
WalletWasabi.Fluent/Controls/NavBarItem.axaml
<Style Selector="c|NavBarItem">
<Setter Property="Background" Value="Transparent" />
+ <Setter Property="TextBlock.Foreground" Value="{DynamicResource NavBarItemForegroundBrush}" />
</Style>
<Style Selector="c|NavBarItem:vertical">
<!-- Disabled State -->
<Style Selector="c|NavBarItem:disabled /template/ ContentPresenter#PART_ContentPresenter">
- <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlDisabledBaseMediumLowBrush}" />
+ <Setter Property="TextBlock.Foreground" Value="{DynamicResource NavBarItemDisabledBrush}" />
</Style>
<!-- PointerOver State -->
<Style Selector="c|NavBarItem:pointerover /template/ ContentPresenter#PART_ContentPresenter">
- <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+ <Setter Property="TextBlock.Foreground" Value="{DynamicResource NavBarItemPointerOverBrush}" />
</Style>
<Style Selector="c|NavBarItem:pointerover /template/ Border#Indicator_Backdrop">
- <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}" />
+ <Setter Property="Background" Value="{DynamicResource NavBarItemPointerOverBackgroundBrush}" />
</Style>
<!-- Pressed State -->
<Style Selector="c|NavBarItem:pressed /template/ Border#Indicator">
- <Setter Property="Background" Value="{DynamicResource NavBarAccentColorLight1}" />
+ <Setter Property="Background" Value="{DynamicResource NavBarItemPressedAccentColor}" />
</Style>
<Style Selector="c|NavBarItem:pressed /template/ ContentPresenter#PART_ContentPresenter">
- <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+ <Setter Property="TextBlock.Foreground" Value="{DynamicResource NavBarItemPressedBrush}" />
</Style>
<Style Selector="c|NavBarItem:pressed">
<Setter Property="RenderTransform" Value="scale(0.98)" />
<Setter Property="RenderTransform" Value="scaleY(1)" />
</Style>
<Style Selector="c|NavBarItem:selected /template/ ContentPresenter#PART_ContentPresenter">
- <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+ <Setter Property="TextBlock.Foreground" Value="{DynamicResource NavBarItemSelectedBrush}" />
</Style>
<!-- Selected Unfocused State -->
<Style Selector="c|NavBarItem:selected:not(:focus) /template/ ContentPresenter#PART_ContentPresenter">
- <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+ <Setter Property="TextBlock.Foreground" Value="{DynamicResource NavBarItemSelectedUnfocusedBrush}" />
</Style>
<!-- Selected PointerOver State -->
<Style Selector="c|NavBarItem:selected:pointerover /template/ Border">
- <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColor}" />
+ <Setter Property="BorderBrush" Value="{DynamicResource NavBarAccentColor}" />
</Style>
<Style Selector="c|NavBarItem:selected:pointerover /template/ ContentPresenter#PART_ContentPresenter">
- <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+ <Setter Property="TextBlock.Foreground" Value="{DynamicResource NavBarItemSelectedPointerOverBrush}" />
</Style>
<!-- Selected Pressed State -->
<Style Selector="c|NavBarItem:selected:pressed /template/ Border">
- <Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColorLight1}" />
+ <Setter Property="BorderBrush" Value="{DynamicResource NavBarAccentColorLight}" />
</Style>
<Style Selector="c|NavBarItem:selected:pressed /template/ ContentPresenter#PART_ContentPresenter">
- <Setter Property="TextBlock.Foreground" Value="{DynamicResource SystemControlHighlightAltBaseHighBrush}" />
+ <Setter Property="TextBlock.Foreground" Value="{DynamicResource NavBarItemSelectedPressedBrush}" />
</Style>
</Styles>
\ No newline at end of file

MODIFY
WalletWasabi.Fluent/Styles/Themes/Base.axaml
WalletWasabi.Fluent/Styles/Themes/Base.axaml
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Styles.Resources>
- <Color x:Key="SystemAltHighColor">#134074</Color>
<Color x:Key="SystemErrorTextColor">#D85050</Color>
+ <Color x:Key="NavBarTintColor">#134074</Color>
+ <Color x:Key="AcrylicFallbackColor">#1F1F1F</Color>
+
+ <SolidColorBrush x:Key="NavBarAccentColor">#97D234</SolidColorBrush>
+ <SolidColorBrush x:Key="NavBarAccentColorLight">#719B2A</SolidColorBrush>
+ <SolidColorBrush x:Key="NavBarItemPressedAccentColor">#719B2A</SolidColorBrush>
+ <SolidColorBrush x:Key="NavBarItemDisabledBrush">#66FFFFFF</SolidColorBrush>
+ <SolidColorBrush x:Key="NavBarItemPointerOverBrush">#FFFFFFFF</SolidColorBrush>
+ <SolidColorBrush x:Key="NavBarItemPointerOverBackgroundBrush">#19FFFFFF</SolidColorBrush>
+ <SolidColorBrush x:Key="NavBarItemPressedBrush">#FFFFFFFF</SolidColorBrush>
+ <SolidColorBrush x:Key="NavBarItemSelectedBrush">#FFFFFFFF</SolidColorBrush>
+ <SolidColorBrush x:Key="NavBarItemSelectedUnfocusedBrush">#FFFFFFFF</SolidColorBrush>
+ <SolidColorBrush x:Key="NavBarItemSelectedPointerOverBrush">#FFFFFFFF</SolidColorBrush>
+ <SolidColorBrush x:Key="NavBarItemSelectedPressedBrush">#FFFFFFFF</SolidColorBrush>
+ <SolidColorBrush x:Key="NavBarItemForegroundBrush">#FFFFFFFF</SolidColorBrush>
+ <SolidColorBrush x:Key="NavBarSeparatorBrush">#FFFFFFFF</SolidColorBrush>
<Color x:Key="LogoFixedAccentColor">#97D234</Color>
<Color x:Key="LogoFixedForegroundColor">#D8DED7</Color>
- <SolidColorBrush x:Key="TextControlBorderBrushFocused" Color="{StaticResource SystemAccentColor}" />
<SolidColorBrush x:Key="ActionButtonForegroundColor">#FFFFFF</SolidColorBrush>
<SolidColorBrush x:Key="ActionButtonBackgroundColor" Color="{StaticResource SystemAccentColor}" />
<SolidColorBrush x:Key="ActionButtonPressedBackgroundColor" Color="#59B164" />

MODIFY
WalletWasabi.Fluent/Styles/Themes/BaseDark.axaml
WalletWasabi.Fluent/Styles/Themes/BaseDark.axaml
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Styles.Resources>
- <Color x:Key="SystemAccentColor">#FF97D234</Color>
- <Color x:Key="NavBarAccentColorLight1">#FF6BA700</Color>
- <Color x:Key="NavBarAccentColor">#FF97D234</Color>
+ <Color x:Key="SystemAccentColor">#97D234</Color>
+
+ <Color x:Key="FeeChartAreaGradientStartStopColor">#FF00FF00</Color>
+ <Color x:Key="FeeChartAreaGradientEndStopColor">#FF0000FF</Color>
+ <Color x:Key="FeeChartLineColor">#97D234</Color>
+
+ <SolidColorBrush x:Key="TextControlBackground">#1A8093AE</SolidColorBrush>
+ <SolidColorBrush x:Key="TextControlBackgroundFocused">#1A8093AE</SolidColorBrush>
+ <SolidColorBrush x:Key="TextControlBackgroundPointerOver">#1A8093AE</SolidColorBrush>
+
+ <SolidColorBrush x:Key="TextControlBorderBrushFocused">#FF8093AE</SolidColorBrush>
+ <SolidColorBrush x:Key="TextControlBorderBrush">#338093AE</SolidColorBrush>
+ <SolidColorBrush x:Key="TextControlBorderBrushPointerOver">#4d8093AE</SolidColorBrush>
- <SolidColorBrush x:Key="TextControlBackground">#2F2F2F</SolidColorBrush>
- <SolidColorBrush x:Key="TextControlBackgroundFocused">#2F2F2F</SolidColorBrush>
- <SolidColorBrush x:Key="TextControlBackgroundPointerOver">#2F2F2F</SolidColorBrush>
<SolidColorBrush x:Key="TextControlForeground">#FFFFFF</SolidColorBrush>
<SolidColorBrush x:Key="TextForegroundColor">#FFFFFF</SolidColorBrush>
- <SolidColorBrush x:Key="TextControlBorderBrush">#434343</SolidColorBrush>
- <SolidColorBrush x:Key="TextControlBorderBrushPointerOver">#434343</SolidColorBrush>
<SolidColorBrush x:Key="StatusBarControlBackground">#191919</SolidColorBrush>
<SolidColorBrush x:Key="StatusBarControlForeground">#A3A3A3</SolidColorBrush>
- <Color x:Key="AcrylicFallbackColor">#1F1F1F</Color>
<SolidColorBrush x:Key="InvisibleButtonBackgroundColor">Transparent</SolidColorBrush>
<SolidColorBrush x:Key="InvisibleButtonPointerOverBackgroundColor">#2FFFFFFF</SolidColorBrush>
<SolidColorBrush x:Key="InvisibleButtonPressedBackgroundColor">#3FFFFFFF</SolidColorBrush>

MODIFY
WalletWasabi.Fluent/Styles/Themes/BaseLight.axaml
WalletWasabi.Fluent/Styles/Themes/BaseLight.axaml
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Styles.Resources>
<Color x:Key="SystemAccentColor">#78A827</Color>
- <Color x:Key="NavBarAccentColorLight1">#6BA700</Color>
- <Color x:Key="NavBarAccentColor">#97D234</Color>
<SolidColorBrush x:Key="TextControlBackground">#EFEFEF</SolidColorBrush>
<SolidColorBrush x:Key="TextControlBackgroundFocused">#EFEFEF</SolidColorBrush>
<SolidColorBrush x:Key="TextControlBackgroundPointerOver">#EFEFEF</SolidColorBrush>
+
<SolidColorBrush x:Key="TextControlForeground">#212121</SolidColorBrush>
<SolidColorBrush x:Key="TextForegroundColor">#212121</SolidColorBrush>
<SolidColorBrush x:Key="TextControlBorderBrush">#33323232</SolidColorBrush>
<SolidColorBrush x:Key="TextControlBorderBrushPointerOver">#33323232</SolidColorBrush>
+
<SolidColorBrush x:Key="StatusBarControlBackground">#ECECEC</SolidColorBrush>
<SolidColorBrush x:Key="StatusBarControlForeground">#777777</SolidColorBrush>
<Color x:Key="AcrylicFallbackColor">#134074</Color>

MODIFY
WalletWasabi.Fluent/Views/MainView.axaml
WalletWasabi.Fluent/Views/MainView.axaml
<ExperimentalAcrylicBorder DockPanel.Dock="Left" IsHitTestVisible="False">
<ExperimentalAcrylicBorder.Material>
<ExperimentalAcrylicMaterial BackgroundSource="Digger"
- TintColor="{DynamicResource SystemAltHighColor}"
+ TintColor="{DynamicResource NavBarTintColor}"
TintOpacity="1"
FallbackColor="{DynamicResource AcrylicFallbackColor}"
MaterialOpacity="0.55" />
</SplitView.Pane>
<Panel>
<DockPanel>
- <Panel Background="{DynamicResource RegionColor}" DockPanel.Dock="Bottom" VerticalAlignment="Bottom" Height="32">
+ <Panel Background="{DynamicResource RegionColor}" DockPanel.Dock="Bottom" VerticalAlignment="Bottom"
+ Height="32">
<statusBar:StatusBar DataContext="{Binding StatusBar}" />
</Panel>
<Panel>

MODIFY
WalletWasabi.Fluent/Views/NavBar/NavBar.axaml
WalletWasabi.Fluent/Views/NavBar/NavBar.axaml
<Setter Property="Margin" Value="13 0 0 0" />
<Setter Property="Height" Value="18" />
<Setter Property="Width" Value="18" />
+ <Setter Property="Foreground" Value="{DynamicResource NavBarItemForegroundBrush}" />
+ </Style>
+ <Style Selector="TextBlock.headerText">
+ <Setter Property="FontSize" Value="14" />
+ <Setter Property="Margin" Value="25 15 0 12" />
+ <Setter Property="Opacity" Value="0.8" />
+ <Setter Property="FontWeight" Value="Light" />
+ <Setter Property="Foreground" Value="{DynamicResource NavBarItemForegroundBrush}" />
</Style>
<Style Selector="Separator">
- <Setter Property="Background" Value="{DynamicResource SystemControlForegroundBaseMediumLowBrush}" />
+ <Setter Property="Background" Value="{DynamicResource NavBarSeparatorBrush}" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="Margin" Value="{DynamicResource MenuFlyoutSeparatorThemePadding}" />
<Setter Property="Height" Value="{DynamicResource MenuFlyoutSeparatorThemeHeight}" />
<Setter Property="IsEnabled" Value="{Binding IsEnabled}" x:CompileBindings="False" />
</Style>
<Style Selector="ListBox.vertical > c|NavBarItem:disabled PathIcon">
- <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+ <Setter Property="Foreground" Value="{DynamicResource NavBarItemDisabledBrush}" />
</Style>
<Style Selector="ListBox.horizontal > c|NavBarItem">
<Setter Property="IndicatorOrientation" Value="Horizontal" />
<Setter Property="IsEnabled" Value="{Binding IsEnabled}" x:CompileBindings="False" />
</Style>
<Style Selector="ListBox.horizontal > c|NavBarItem:disabled PathIcon">
- <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+ <Setter Property="Foreground" Value="{DynamicResource NavBarItemDisabledBrush}" />
</Style>
<Style Selector="c|NavBarTreeItem">
<Setter Property="IsExpanded" Value="{Binding IsExpanded}" x:CompileBindings="False" />
+ <Setter Property="TextBlock.Foreground" Value="{DynamicResource NavBarItemForegroundBrush}" />
</Style>
<Style Selector=":is(Button).NavButton">
<Setter Property="Width" Value="{DynamicResource SplitViewCompactPaneLength}" />
<Setter Property="Padding" Value="12,9,12,12" />
</Style>
<Style Selector=":is(Button).NavButton:disabled > PathIcon">
- <Setter Property="Foreground" Value="{DynamicResource ButtonForegroundDisabled}" />
+ <Setter Property="Foreground" Value="{DynamicResource NavBarItemDisabledBrush}" />
</Style>
<Style Selector=":is(Button).NavButton /template/ ContentPresenter">
<Setter Property="Background" Value="Transparent" />
<Setter Property="Background" Value="Transparent" />
</Style>
<Style Selector=":is(Button):pointerover /template/ ContentPresenter#PART_ContentPresenter">
- <Setter Property="Background" Value="{DynamicResource SystemControlHighlightListLowBrush}" />
+ <Setter Property="Background" Value="{DynamicResource NavBarItemPointerOverBackgroundBrush}" />
</Style>
</UserControl.Styles>
<DockPanel Margin="0 0 0 4">
<Panel Height="30" />
<Border Padding="12 12 12 5" Margin="0,-3 ,0,4">
<StackPanel Orientation="Horizontal" VerticalAlignment="Center">
- <ContentControl Template="{DynamicResource wasabi_logo_dynamic}" Margin="13,0,0,0" VerticalAlignment="Center" />
- <ContentControl Template="{DynamicResource wasabi_logo_text_dynamic}" Margin="22,0,0,0"
+ <ContentControl Template="{DynamicResource wasabi_logo_fixed}" Margin="13,0,0,0" VerticalAlignment="Center" />
+ <ContentControl Template="{DynamicResource wasabi_logo_text_fixed}" Margin="22,0,0,0"
VerticalAlignment="Center" ClipToBounds="False" />
</StackPanel>
</Border>
</StackPanel>
<!-- Items List -->
<DockPanel>
- <TextBlock DockPanel.Dock="Top" Text="Wallets" FontSize="14" IsVisible="{Binding IsOpen}" Margin="25 15 0 12"
- Opacity="0.8" FontWeight="Light" />
+ <TextBlock Classes="headerText" DockPanel.Dock="Top" Text="Wallets" IsVisible="{Binding IsOpen}" />
<c:NavBarListBox Items="{Binding Wallets}"
SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
Name="ItemsListBox"

Fix navbar colors