Skip to content

Commit

Permalink
Icon updates
Browse files Browse the repository at this point in the history
  • Loading branch information
BlythMeister committed Aug 28, 2018
1 parent ba4d25b commit 6b0169e
Show file tree
Hide file tree
Showing 26 changed files with 57 additions and 50 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ skip_commits:
- docs/*
- '**/*.html'
- '**/*.md'
version: '3.11.2.{build}'
version: '3.11.3.{build}'
skip_tags: true
image: Visual Studio 2017
clone_folder: c:\project\gallifrey
Expand Down
2 changes: 1 addition & 1 deletion paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ nuget Atlassian.SDK @= 2.5.0
nuget FAKE ~> 4
nuget Exceptionless.Wpf
nuget MahApps.Metro prerelease
nuget MahApps.Metro.IconPacks.Material
nuget MahApps.Metro.IconPacks.FontAwesome
nuget Newtonsoft.Json
nuget RestSharp
nuget Octokit
Expand Down
2 changes: 1 addition & 1 deletion paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ NUGET
FAKE (4.64.13)
MahApps.Metro (1.6.5)
ControlzEx (>= 3.0.2.4 < 4.0)
MahApps.Metro.IconPacks.Material (2.3)
MahApps.Metro.IconPacks.FontAwesome (2.3)
ControlzEx (>= 3.0.2.4 < 4.0)
Newtonsoft.Json (11.0.2)
Octokit (0.31)
Expand Down
2 changes: 1 addition & 1 deletion src/Gallifrey.UI.Modern.Alpha/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedSingleRowTabControl.xaml" />
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.Material;component/Themes/PackIconMaterial.xaml" />
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.FontAwesome;component/Themes/PackIconFontAwesome.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,8 @@
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
<ItemGroup>
<Reference Include="MahApps.Metro.IconPacks.Material">
<HintPath>..\..\packages\MahApps.Metro.IconPacks.Material\lib\net46\MahApps.Metro.IconPacks.Material.dll</HintPath>
<Reference Include="MahApps.Metro.IconPacks.FontAwesome">
<HintPath>..\..\packages\MahApps.Metro.IconPacks.FontAwesome\lib\net46\MahApps.Metro.IconPacks.FontAwesome.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
Expand Down
2 changes: 1 addition & 1 deletion src/Gallifrey.UI.Modern.Alpha/paket.references
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Exceptionless.Wpf
MahApps.Metro
MahApps.Metro.IconPacks.Material
MahApps.Metro.IconPacks.FontAwesome
2 changes: 1 addition & 1 deletion src/Gallifrey.UI.Modern.Beta/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedSingleRowTabControl.xaml" />
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.Material;component/Themes/PackIconMaterial.xaml" />
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.FontAwesome;component/Themes/PackIconFontAwesome.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
Expand Down
4 changes: 2 additions & 2 deletions src/Gallifrey.UI.Modern.Beta/Gallifrey.UI.Modern.Beta.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,8 @@
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
<ItemGroup>
<Reference Include="MahApps.Metro.IconPacks.Material">
<HintPath>..\..\packages\MahApps.Metro.IconPacks.Material\lib\net46\MahApps.Metro.IconPacks.Material.dll</HintPath>
<Reference Include="MahApps.Metro.IconPacks.FontAwesome">
<HintPath>..\..\packages\MahApps.Metro.IconPacks.FontAwesome\lib\net46\MahApps.Metro.IconPacks.FontAwesome.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
Expand Down
2 changes: 1 addition & 1 deletion src/Gallifrey.UI.Modern.Beta/paket.references
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Exceptionless.Wpf
MahApps.Metro
MahApps.Metro.IconPacks.Material
MahApps.Metro.IconPacks.FontAwesome
2 changes: 1 addition & 1 deletion src/Gallifrey.UI.Modern.Stable/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedSingleRowTabControl.xaml" />
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.Material;component/Themes/PackIconMaterial.xaml" />
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.FontAwesome;component/Themes/PackIconFontAwesome.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,8 @@
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
<ItemGroup>
<Reference Include="MahApps.Metro.IconPacks.Material">
<HintPath>..\..\packages\MahApps.Metro.IconPacks.Material\lib\net46\MahApps.Metro.IconPacks.Material.dll</HintPath>
<Reference Include="MahApps.Metro.IconPacks.FontAwesome">
<HintPath>..\..\packages\MahApps.Metro.IconPacks.FontAwesome\lib\net46\MahApps.Metro.IconPacks.FontAwesome.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
Expand Down
2 changes: 1 addition & 1 deletion src/Gallifrey.UI.Modern.Stable/paket.references
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Exceptionless.Wpf
MahApps.Metro
MahApps.Metro.IconPacks.Material
MahApps.Metro.IconPacks.FontAwesome
2 changes: 1 addition & 1 deletion src/Gallifrey.UI.Modern/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml" />
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Accents/BaseDark.xaml" />
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.AnimatedSingleRowTabControl.xaml" />
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.Material;component/Themes/PackIconMaterial.xaml" />
<helpers:CachedResourceDictionary Source="pack://application:,,,/MahApps.Metro.IconPacks.FontAwesome;component/Themes/PackIconFontAwesome.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
Expand Down
7 changes: 7 additions & 0 deletions src/Gallifrey.UI.Modern/ChangeLog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,13 @@
</Bugs>
<Others/>
</Version>
<Version Number="3.11.3.0" Name="">
<Features/>
<Bugs />
<Others>
<Other>Icon updates</Other>
</Others>
</Version>
<!--
Template for VNext if not present above
<Version Number="0.0.0.0" Name="Pre-Release">
Expand Down
4 changes: 2 additions & 2 deletions src/Gallifrey.UI.Modern/Flyouts/AddTimer.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@

<StackPanel Orientation="Horizontal" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center">
<Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="SearchButton" ToolTip="Search Jira">
<iconPacks:PackIconMaterial Kind="CloudSearch" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
<iconPacks:PackIconFontAwesome Kind="SearchSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
<Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="AddButton" IsDefault="True" ToolTip="Add Timer">
<iconPacks:PackIconMaterial Kind="PlusCircle" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
<iconPacks:PackIconFontAwesome Kind="PlusCircleSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
</StackPanel>
</Grid>
Expand Down
4 changes: 2 additions & 2 deletions src/Gallifrey.UI.Modern/Flyouts/BulkExport.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@
</controls:MetroAnimatedSingleRowTabControl>
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center">
<Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,5" Click="ExportAllButton" ToolTip="Check All For Export">
<iconPacks:PackIconMaterial Kind="CheckAll" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
<iconPacks:PackIconFontAwesome Kind="CheckDoubleSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
<Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,5" Click="ExportButton" IsDefault="True" ToolTip="Export Checked Worklogs To Jira">
<iconPacks:PackIconMaterial Kind="CloudUpload" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,2,0" />
<iconPacks:PackIconFontAwesome Kind="UploadSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,2,0" />
</Button>
</StackPanel>
</Grid>
Expand Down
8 changes: 4 additions & 4 deletions src/Gallifrey.UI.Modern/Flyouts/EditTimer.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@

<StackPanel Orientation="Horizontal" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center">
<Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="SearchButton" ToolTip="Search Jira">
<iconPacks:PackIconMaterial Kind="CloudSearch" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
<iconPacks:PackIconFontAwesome Kind="SearchSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
<Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="AddTime" ToolTip="Add X Minutes">
<iconPacks:PackIconMaterial Kind="Plus" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
<iconPacks:PackIconFontAwesome Kind="PlusSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
<Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="SubtractTime" ToolTip="Subtract X Minutes">
<iconPacks:PackIconMaterial Kind="Minus" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
<iconPacks:PackIconFontAwesome Kind="MinusSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
<Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="SaveButton" IsDefault="{Binding IsDefaultOnButton, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" ToolTip="Save Timer Changes">
<iconPacks:PackIconMaterial Kind="ContentSave" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
<iconPacks:PackIconFontAwesome Kind="SaveSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
</StackPanel>
</Grid>
Expand Down
2 changes: 1 addition & 1 deletion src/Gallifrey.UI.Modern/Flyouts/Error.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<TextBlock Padding="5">Description</TextBlock>
<TextBox Text="{Binding Description, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" MaxLines="3" MinLines="3" VerticalScrollBarVisibility="Auto" AcceptsReturn="True" TextWrapping="Wrap" controls:TextBoxHelper.Watermark="Optional"/>
<Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2" Click="SendReport" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" IsDefault="True" ToolTip="Submit Error Report">
<iconPacks:PackIconMaterial Kind="Send" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
<iconPacks:PackIconFontAwesome Kind="ShareSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
</StackPanel>
</controls:Flyout>
2 changes: 1 addition & 1 deletion src/Gallifrey.UI.Modern/Flyouts/Export.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<controls:ToggleSwitchButton Grid.Row="11" Grid.Column="1" Margin="0,5" Style="{DynamicResource MahApps.Metro.Styles.ToggleSwitchButton.Win10}" HorizontalAlignment="Left" IsChecked="{Binding ChangeStatus, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Click="ChangeStatusClick"/>

<Button Grid.Row="12" Grid.Column="0" Grid.ColumnSpan="2" Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="ExportButton" IsDefault="True" ToolTip="Export Worklog To Jira">
<iconPacks:PackIconMaterial Kind="CloudUpload" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
<iconPacks:PackIconFontAwesome Kind="UploadSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
</Grid>
</ScrollViewer>
Expand Down
2 changes: 1 addition & 1 deletion src/Gallifrey.UI.Modern/Flyouts/Information.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<TextBlock Grid.Row="0" Grid.ColumnSpan="2" FontSize="18" Margin="0,0,0,5" Text="About" TextDecorations="Underline" />
<TextBlock Grid.Row="1" Grid.Column="0" TextWrapping="Wrap" Margin="0,0,0,5" VerticalAlignment="Center">Gallifrey is a time logging companion designed to work with Jira time logs.<LineBreak />Gallifrey is open sourced on GitHub and free to download and contribute!</TextBlock>
<Button Grid.Row="1" Grid.Column="1" Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="ChangeLogButton" ToolTip="View Full Change Log">
<iconPacks:PackIconMaterial Kind="BookOpenPageVariant" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
<iconPacks:PackIconFontAwesome Kind="BookOpenSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
</Grid>
<Grid Grid.Row="1">
Expand Down
4 changes: 2 additions & 2 deletions src/Gallifrey.UI.Modern/Flyouts/LockedTimer.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@
</ListView>
<StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Bottom">
<Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="AddButton" ToolTip="Add Selected Lock/Idle Timers">
<iconPacks:PackIconMaterial Kind="PlusCircle" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
<iconPacks:PackIconFontAwesome Kind="PlusCircleSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
<Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="DeleteButton" ToolTip="Delete Selected Lock/Idle Timers">
<iconPacks:PackIconMaterial Kind="Delete" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
<iconPacks:PackIconFontAwesome Kind="TrashAltSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
</StackPanel>
</Grid>
Expand Down
6 changes: 3 additions & 3 deletions src/Gallifrey.UI.Modern/Flyouts/Search.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<ComboBox Grid.Row="2" Grid.Column="1" Margin="5,5,0,5" ItemsSource="{Binding UserFilters}" SelectedItem="{Binding SelectedFilter, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsSynchronizedWithCurrentItem="True" controls:TextBoxHelper.ClearTextButton="True" IsEnabled="{Binding IsSearching, Converter={StaticResource BoolInvert}}" />

<Button Style="{DynamicResource MetroCircleButtonStyle}" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Width="50" Height="50" Margin="2,0" Click="SearchButton" IsDefault="True" IsEnabled="{Binding IsSearching, Converter={StaticResource BoolInvert}}" ToolTip="Search Jira">
<iconPacks:PackIconMaterial Kind="Magnify" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
<iconPacks:PackIconFontAwesome Kind="SearchSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>

<ListView Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" ItemsSource="{Binding SearchResults}" SelectedItem="{Binding SelectedSearchResult, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" BorderThickness="0" SelectionMode="Single">
Expand Down Expand Up @@ -65,10 +65,10 @@
</ListView>

<Button Style="{DynamicResource MetroCircleButtonStyle}" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" Width="50" Height="50" Margin="2,0" Click="AddTimer" IsEnabled="{Binding IsSearching, Converter={StaticResource BoolInvert}}" Visibility="{Binding OpenFromEdit, Converter={StaticResource BoolToVisInverted}}" ToolTip="Create Jira From Selected Search Result">
<iconPacks:PackIconMaterial Kind="PlusCircle" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
<iconPacks:PackIconFontAwesome Kind="PlusCircleSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
<Button Style="{DynamicResource MetroCircleButtonStyle}" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" Width="50" Height="50" Margin="2,0" Click="AddTimer" IsEnabled="{Binding IsSearching, Converter={StaticResource BoolInvert}}" Visibility="{Binding OpenFromEdit, Converter={StaticResource BoolToVis}}" ToolTip="Use Jira From Selected Search Result In Edit">
<iconPacks:PackIconMaterial Kind="ContentSave" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
<iconPacks:PackIconFontAwesome Kind="SaveSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
</Grid>
</controls:Flyout>
2 changes: 1 addition & 1 deletion src/Gallifrey.UI.Modern/Flyouts/Settings.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@

<WrapPanel HorizontalAlignment="Center" DockPanel.Dock="Bottom" VerticalAlignment="Bottom" Height="Auto">
<Button Style="{DynamicResource MetroCircleButtonStyle}" Width="50" Height="50" Margin="2,0" Click="SaveSettings" IsDefault="True" ToolTip="Save Settings">
<iconPacks:PackIconMaterial Kind="ContentSave" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
<iconPacks:PackIconFontAwesome Kind="SaveSolid" Height="22" Width="22" HorizontalAlignment="Center" VerticalAlignment="Center" />
</Button>
</WrapPanel>
</DockPanel>
Expand Down
4 changes: 2 additions & 2 deletions src/Gallifrey.UI.Modern/Gallifrey.UI.Modern.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,8 @@
<Choose>
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And $(TargetFrameworkVersion) == 'v4.6'">
<ItemGroup>
<Reference Include="MahApps.Metro.IconPacks.Material">
<HintPath>..\..\packages\MahApps.Metro.IconPacks.Material\lib\net46\MahApps.Metro.IconPacks.Material.dll</HintPath>
<Reference Include="MahApps.Metro.IconPacks.FontAwesome">
<HintPath>..\..\packages\MahApps.Metro.IconPacks.FontAwesome\lib\net46\MahApps.Metro.IconPacks.FontAwesome.dll</HintPath>
<Private>True</Private>
<Paket>True</Paket>
</Reference>
Expand Down
Loading

0 comments on commit 6b0169e

Please sign in to comment.