Fixed styles

Caliban-Nano · May 12, 2022 · 0571043 · 0571043
1 parent 084faac
commit 0571043
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/samples/Caliban.Nano.Hello/Hello/HelloView.xaml b/samples/Caliban.Nano.Hello/Hello/HelloView.xaml
@@ -5,8 +5,17 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:Caliban.Nano.Hello.Hello"
       mc:Ignorable="d">
-    <DockPanel Height="auto" FocusManager.FocusedElement="{Binding ElementName=Input}">
-        <TextBox DockPanel.Dock="Top" x:Name="Input"/>
-        <Button DockPanel.Dock="Top" x:Name="SayHello" Content="Hello"/>
+    <DockPanel Height="auto" FocusManager.FocusedElement="{Binding ElementName=Input}" Style="{StaticResource Panel}">
+        <TextBox
+            x:Name="Input"
+            DockPanel.Dock="Top"
+            Style="{StaticResource Input}"
+        />
+        <Button
+            Content="Hello"
+            x:Name="SayHello"
+            DockPanel.Dock="Top"
+            Style="{StaticResource Hello}"
+        />
     </DockPanel>
 </UserControl>
diff --git a/samples/Caliban.Nano.Hello/Style.xaml b/samples/Caliban.Nano.Hello/Style.xaml
@@ -10,11 +10,11 @@
         <Setter Property="FontSize" Value="20"/>
     </Style>
 
-    <Style TargetType="{x:Type DockPanel}">
+    <Style TargetType="{x:Type DockPanel}" x:Key="Panel">
         <Setter Property="Margin" Value="20"/>
     </Style>
 
-    <Style TargetType="{x:Type TextBox}">
+    <Style TargetType="{x:Type TextBox}" x:Key="Input">
         <Setter Property="VerticalAlignment" Value="Center"/>
         <Setter Property="Background" Value="#2E3238"/>
         <Setter Property="Foreground" Value="#E6E6E6"/>
@@ -25,7 +25,7 @@
         <Setter Property="Padding" Value="0, 20"/>
     </Style>
 
-    <Style TargetType="{x:Type Button}">
+    <Style TargetType="{x:Type Button}" x:Key="Hello">
         <Setter Property="Background" Value="#3B4148"/>
         <Setter Property="Foreground" Value="#D9D9D9"/>
         <Setter Property="BorderThickness" Value="0"/>
@@ -55,4 +55,5 @@
             </Trigger>
         </Style.Triggers>
     </Style>
+
 </ResourceDictionary>
diff --git a/src/Caliban.Nano/Caliban.Nano.csproj b/src/Caliban.Nano/Caliban.Nano.csproj
@@ -20,7 +20,7 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Company>Caliban.Nano</Company>
     <PackageTags>caliban;nano;wpf;mvvm;framework;dependency-injection;event-aggregation;service-locator;automatic-binding</PackageTags>
-    <VersionPrefix>1.4.1</VersionPrefix>
+    <VersionPrefix>1.4.2</VersionPrefix>
   </PropertyGroup>
 
   <ItemGroup>