Merge pull request #221 from github/update-octicons

Update octicons

Author: haacked

src/GitHub.Exports/UI/Octicon.cs

@@ -5,9 +5,6 @@ namespace GitHub.UI
     public enum Octicon
     {
         alert,
-        alignment_align,
-        alignment_aligned_to,
-        alignment_unalign,
         arrow_down,
         arrow_left,
         arrow_right,
@@ -16,7 +13,9 @@ public enum Octicon
         arrow_small_right,
         arrow_small_up,
         arrow_up,
-        beer,
+        beaker,
+        bell,
+        bold,
         book,
         bookmark,
         briefcase,
@@ -37,13 +36,13 @@ public enum Octicon
         cloud_download,
         cloud_upload,
         code,
-        color_mode,
         comment_discussion,
         comment,
         credit_card,
         dash,
         dashboard,
         database,
+        desktop_download,
         device_camera_video,
         device_camera,
         device_desktop,
@@ -83,18 +82,14 @@ public enum Octicon
         history,
         home,
         horizontal_rule,
-        hourglass,
         hubot,
         inbox,
         info,
         issue_closed,
         issue_opened,
         issue_reopened,
+        italic,
         jersey,
-        jump_down,
-        jump_left,
-        jump_right,
-        jump_up,
         key,
         keyboard,
         law,
@@ -105,6 +100,7 @@ public enum Octicon
         list_unordered,
         location,
         @lock,
+        logo_gist,
         logo_github,
         mail_read,
         mail_reply,
@@ -113,14 +109,9 @@ public enum Octicon
         markdown,
         megaphone,
         mention,
-        microscope,
         milestone,
         mirror,
         mortar_board,
-        move_down,
-        move_left,
-        move_right,
-        move_up,
         mute,
         no_newline,
         octoface,
@@ -130,17 +121,11 @@ public enum Octicon
         pencil,
         person,
         pin,
-        playback_fast_forward,
-        playback_pause,
-        playback_play,
-        playback_rewind,
         plug,
         plus,
-        podium,
         primitive_dot,
         primitive_square,
         pulse,
-        puzzle,
         question,
         quote,
         radio_tower,
@@ -153,23 +138,25 @@ public enum Octicon
         rocket,
         rss,
         ruby,
-        screen_full,
-        screen_normal,
         search,
         server,
         settings,
+        shield,
         sign_in,
         sign_out,
-        split,
+        smiley,
         squirrel,
         star,
-        steps,
         stop,
         sync,
         tag,
+        tasklist,
         telescope,
         terminal,
+        text_size,
         three_bars,
+        thumbsdown,
+        thumbsup,
         tools,
         trashcan,
         triangle_down,
@@ -178,7 +165,9 @@ public enum Octicon
         triangle_up,
         unfold,
         unmute,
+        verified,
         versions,
+        watch,
         x,
         zap,
     }

src/GitHub.UI.Reactive/Assets/Controls/ErrorMessageDisplay.xaml

@@ -25,7 +25,7 @@
                             <ui:OcticonPath
                                 x:Name="icon"
                                 Icon="{TemplateBinding Icon}"
-                                Height="1024"
+                                Height="16"
                                 Fill="{TemplateBinding IconFill}" />
                         </Viewbox>
                         <ContentPresenter

src/GitHub.UI.Reactive/Assets/Controls/FilteredComboBox.xaml

@@ -3,7 +3,7 @@
                     xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
                     xmlns:uirx="clr-namespace:GitHub.UI">
 
-    <PathGeometry x:Key="arrow" Figures="M 0,448 224,768 448,448" />
+    <PathGeometry x:Key="arrow">M 0,6 3.5,11 7,6</PathGeometry>
 
     <ControlTemplate x:Key="FilterComboBoxTemplate" TargetType="{x:Type uirx:FilteredComboBox}">
         <Grid x:Name="MainGrid" SnapsToDevicePixels="true"
@@ -50,8 +50,7 @@
                 Content="{TemplateBinding SelectionBoxItem}" 
                 ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
                 FontSize="12"
-                IconHeight="16"
-                IconWidth="8"
+                IconWidth="7"
                 Margin="{TemplateBinding Padding}"
                 HorizontalContentAlignment="Left"
                 BorderBrush="{TemplateBinding BorderBrush}"

src/GitHub.UI.Reactive/Assets/Controls/GitHubComboBox.xaml

@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI">
 
-    <PathGeometry x:Key="arrow" Figures="M 0,448 224,768 448,448" />
+    <PathGeometry x:Key="arrow">M 0,6 3.5,11 7,6</PathGeometry>
 
     <ControlTemplate x:Key="ComboBoxTemplate" TargetType="{x:Type ui:GitHubComboBox}">
         <Grid x:Name="MainGrid" SnapsToDevicePixels="true"
@@ -37,8 +37,7 @@
                 Content="{TemplateBinding SelectionBoxItem}" 
                 ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
                 FontSize="12"
-                IconHeight="16"
-                IconWidth="8"
+                IconWidth="7"
                 Margin="{TemplateBinding Padding}"
                 HorizontalContentAlignment="Left"
                 BorderBrush="{TemplateBinding BorderBrush}"

src/GitHub.UI.Reactive/Assets/Controls/Validation/UserErrorMessages.xaml

@@ -25,7 +25,7 @@
                             HorizontalAlignment="Right"
                             Width="16"
                             Height="16">
-                            <ui:OcticonPath x:Name="icon" Icon="{TemplateBinding Icon}" Height="1024" Fill="{TemplateBinding Fill}" />
+                            <ui:OcticonPath x:Name="icon" Icon="{TemplateBinding Icon}" Height="16" Fill="{TemplateBinding Fill}" />
                         </Viewbox>
                         <ContentControl Grid.Column="1" Content="{Binding}">
                             <ContentControl.Resources>

src/GitHub.UI.Reactive/Assets/Controls/Validation/ValidationMessage.xaml

@@ -33,7 +33,7 @@
                             <ui:OcticonPath
                                 x:Name="icon"
                                 Icon="{TemplateBinding Icon}"
-                                Height="1024"
+                                Height="16"
                                 Fill="{TemplateBinding Fill}"/>
                         </Viewbox>
                         <TextBlock Grid.Column="1" Text="{TemplateBinding Text}"
@@ -84,7 +84,7 @@
                     x:Name="icon"
                     Icon="stop"
                     Fill="{StaticResource GitHubErrorAdornmentBrush}"
-                    Height="1024" />
+                    Height="16" />
             </Viewbox>
         </Grid>
     </ControlTemplate>

src/GitHub.UI/Controls/Buttons/OcticonCircleButton.xaml

@@ -191,7 +191,7 @@
                                     Stretch="Uniform">
                                     <Path 
                                             x:Name="octicon"
-                                            Height="1024"
+                                            Height="16"
                                             Stretch="None"
                                             Fill="{Binding Path=IconForeground,
                                                 RelativeSource={RelativeSource TemplatedParent}}"
@@ -253,7 +253,7 @@
                                             RelativeSource={RelativeSource TemplatedParent}}"
                                         Stretch="Uniform">
                                             <Path 
-                                                Height="1024"
+                                                Height="16"
                                                 Stretch="None"
                                                 Fill="{Binding Path=ActiveForeground,
                                                     RelativeSource={RelativeSource TemplatedParent}}"

src/GitHub.UI/Controls/Buttons/OcticonLinkButton.xaml

@@ -60,7 +60,7 @@
                             Width="{Binding Path=IconWidth, RelativeSource={RelativeSource TemplatedParent}, FallbackValue=16.0}">
                             <Path x:Name="octicon" 
                                   SnapsToDevicePixels="True" 
-                                  Height="1024"
+                                  Height="16"
                                   Data="{Binding Path=(Path.Data), RelativeSource={RelativeSource TemplatedParent}}">
                                 <Path.Fill>
                                     <SolidColorBrush Color="{DynamicResource GHBlueLinkButtonIconColor}" />

src/GitHub.UI/Controls/Octicons/OcticonImage.xaml

@@ -18,7 +18,7 @@
                             <ui:OcticonPath 
                                 Fill="{TemplateBinding Foreground}" 
                                 Icon="{TemplateBinding Icon}"
-                                Height="1024" 
+                                Height="16" 
                                 SnapsToDevicePixels="True" />
                         </Viewbox>
                     </ui:FixedAspectRatioPanel>