make style changes to match concept
MODIFY
WalletWasabi.Fluent/Controls/TagBox.xaml
WalletWasabi.Fluent/Controls/TagBox.xaml
xmlns:c="clr-namespace:WalletWasabi.Fluent.Controls"
xmlns:vmt="clr-namespace:WalletWasabi.Fluent.ViewModels.TagsBox">
<Style Selector="c|TagBox">
+ <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
+ <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
+ <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrush}" />
+ <Setter Property="BorderThickness" Value="{DynamicResource TextControlBorderThemeThickness}" />
+ <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+ <Setter Property="MinHeight" Value="{DynamicResource TextControlThemeMinHeight}" />
+ <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
+ <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
+ <Setter Property="FocusAdorner" Value="{x:Null}" />
<Setter Property="Template">
<ControlTemplate>
- <ItemsControl x:DataType="vmt:TagBoxViewModel" Items="{CompiledBinding CombinedContent}">
+ <Panel>
+ <Border
+ Name="PART_BorderElement"
+ Background="{TemplateBinding Background}"
+ BorderBrush="{TemplateBinding BorderBrush}"
+ BorderThickness="{TemplateBinding BorderThickness}"
+ MinWidth="{TemplateBinding MinWidth}"
+ MinHeight="{TemplateBinding MinHeight}" />
+ <Border
+ Margin="{TemplateBinding BorderThickness}">
+ <Grid ColumnDefinitions="Auto,*,Auto">
+ <DockPanel x:Name="PART_InnerDockPanel" Grid.Column="1" Grid.ColumnSpan="1"
+ Margin="{TemplateBinding Padding}">
+ <DataValidationErrors>
+ <ScrollViewer
+ HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}"
+ VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}">
+ <Panel>
+ <ItemsControl x:DataType="vmt:TagBoxViewModel"
+ Items="{CompiledBinding CombinedContent}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
</ItemsControl>
+ </Panel>
+ </ScrollViewer>
+ </DataValidationErrors>
+ </DockPanel>
+ </Grid>
+ </Border>
+ </Panel>
</ControlTemplate>
</Setter>
</Style>
+
+ <Style Selector="c|TagBox:pointerover /template/ Border#PART_BorderElement">
+ <Setter Property="BorderBrush" Value="{DynamicResource TextControlBorderBrushPointerOver}" />
+ <Setter Property="Background" Value="{DynamicResource TextControlBackgroundPointerOver}" />
+ </Style>
+
+ <Style Selector="c|TagBox AutoCompleteBox">
+ <Setter Property="Padding" Value="3,10,0, 10" />
+ <Setter Property="Margin" Value="0" />
+ </Style>
+
+ <Style Selector="c|TagBox AutoCompleteBox /template/ TextBox /template/ Border#PART_BorderElement">
+ <Setter Property="IsVisible" Value="False" />
+ </Style>
+
+
</Styles>
\ No newline at end of file

MODIFY
WalletWasabi.Fluent/Styles/Themes/BaseDark.xaml
WalletWasabi.Fluent/Styles/Themes/BaseDark.xaml
<SolidColorBrush x:Key="DialogBackground">#323232</SolidColorBrush>
<BoxShadows x:Key="DialogBoxShadow">4 11 30 1 #3F000000</BoxShadows>
+ <SolidColorBrush x:Key="TagBoxControlForeground">#2FFFFFFF</SolidColorBrush>
+
<Color x:Key="RegionColor">#FF212121</Color>
<BoxShadows x:Key="BoxShadow">0 1 4 #121212</BoxShadows>
</Styles.Resources>

MODIFY
WalletWasabi.Fluent/Styles/Themes/BaseLight.xaml
WalletWasabi.Fluent/Styles/Themes/BaseLight.xaml
<SolidColorBrush x:Key="DialogBackground">#FFFFFF</SolidColorBrush>
<BoxShadows x:Key="DialogBoxShadow">4 11 30 1 #3F000000</BoxShadows>
+ <SolidColorBrush x:Key="TagBoxControlForeground">#2F000000</SolidColorBrush>
+
<Color x:Key="RegionColor">#FFFAFAFA</Color>
<BoxShadows x:Key="BoxShadow">0 1 4 #D1D1D1</BoxShadows>
</Styles.Resources>

MODIFY
WalletWasabi.Fluent/Views/RecoveryPageView.axaml
WalletWasabi.Fluent/Views/RecoveryPageView.axaml
xmlns:c="clr-namespace:WalletWasabi.Fluent.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="WalletWasabi.Fluent.Views.RecoveryPageView">
- <Panel>
- <c:TagBox DataContext="{Binding RecoveryWordsTagBox}" />
+ <Panel Margin="25 0 25 20">
+ <Button Classes="invisible" Margin="0 35 0 0" Command="{Binding GoBackCommand}" DockPanel.Dock="Left"
+ HorizontalAlignment="Left" VerticalAlignment="Top">
+ <PathIcon Data="{StaticResource arrow_left_regular}" />
+ </Button>
+ <c:ContentArea Title="Enter recovery words" Caption="Type in your 12 recovery words and click continue"
+ Margin="44 0 44 0">
+ <Grid RowDefinitions="Auto,30,Auto" VerticalAlignment="Top" >
+ <TextBlock Classes="h7 bold" Text="Type in your recovery words here:"/>
+ <c:TagBox Grid.Row="2"
+ DataContext="{Binding RecoveryWordsTagBox}"
+ MinHeight="60"
+ MaxHeight="120"
+ ScrollViewer.HorizontalScrollBarVisibility="Disabled" />
+ </Grid>
+ </c:ContentArea>
+ <Button Content="Cancel" Command="{Binding CancelCommand}" Classes="invisible" HorizontalAlignment="Left"
+ VerticalAlignment="Bottom" />
+ <Button Content="Continue" Command="{Binding FinishCommand}" Classes="action" HorizontalAlignment="Right"
+ VerticalAlignment="Bottom" />
</Panel>
</UserControl>
\ No newline at end of file

MODIFY
WalletWasabi.Fluent/Views/TagsBox/TagView.xaml
WalletWasabi.Fluent/Views/TagsBox/TagView.xaml
xmlns:vm="clr-namespace:WalletWasabi.Fluent.ViewModels.TagsBox"
mc:Ignorable="d"
x:Class="WalletWasabi.Fluent.Views.TagsBox.TagView">
- <Border BorderBrush="Green" BorderThickness="1" Margin="5" CornerRadius="4">
- <TextBlock x:DataType="vm:TagViewModel" Text="{CompiledBinding Tag}" Margin="5"/>
+ <Panel>
+ <Border BorderBrush="{DynamicResource TagBoxControlForeground}"
+ BorderThickness="1"
+ CornerRadius="4"
+ Margin="4,0"
+ VerticalAlignment="Center">
+ <TextBlock x:DataType="vm:TagViewModel"
+ Text="{CompiledBinding Tag}"
+ Margin="8,4" />
</Border>
+ </Panel>
</UserControl>
\ No newline at end of file

make style changes to match concept