Skip to content

Commit c821e30

Browse files
batzenbatzen
committed
Fixing resource keys
1 parent 1c604a6 commit c821e30

33 files changed

+249
-249
lines changed

‎Fluent.Ribbon.Showcase/RibbonWindowColorized.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<SolidColorBrush x:Key="Fluent.Ribbon.Brushes.WindowCommands.CloseButton.Pressed.Background" Color="DarkBlue" />
3434

3535
<SolidColorBrush x:Key="Fluent.Ribbon.Brushes.GroupSeparator.Background" Color="Red" />
36-
<SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.BorderBrush" Color="Red" />
36+
<SolidColorBrush x:Key="Fluent.Ribbon.Brushes.RibbonTabItem.Border" Color="Red" />
3737
</fluent:RibbonWindow.Resources>
3838

3939
<Grid>

‎Fluent.Ribbon/Themes/Controls/ApplicationMenu.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
MinWidth="{TemplateBinding ActualWidth}"
4646
HorizontalAlignment="Stretch"
4747
VerticalAlignment="Top"
48-
Background="{DynamicResource Fluent.Ribbon.Brushes.DropDown.BackgroundBrush}"
49-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown.BorderBrush}"
48+
Background="{DynamicResource Fluent.Ribbon.Brushes.DropDown.Background}"
49+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown.Border}"
5050
BorderThickness="1"
5151
SnapsToDevicePixels="True">
5252
<Grid Width="Auto"
@@ -81,7 +81,7 @@
8181
<Border Grid.Row="0"
8282
Grid.Column="1"
8383
Width="{TemplateBinding RightPaneWidth}"
84-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Separator.BorderBrush}"
84+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Separator.Border}"
8585
BorderThickness="1 0 0 0">
8686
<ScrollViewer x:Name="PART_ScrollViewer"
8787
Style="{DynamicResource Fluent.Ribbon.Styles.MenuScrollViewer}"
@@ -98,7 +98,7 @@
9898
Grid.ColumnSpan="2"
9999
Margin="0"
100100
Background="{DynamicResource Fluent.Ribbon.Brushes.Ribbon.Background}"
101-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Separator.BorderBrush}"
101+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Separator.Border}"
102102
BorderThickness="0 1 0 0">
103103
<ContentPresenter ContentSource="FooterPaneContent" />
104104
</Border>

‎Fluent.Ribbon/Themes/Controls/ApplicationMenuItem.xaml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
Margin="0"
3838
HorizontalAlignment="Stretch"
3939
Background="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Background}"
40-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.BorderBrush}"
40+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Border}"
4141
BorderThickness="1"
4242
CornerRadius="2"
4343
Visibility="Collapsed" />
@@ -70,7 +70,7 @@
7070
Fill="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.Background}"
7171
RadiusX="1"
7272
RadiusY="1"
73-
Stroke="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.BorderBrush}"
73+
Stroke="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.Border}"
7474
Visibility="Collapsed" />
7575
<Image x:Name="image"
7676
Width="32"
@@ -145,7 +145,7 @@
145145
Margin="0"
146146
HorizontalAlignment="Stretch"
147147
Background="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Background}"
148-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.BorderBrush}"
148+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Border}"
149149
BorderThickness="1"
150150
CornerRadius="2"
151151
Visibility="Collapsed" />
@@ -178,7 +178,7 @@
178178
Fill="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.Background}"
179179
RadiusX="1"
180180
RadiusY="1"
181-
Stroke="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.BorderBrush}"
181+
Stroke="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.Border}"
182182
Visibility="Collapsed" />
183183
<Image x:Name="image"
184184
Width="32"
@@ -306,8 +306,8 @@
306306
Grid.ColumnSpan="1"
307307
HorizontalAlignment="Stretch"
308308
VerticalAlignment="Stretch"
309-
Background="{DynamicResource Fluent.Ribbon.Brushes.DropDown.BackgroundBrush}"
310-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown.BorderBrush}"
309+
Background="{DynamicResource Fluent.Ribbon.Brushes.DropDown..Background}"
310+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown.Border}"
311311
BorderThickness="1"
312312
CornerRadius="2,2,1,1"
313313
SnapsToDevicePixels="True">
@@ -318,7 +318,7 @@
318318
<Border Width="Auto"
319319
Height="Auto"
320320
VerticalAlignment="Stretch"
321-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown.BackgroundBrush}"
321+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown..Background}"
322322
BorderThickness="1"
323323
CornerRadius="1" />
324324
<Grid Margin="1"
@@ -336,7 +336,7 @@
336336
Data="M0,0L0,1"
337337
Fill="{x:Null}"
338338
Stretch="Fill"
339-
Stroke="{DynamicResource Fluent.Ribbon.Brushes.Separator.BorderBrush}"
339+
Stroke="{DynamicResource Fluent.Ribbon.Brushes.Separator.Border}"
340340
Visibility="Visible" />
341341
<ScrollViewer x:Name="PART_ScrollViewer"
342342
Margin="1"
@@ -408,7 +408,7 @@
408408
Width="1"
409409
Margin="0 4 23 4"
410410
HorizontalAlignment="Right"
411-
Stroke="{DynamicResource Fluent.Ribbon.Brushes.Separator.BorderBrush}" />
411+
Stroke="{DynamicResource Fluent.Ribbon.Brushes.Separator.Border}" />
412412

413413
<Grid Grid.Column="0"
414414
Grid.ColumnSpan="3"
@@ -423,7 +423,7 @@
423423
<Border x:Name="PART_ButtonBorder"
424424
Margin="0 0 -1 0"
425425
Background="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Background}"
426-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.BorderBrush}"
426+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Border}"
427427
BorderThickness="1"
428428
CornerRadius="2"
429429
Visibility="Collapsed" />
@@ -433,7 +433,7 @@
433433
Margin="0"
434434
HorizontalAlignment="Stretch"
435435
Background="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Background}"
436-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.BorderBrush}"
436+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Border}"
437437
BorderThickness="1"
438438
CornerRadius="2"
439439
Visibility="Collapsed" />
@@ -467,7 +467,7 @@
467467
Fill="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.Background}"
468468
RadiusX="1"
469469
RadiusY="1"
470-
Stroke="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.BorderBrush}"
470+
Stroke="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.Border}"
471471
Visibility="Collapsed" />
472472
<Image x:Name="image"
473473
Width="32"
@@ -511,8 +511,8 @@
511511
<Border x:Name="DropDownBorder"
512512
HorizontalAlignment="Stretch"
513513
VerticalAlignment="Stretch"
514-
Background="{DynamicResource Fluent.Ribbon.Brushes.DropDown.BackgroundBrush}"
515-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown.BorderBrush}"
514+
Background="{DynamicResource Fluent.Ribbon.Brushes.DropDown..Background}"
515+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown.Border}"
516516
BorderThickness="1"
517517
CornerRadius="1"
518518
SnapsToDevicePixels="True">
@@ -523,7 +523,7 @@
523523
<Border Width="Auto"
524524
Height="Auto"
525525
VerticalAlignment="Stretch"
526-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown.BackgroundBrush}"
526+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown..Background}"
527527
BorderThickness="1"
528528
CornerRadius="1" />
529529
<Grid Margin="1"
@@ -541,7 +541,7 @@
541541
Data="M0,0L0,1"
542542
Fill="{x:Null}"
543543
Stretch="Fill"
544-
Stroke="{DynamicResource Fluent.Ribbon.Brushes.Separator.BorderBrush}"
544+
Stroke="{DynamicResource Fluent.Ribbon.Brushes.Separator.Border}"
545545
Visibility="Visible" />
546546
<ScrollViewer x:Name="PART_ScrollViewer"
547547
Style="{DynamicResource Fluent.Ribbon.Styles.MenuScrollViewer}"
@@ -648,7 +648,7 @@
648648
Margin="0"
649649
HorizontalAlignment="Stretch"
650650
Background="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Background}"
651-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.BorderBrush}"
651+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Border}"
652652
BorderThickness="1"
653653
CornerRadius="2"
654654
Visibility="Collapsed" />
@@ -680,7 +680,7 @@
680680
Fill="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.Background}"
681681
RadiusX="1"
682682
RadiusY="1"
683-
Stroke="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.BorderBrush}"
683+
Stroke="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.Border}"
684684
Visibility="Collapsed" />
685685
<Image x:Name="image"
686686
Width="32"
@@ -754,7 +754,7 @@
754754
Margin="0"
755755
HorizontalAlignment="Stretch"
756756
Background="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Background}"
757-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.BorderBrush}"
757+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Border}"
758758
BorderThickness="1"
759759
CornerRadius="2"
760760
Visibility="Collapsed" />
@@ -776,7 +776,7 @@
776776
Fill="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.Background}"
777777
RadiusX="1"
778778
RadiusY="1"
779-
Stroke="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.BorderBrush}"
779+
Stroke="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.Border}"
780780
Visibility="Collapsed" />
781781
<Image x:Name="image"
782782
Width="32"
@@ -907,8 +907,8 @@
907907
Grid.ColumnSpan="1"
908908
HorizontalAlignment="Stretch"
909909
VerticalAlignment="Stretch"
910-
Background="{DynamicResource Fluent.Ribbon.Brushes.DropDown.BackgroundBrush}"
911-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown.BorderBrush}"
910+
Background="{DynamicResource Fluent.Ribbon.Brushes.DropDown..Background}"
911+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown.Border}"
912912
BorderThickness="1"
913913
CornerRadius="2,2,1,1"
914914
SnapsToDevicePixels="True">
@@ -919,7 +919,7 @@
919919
<Border Width="Auto"
920920
Height="Auto"
921921
VerticalAlignment="Stretch"
922-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown.BackgroundBrush}"
922+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown..Background}"
923923
BorderThickness="1"
924924
CornerRadius="1" />
925925
<Grid Margin="1"
@@ -999,7 +999,7 @@
999999
Width="1"
10001000
Margin="0 4 23 4"
10011001
HorizontalAlignment="Right"
1002-
Stroke="{DynamicResource Fluent.Ribbon.Brushes.Separator.BorderBrush}" />
1002+
Stroke="{DynamicResource Fluent.Ribbon.Brushes.Separator.Border}" />
10031003

10041004
<Grid Grid.Column="0"
10051005
Grid.ColumnSpan="3"
@@ -1014,7 +1014,7 @@
10141014
<Border x:Name="PART_ButtonBorder"
10151015
Margin="0 0 -1 0"
10161016
Background="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Background}"
1017-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.BorderBrush}"
1017+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Border}"
10181018
BorderThickness="1"
10191019
CornerRadius="2"
10201020
Visibility="Collapsed" />
@@ -1024,7 +1024,7 @@
10241024
Margin="0"
10251025
HorizontalAlignment="Stretch"
10261026
Background="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Background}"
1027-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.BorderBrush}"
1027+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Border}"
10281028
BorderThickness="1"
10291029
CornerRadius="2"
10301030
Visibility="Collapsed" />
@@ -1047,7 +1047,7 @@
10471047
Fill="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.Background}"
10481048
RadiusX="1"
10491049
RadiusY="1"
1050-
Stroke="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.BorderBrush}"
1050+
Stroke="{DynamicResource Fluent.Ribbon.Brushes.ApplicationMenuItem.CheckBox.Border}"
10511051
Visibility="Collapsed" />
10521052
<Image x:Name="image"
10531053
Width="32"
@@ -1178,8 +1178,8 @@
11781178
Grid.ColumnSpan="1"
11791179
HorizontalAlignment="Stretch"
11801180
VerticalAlignment="Stretch"
1181-
Background="{DynamicResource Fluent.Ribbon.Brushes.DropDown.BackgroundBrush}"
1182-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown.BorderBrush}"
1181+
Background="{DynamicResource Fluent.Ribbon.Brushes.DropDown..Background}"
1182+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown.Border}"
11831183
BorderThickness="1"
11841184
CornerRadius="1"
11851185
SnapsToDevicePixels="True">
@@ -1190,7 +1190,7 @@
11901190
<Border Width="Auto"
11911191
Height="Auto"
11921192
VerticalAlignment="Stretch"
1193-
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown.BackgroundBrush}"
1193+
BorderBrush="{DynamicResource Fluent.Ribbon.Brushes.DropDown..Background}"
11941194
BorderThickness="1"
11951195
CornerRadius="1" />
11961196
<Grid Margin="1"

‎Fluent.Ribbon/Themes/Controls/BackstageControls.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@
8080
<ControlTemplate.Triggers>
8181
<Trigger Property="Selector.IsSelected" Value="True">
8282
<Setter TargetName="border" Property="Background" Value="{DynamicResource Fluent.Ribbon.Brushes.Button.Pressed.Background}" />
83-
<Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource Fluent.Ribbon.Brushes.Button.Pressed.BorderBrush}" />
83+
<Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource Fluent.Ribbon.Brushes.Button.Pressed.Border}" />
8484
</Trigger>
8585
<MultiTrigger>
8686
<MultiTrigger.Conditions>
8787
<Condition Property="IsMouseOver" Value="True" />
8888
<Condition Property="Selector.IsSelected" Value="False" />
8989
</MultiTrigger.Conditions>
9090
<Setter TargetName="border" Property="Background" Value="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Background}" />
91-
<Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.BorderBrush}" />
91+
<Setter TargetName="border" Property="BorderBrush" Value="{DynamicResource Fluent.Ribbon.Brushes.Button.MouseOver.Border}" />
9292
</MultiTrigger>
9393
</ControlTemplate.Triggers>
9494
</ControlTemplate>

0 commit comments

Comments
 (0)