Merge pull request #298 from github/don/fontsize-resources

Replace hardcoded fontsizes with proportional text styles

Author: shana

src/GitHub.UI/Assets/Controls/FilterTextBox.xaml

@@ -13,7 +13,6 @@
         <Setter Property="AllowDrop" Value="true"/>
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
         <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="Height" Value="24" />
         <Setter Property="Padding" Value="3,3,18,3" />
         <Setter Property="ContextMenu" Value="{DynamicResource DefaultContextMenu}" />
         <Setter Property="Template">

src/GitHub.VisualStudio/Styles/GitHubComboBox.xaml

@@ -40,7 +40,6 @@
                 <Setter Property="Foreground" Value="{DynamicResource GitHubVsWindowText}" />
                 <Setter Property="Background" Value="{DynamicResource GitHubVsBrandedUIBackground}" />
                 <Setter Property="Margin" Value="5" />
-                <Setter Property="Height" Value="25" />
             </Style>
 
             <Style TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">

src/GitHub.VisualStudio/UI/Views/Controls/PullRequestListItem.xaml

@@ -5,6 +5,7 @@
                     xmlns:local="clr-namespace:GitHub.VisualStudio.UI.Views"
                     xmlns:models="clr-namespace:GitHub.Models;assembly=GitHub.Exports"
                     xmlns:viewmodels="clr-namespace:GitHub.ViewModels;assembly=GitHub.Exports.Reactive"
+                    xmlns:vsui="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0"
                     xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI">
 
   <ResourceDictionary.MergedDictionaries>
@@ -54,10 +55,9 @@
                  Grid.Column="1"
                  HorizontalAlignment="Left"
                  VerticalAlignment="Top"
-                 FontFamily="Segoe UI"
-                 FontSize="14"
                  Foreground="{DynamicResource GitHubVsToolWindowText}"
                  Margin="0,-3,5,0"
+                 Style="{DynamicResource {x:Static vsui:VsResourceKeys.TextBlockEnvironment122PercentFontSizeStyleKey}}"
                  Text="{Binding Title}"
                  ToolTip="{Binding Title}"
                  TextTrimming="CharacterEllipsis" />
@@ -91,7 +91,6 @@
                  HorizontalAlignment="Left"
                  VerticalAlignment="Top"
                  FontFamily="Segoe UI"
-                 FontSize="12"
                  Foreground="{DynamicResource GitHubVsToolWindowText}"
                  Text="{Binding CommentCount}">
         <TextBlock.Style>
@@ -133,12 +132,10 @@
                 CommandParameter="{Binding Number}"
                 Content="{Binding Number}"
                 FontFamily="Segoe UI"
-                FontSize="12"
                 Style="{StaticResource HashtagActionLink}" />
         <TextBlock x:Name="description"
                    Grid.Column="1"
                    FontFamily="Segoe UI"
-                   FontSize="12"
                    Margin="0,0,10,0"
                    TextTrimming="CharacterEllipsis"
                    Foreground="{DynamicResource GitHubVsGrayText}">

src/GitHub.VisualStudio/UI/Views/PullRequestCreationView.xaml

@@ -7,6 +7,7 @@
                                       xmlns:local="clr-namespace:GitHub.VisualStudio.UI.Views"
                                       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                                       xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App"
+                                      xmlns:vsui="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.14.0"
                                       xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
                                   Background="{DynamicResource GitHubVsToolWindowBackground}"
                                   DataContext="{Binding ViewModel}"
@@ -306,7 +307,8 @@
 
             <TabItem Header="Commits" Style="{DynamicResource GitHubPRDetailsTabItem}">
                 <ListView Background="Transparent"
-                          BorderBrush="Transparent">
+                          BorderBrush="Transparent"
+                          ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                     <ListViewItem Style="{StaticResource CommitListItemContainerStyle}">
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -338,19 +340,20 @@
                             </Grid>
 
                             <TextBlock Text="I am an example commit message"
+                                       TextTrimming="CharacterEllipsis"
                                        ToolTip="I am an example commit message"
                                        VerticalAlignment="Top"
                                        Foreground="{DynamicResource GitHubVsToolWindowText}"
-                                       FontSize="14"
+                                       Style="{DynamicResource {x:Static vsui:VsResourceKeys.TextBlockEnvironment122PercentFontSizeStyleKey}}"
                                        Margin="10,-3,5,0"
                                        Grid.Column="1"
                                        Grid.Row="0" />
 
                             <TextBlock Margin="10,0,0,0"
                                        Text="Andreia Gaita committed 20 hours ago"
+                                       TextTrimming="CharacterEllipsis"
                                        ToolTip="Andreia Gaita committed 20 hours ago"
                                        VerticalAlignment="Top"
-                                       FontSize="11"
                                        Grid.Column="1"
                                        Grid.Row="1" 
                                        Foreground="{DynamicResource GitHubVsGrayText}"/>
@@ -361,7 +364,8 @@
 
             <TabItem Header="Files Changed" Style="{DynamicResource GitHubPRDetailsTabItem}">
                 <ListView Background="Transparent"
-                          BorderBrush="Transparent">
+                          BorderBrush="Transparent"
+                          ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                     <ListViewItem Style="{StaticResource CommitListItemContainerStyle}">
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -381,7 +385,10 @@
 
                             <TextBlock 
                                 Foreground="{DynamicResource GitHubVsWindowText}"
-                                Grid.Column="1" Text="src\file_added.cs" />
+                                TextTrimming="CharacterEllipsis"
+                                Text="src\file_added.cs"
+                                ToolTip="src\file_added.cs"
+                                Grid.Column="1" />
 
                             <ui:OcticonImage Icon="diff_added" Grid.Column="2" Foreground="#ff6cc644" ToolTip="Added" />
                         </Grid>
@@ -406,7 +413,10 @@
 
                             <TextBlock 
                                 Foreground="{DynamicResource GitHubVsWindowText}"
-                                Grid.Column="1" Text="src\file_modified.cs" />
+                                TextTrimming="CharacterEllipsis"
+                                Text="src\file_modified.cs"
+                                ToolTip="src\file_modified.cs"
+                                Grid.Column="1" />
 
                             <ui:OcticonImage Icon="diff_modified" Grid.Column="2" Foreground="#ffbbbbbb" ToolTip="Modified" />
                         </Grid>
@@ -431,7 +441,10 @@
 
                             <TextBlock 
                                 Foreground="{DynamicResource GitHubVsWindowText}"
-                                Grid.Column="1" Text="src\file_removed.cs" />
+                                TextTrimming="CharacterEllipsis"
+                                Text="src\file_removed.cs"
+                                ToolTip="src\file_removed.cs"
+                                Grid.Column="1"  />
 
                             <ui:OcticonImage Icon="diff_removed" Grid.Column="2" Foreground="#FFbd2c00" ToolTip="Removed" />
                         </Grid>
@@ -456,7 +469,10 @@
 
                             <TextBlock 
                                 Foreground="{DynamicResource GitHubVsWindowText}"
-                                Grid.Column="1" Text="src\file_renamed.cs" />
+                                TextTrimming="CharacterEllipsis"
+                                Text="src\file_renamed.cs" 
+                                ToolTip="src\file_renamed.cs" 
+                                Grid.Column="1" />
 
                             <ui:OcticonImage Icon="diff_renamed" Grid.Column="2" Foreground="#ff4078c0" ToolTip="Renamed" />
                         </Grid>