diff --git a/demo/Ursa.Demo/Pages/FormDemo.axaml b/demo/Ursa.Demo/Pages/FormDemo.axaml index a6752e5..a4a4c8d 100644 --- a/demo/Ursa.Demo/Pages/FormDemo.axaml +++ b/demo/Ursa.Demo/Pages/FormDemo.axaml @@ -16,7 +16,7 @@ - + diff --git a/src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml b/src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml index 049157d..bb1141f 100644 --- a/src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml +++ b/src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml @@ -31,7 +31,7 @@ VerticalAlignment="Center" Content="{TemplateBinding Icon}" ContentTemplate="{TemplateBinding IconTemplate}" - Foreground="{DynamicResource SemiColorText2}" + Foreground="{DynamicResource BreadcrumbItemForeground}" IsVisible="{TemplateBinding Icon, Converter={x:Static ObjectConverters.IsNotNull}}" /> + Foreground="{DynamicResource BreadcrumbItemSeparatorForeground}"> @@ -66,10 +66,10 @@ diff --git a/src/Ursa.Themes.Semi/Controls/Clock.axaml b/src/Ursa.Themes.Semi/Controls/Clock.axaml index 58809b8..dd62fb7 100644 --- a/src/Ursa.Themes.Semi/Controls/Clock.axaml +++ b/src/Ursa.Themes.Semi/Controls/Clock.axaml @@ -5,7 +5,7 @@ xmlns:u="https://irihi.tech/ursa"> - + @@ -13,8 +13,8 @@ ShowHourTicks="{TemplateBinding ShowHourTicks}" ShowMinuteTicks="{TemplateBinding ShowMinuteTicks}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" - HourTickForeground="{DynamicResource SemiGrey6}" - MinuteTickForeground="{DynamicResource SemiGrey4}" /> + HourTickForeground="{DynamicResource ClockHourTickForeground}" + MinuteTickForeground="{DynamicResource ClockMinuteTickForeground}" /> diff --git a/src/Ursa.Themes.Semi/Controls/Form.axaml b/src/Ursa.Themes.Semi/Controls/Form.axaml index 6b424d1..4a987bd 100644 --- a/src/Ursa.Themes.Semi/Controls/Form.axaml +++ b/src/Ursa.Themes.Semi/Controls/Form.axaml @@ -38,7 +38,7 @@ Height="1" Margin="0,8" HorizontalAlignment="Stretch" - Fill="{DynamicResource SemiColorBorder}" + Fill="{DynamicResource FormGroupForeground}" IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Header, Converter={x:Static ObjectConverters.IsNotNull}}" /> @@ -64,7 +64,7 @@ FontWeight="{DynamicResource TextBlockTitleFontWeight}" Target="{Binding #PART_ContentPresenter.Content}" /> @@ -100,7 +100,7 @@ FontWeight="{DynamicResource TextBlockTitleFontWeight}" Target="{Binding #PART_ContentPresenter.Content}" /> diff --git a/src/Ursa.Themes.Semi/Controls/NavMenu.axaml b/src/Ursa.Themes.Semi/Controls/NavMenu.axaml index 273c5f3..d0eea3e 100644 --- a/src/Ursa.Themes.Semi/Controls/NavMenu.axaml +++ b/src/Ursa.Themes.Semi/Controls/NavMenu.axaml @@ -237,7 +237,7 @@ Height="{DynamicResource NavigationMenuSeparatorBorderHeight}" Margin="{DynamicResource NavigationMenuSeparatorBorderMargin}" HorizontalAlignment="Stretch" - Fill="{DynamicResource SemiColorBorder}" /> + Fill="{DynamicResource NavigationMenuItemSeparatorBorderForeground}" /> diff --git a/src/Ursa.Themes.Semi/Controls/Timeline.axaml b/src/Ursa.Themes.Semi/Controls/Timeline.axaml index 0d68e5c..926ee02 100644 --- a/src/Ursa.Themes.Semi/Controls/Timeline.axaml +++ b/src/Ursa.Themes.Semi/Controls/Timeline.axaml @@ -79,7 +79,7 @@ Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" FontSize="14" - Foreground="{DynamicResource SemiGrey9}" /> + Foreground="{DynamicResource TimelineHeaderForeground}" /> @@ -67,7 +67,7 @@ + Fill="{DynamicResource ToolBarSeparatorForeground}" />