Improve resource name consistency

Esri · Nov 17, 2024 · d6c0a01 · d6c0a01
1 parent 7d0cd56
commit d6c0a01
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/Esri.Calcite.Wpf/Controls/Buttons.xaml b/src/Esri.Calcite.Wpf/Controls/Buttons.xaml
@@ -12,7 +12,7 @@
     <!--  Button padding should take button border offset into account (e.g. +1 to get desired effect of 8,4,8,4)  -->
     <Thickness x:Key="CalciteButtonPadding">7,0,7,0</Thickness>
 
-    <Style x:Key="InternalButtonBaseStyle" TargetType="ButtonBase">
+    <Style x:Key="CalciteCommonButtonBaseStyle" TargetType="ButtonBase">
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
@@ -104,7 +104,7 @@
 
     <Style
         x:Key="CalcitePrimaryButtonBaseStyle"
-        BasedOn="{StaticResource InternalButtonBaseStyle}"
+        BasedOn="{StaticResource CalciteCommonButtonBaseStyle}"
         TargetType="ButtonBase">
         <Setter Property="ca:AttachedBrushes.BackgroundHover" Value="{DynamicResource CalciteUIBrandHoverBrush}" />
         <Setter Property="ca:AttachedBrushes.BackgroundNormal" Value="{DynamicResource CalciteUIBrandBrush}" />
@@ -118,7 +118,7 @@
     </Style>
     <Style
         x:Key="CalciteSecondaryButtonBaseStyle"
-        BasedOn="{StaticResource InternalButtonBaseStyle}"
+        BasedOn="{StaticResource CalciteCommonButtonBaseStyle}"
         TargetType="ButtonBase">
         <Setter Property="ca:AttachedBrushes.BackgroundHover" Value="Transparent" />
         <Setter Property="ca:AttachedBrushes.BackgroundNormal" Value="Transparent" />
@@ -132,7 +132,7 @@
     </Style>
     <Style
         x:Key="CalciteDangerButtonBaseStyle"
-        BasedOn="{StaticResource InternalButtonBaseStyle}"
+        BasedOn="{StaticResource CalciteCommonButtonBaseStyle}"
         TargetType="ButtonBase">
         <Setter Property="ca:AttachedBrushes.BackgroundHover" Value="{DynamicResource CalciteUIDangerHoverBrush}" />
         <Setter Property="ca:AttachedBrushes.BackgroundNormal" Value="{DynamicResource CalciteUIDangerBrush}" />
@@ -147,7 +147,7 @@
     </Style>
     <Style
         x:Key="CalciteDangerSecondaryButtonBaseStyle"
-        BasedOn="{StaticResource InternalButtonBaseStyle}"
+        BasedOn="{StaticResource CalciteCommonButtonBaseStyle}"
         TargetType="ButtonBase">
         <Setter Property="ca:AttachedBrushes.BackgroundHover" Value="Transparent" />
         <Setter Property="ca:AttachedBrushes.BackgroundNormal" Value="Transparent" />
@@ -162,7 +162,7 @@
     </Style>
     <Style
         x:Key="CalciteChromeButtonBaseStyle"
-        BasedOn="{StaticResource InternalButtonBaseStyle}"
+        BasedOn="{StaticResource CalciteCommonButtonBaseStyle}"
         TargetType="ButtonBase">
         <Setter Property="cm:AttachedBrushes.BackgroundHover" Value="{DynamicResource CalciteUIBackground2Brush}" />
         <Setter Property="cm:AttachedBrushes.BackgroundNormal" Value="{DynamicResource CalciteUIBackground3Brush}" />

diff --git a/src/Esri.Calcite.Wpf/Controls/Calendar.xaml b/src/Esri.Calcite.Wpf/Controls/Calendar.xaml
@@ -27,7 +27,7 @@
     </Style>
 
     <!--  Style for the days of a month.  -->
-    <Style x:Key="CalendarDayButtonStyleBase" TargetType="CalendarDayButton">
+    <Style x:Key="CalciteCalendarDayButtonStyle" TargetType="CalendarDayButton">
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Template">
@@ -613,7 +613,7 @@
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="FontWeight" Value="Light" />
-        <Setter Property="CalendarDayButtonStyle" Value="{StaticResource CalendarDayButtonStyleBase}" />
+        <Setter Property="CalendarDayButtonStyle" Value="{StaticResource CalciteCalendarDayButtonStyle}" />
         <Setter Property="CalendarButtonStyle" Value="{StaticResource CalciteCalendarButtonStyle}" />
         <Setter Property="CalendarItemStyle" Value="{StaticResource CalciteCalendarItemStyle}" />
         <Setter Property="Foreground" Value="{DynamicResource CalciteUIText3Brush}" />