Implementing changes suggested in #197

fluentribbon · Nov 18, 2015 · c2b223d · c2b223d
1 parent 9913d20
commit c2b223d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/Fluent/Themes/Office2013/Colors/Colors.xaml b/Fluent/Themes/Office2013/Colors/Colors.xaml
@@ -69,13 +69,13 @@
                      Opacity="0.12" />
     <SolidColorBrush x:Key="ButtonHoverOuterBorderBrush"
                      Color="{DynamicResource {x:Static Fluent:MetroColors.ThemeColorKey}}"
-                     Opacity="0.3" />
+                     Opacity="0.12" />
     <SolidColorBrush x:Key="ButtonHoverInnerBackgroundBrush"
                      Color="{DynamicResource {x:Static Fluent:MetroColors.ThemeColorKey}}"
                      Opacity="0.12" />
     <SolidColorBrush x:Key="ButtonHoverInnerBorderBrush"
                      Color="{DynamicResource {x:Static Fluent:MetroColors.ThemeColorKey}}"
-                     Opacity="0.3" />
+                     Opacity="0.12" />
 
     <SolidColorBrush x:Key="ButtonPressedOuterBackgroundBrush"
                      Color="{DynamicResource {x:Static Fluent:MetroColors.ThemeColorKey}}"

diff --git a/Fluent/Themes/Office2013/Controls/ScreenTip.xaml b/Fluent/Themes/Office2013/Controls/ScreenTip.xaml
@@ -59,7 +59,8 @@
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="*" />
                             </Grid.ColumnDefinitions>
-                            <Image Margin="7,5,3,7"
+                            <Image x:Name="image" 
+                                   Margin="7,5,3,7"
                                    HorizontalAlignment="Left"
                                    VerticalAlignment="Top"
                                    Source="{TemplateBinding Property=Image}"
@@ -216,6 +217,12 @@
                         TargetName="imageAndTextSection"
                         Value="Collapsed" />
             </MultiTrigger>
+            <Trigger Property="Image"
+                     Value="{x:Null}">
+                <Setter Property="Visibility"
+                        TargetName="image"
+                        Value="Collapsed" />
+            </Trigger>            
         </ControlTemplate.Triggers>
     </ControlTemplate>
 

diff --git a/Fluent/Themes/Office2013/Controls/SplitButton.xaml b/Fluent/Themes/Office2013/Controls/SplitButton.xaml
@@ -79,7 +79,7 @@
                                                  Style="{DynamicResource TwoLineLabelStyle}"
                                                  HorizontalAlignment="Center"
                                                  VerticalAlignment="Center"
-                                                 Margin="2,0,2,0"
+                                                 Margin="2,0,2,2"
                                                  HasGlyph="{TemplateBinding HasTriangle}" />
                             <!--<ContentPresenter x:Name="iconImage" HorizontalAlignment="Center" 
                                                 VerticalAlignment="Center" MinWidth="10" Margin="3,2" SnapsToDevicePixels="True"