Skip to content

Commit

Permalink
Merge pull request #328 from MahApps/icons/Micronsv1.1.4
Browse files Browse the repository at this point in the history 
Update Microns to v1.1.4
  • Loading branch information
@punker76
punker76 authored May 3, 2024
2 parents cce9606 + c257973 commit e820187
Show file tree
Hide file tree
Showing 7 changed files with 279 additions and 167 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ This `IconPacks` library contains controls, markup extensions and converters to
| [Material Design Icons Light](https://github.com/Templarian/MaterialDesignLight) | 0.2.63 | 257 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.MaterialLight/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.MaterialLight.svg?style=flat-square&&label=MaterialLight"></a> |
| [Material Icons (Google)](https://github.com/google/material-design-icons) | 4.0.0 | 8413 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.MaterialDesign/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.MaterialDesign.svg?style=flat-square&&label=MaterialDesign"></a> |
| [Memory Icons](https://pictogrammers.com/library/memory/) | 1.5.0 | 651 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.MemoryIcons/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.MemoryIcons.svg?style=flat-square&&label=MemoryIcons"></a> |
| [Microns](https://github.com/stephenhutchings/microns) | 1.0.10 | 108 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Microns/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Microns.svg?style=flat-square&&label=Microns"></a> |
| [Microns](https://github.com/stephenhutchings/microns) | 1.1.4 | 164 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Microns/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Microns.svg?style=flat-square&&label=Microns"></a> |
| [Modern UI Icons](https://github.com/Templarian/WindowsIcons) | | 1260 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Modern/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Modern.svg?style=flat-square&&label=Modern"></a> |
| [GitHub Octicons](https://octicons.github.com/) | 9.6.0 | 204 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.Octicons/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.Octicons.svg?style=flat-square&&label=Octicons"></a> |
| [PICOL Icons](https://github.com/PicolSigns/Icons) | 1.1.0 | 549 | <a href="https://www.nuget.org/packages/MahApps.Metro.IconPacks.PicolIcons/" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/nuget/dt/MahApps.Metro.IconPacks.PicolIcons.svg?style=flat-square&&label=PicolIcons"></a> |
Expand Down
4 changes: 2 additions & 2 deletions src/MahApps.Metro.IconPacks/Icons/MaterialDesign/PackIconMaterialDesignDataFactory.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,12 +343,12 @@ public static IDictionary<PackIconMaterialDesignKind, string> Create()
{PackIconMaterialDesignKind.AddCardSharp, "M 2.0097656 4 L 2 20 L 14 20 L 14 18 L 4 18 L 4 12 L 22 12 L 22 4 L 2.0097656 4 z M 4 6 L 20 6 L 20 8 L 4 8 L 4 6 z M 19 14 L 19 17 L 16 17 L 16 19 L 19 19 L 19 22 L 21 22 L 21 19 L 24 19 L 24 17 L 21 17 L 21 14 L 19 14 z "},
{PackIconMaterialDesignKind.Addchart, "m 22,5 v 2 h -3 v 3 H 17 V 7 H 14 V 5 h 3 V 2 h 2 V 5 Z M 19,19 H 5 V 5 h 6 V 3 H 5 C 3.9,3 3,3.9 3,5 v 14 c 0,1.1 0.9,2 2,2 h 14 c 1.1,0 2,-0.9 2,-2 v -6 h -2 z m -4,-6 v 4 h 2 v -4 z m -4,4 h 2 V 9 H 11 Z M 9,17 V 11 H 7 v 6 z"},
{PackIconMaterialDesignKind.AddChart, "m 6,9.99 h 2 v 7 H 6 Z m 8,3 h 2 v 4 h -2 z m -4,-6 h 2 v 10 H 10 Z M 20,7 V 4 h -2 v 3 h -3 v 2 h 3 v 3 h 2 V 9 h 3 V 7 Z M 18,19 H 4 V 5 H 16 V 3 H 4 C 2.9,3 2,3.9 2,5 v 14 c 0,1.1 0.9,2 2,2 h 14 c 1.1,0 2,-0.9 2,-2 v -5 h -2 z"},
{PackIconMaterialDesignKind.AddChartOutline, "M 5 3 C 3.9000011 3 3 3.9000011 3 5 L 3 19 C 3 20.099999 3.9000011 21 5 21 L 19 21 C 20.099999 21 21 20.099999 21 19 L 21 10 L 19 10 L 19 19 L 5 19 L 5 5 L 14 5 L 14 3 L 5 3 z M 17 3 L 17 5 L 15 5 L 15 7 L 17 7 L 17 9 L 19 9 L 19 7 L 21 7 L 21 5 L 19 5 L 19 3 L 17 3 z M 11 7 L 11 17 L 13 17 L 13 7 L 11 7 z M 7 10 L 7 17 L 9 17 L 9 10 L 7 10 z M 15 13 L 15 17 L 17 17 L 17 13 L 15 13 z "},
{PackIconMaterialDesignKind.AddchartOutline, "M 17 2 L 17 5 L 14 5 L 14 7 L 17 7 L 17 10 L 19 10 L 19 7 L 22 7 L 22 5 L 19 5 L 19 2 L 17 2 z M 5 3 C 3.9000011 3 3 3.9000011 3 5 L 3 19 C 3 20.099999 3.9000011 21 5 21 L 19 21 C 20.099999 21 21 20.099999 21 19 L 21 13 L 19 13 L 19 19 L 5 19 L 5 5 L 11 5 L 11 3 L 5 3 z M 11 9 L 11 17 L 13 17 L 13 9 L 11 9 z M 7 11 L 7 17 L 9 17 L 9 11 L 7 11 z M 15 13 L 15 17 L 17 17 L 17 13 L 15 13 z "},
{PackIconMaterialDesignKind.AddChartOutline, "M 5 3 C 3.9000011 3 3 3.9000011 3 5 L 3 19 C 3 20.099999 3.9000011 21 5 21 L 19 21 C 20.099999 21 21 20.099999 21 19 L 21 10 L 19 10 L 19 19 L 5 19 L 5 5 L 14 5 L 14 3 L 5 3 z M 17 3 L 17 5 L 15 5 L 15 7 L 17 7 L 17 9 L 19 9 L 19 7 L 21 7 L 21 5 L 19 5 L 19 3 L 17 3 z M 11 7 L 11 17 L 13 17 L 13 7 L 11 7 z M 7 10 L 7 17 L 9 17 L 9 10 L 7 10 z M 15 13 L 15 17 L 17 17 L 17 13 L 15 13 z "},
{PackIconMaterialDesignKind.AddchartRound, "M 18 2 C 17.450001 2 17 2.4500006 17 3 L 17 5 L 15 5 C 14.450001 5 14 5.4500006 14 6 C 14 6.5499994 14.450001 7 15 7 L 17 7 L 17 9 C 17 9.5499995 17.450001 10 18 10 C 18.549999 10 19 9.5499995 19 9 L 19 7 L 21 7 C 21.549999 7 22 6.5499994 22 6 C 22 5.4500006 21.549999 5 21 5 L 19 5 L 19 3 C 19 2.4500006 18.549999 2 18 2 z M 5 3 C 3.9000011 3 3 3.9000011 3 5 L 3 19 C 3 20.099999 3.9000011 21 5 21 L 19 21 C 20.099999 21 21 20.099999 21 19 L 21 14 C 21 13.450001 20.549999 13 20 13 C 19.450001 13 19 13.450001 19 14 L 19 19 L 5 19 L 5 5 L 10 5 C 10.549999 5 11 4.5499994 11 4 C 11 3.4500006 10.549999 3 10 3 L 5 3 z M 12 9 C 11.450001 9 11 9.4500005 11 10 L 11 17 L 13 17 L 13 10 C 13 9.4500005 12.549999 9 12 9 z M 8 11 C 7.4500006 11 7 11.450001 7 12 L 7 17 L 9 17 L 9 12 C 9 11.450001 8.5499995 11 8 11 z M 16 13 C 15.450001 13 15 13.450001 15 14 L 15 17 L 17 17 L 17 14 C 17 13.450001 16.549999 13 16 13 z "},
{PackIconMaterialDesignKind.AddChartRound, "M 5 3 C 3.9000011 3 3 3.9000011 3 5 L 3 19 C 3 20.099999 3.9000011 21 5 21 L 19 21 C 20.099999 21 21 20.099999 21 19 L 21 11 C 21 10.450001 20.549999 10 20 10 C 19.450001 10 19 10.450001 19 11 L 19 19 L 5 19 L 5 5 L 13 5 C 13.549999 5 14 4.5499994 14 4 C 14 3.4500006 13.549999 3 13 3 L 5 3 z M 18 3 C 17.450001 3 17 3.4500005 17 4 L 17 5 L 16 5 C 15.450001 5 15 5.4500006 15 6 C 15 6.5499994 15.450001 7 16 7 L 17 7 L 17 8 C 17 8.5499995 17.450001 9 18 9 C 18.549999 9 19 8.5499995 19 8 L 19 7 L 20 7 C 20.549999 7 21 6.5499994 21 6 C 21 5.4500006 20.549999 5 20 5 L 19 5 L 19 4 C 19 3.4500006 18.549999 3 18 3 z M 12 7 C 11.450001 7 11 7.4500006 11 8 L 11 16 C 11 16.549999 11.450001 17 12 17 C 12.549999 17 13 16.549999 13 16 L 13 8 C 13 7.4500006 12.549999 7 12 7 z M 8 10 C 7.4500006 10 7 10.450001 7 11 L 7 16 C 7 16.549999 7.4500006 17 8 17 C 8.5499995 17 9 16.549999 9 16 L 9 11 C 9 10.450001 8.5499995 10 8 10 z M 16 13 C 15.450001 13 15 13.450001 15 14 L 15 16 C 15 16.549999 15.450001 17 16 17 C 16.549999 17 17 16.549999 17 16 L 17 14 C 17 13.450001 16.549999 13 16 13 z "},
{PackIconMaterialDesignKind.AddChartSharp, "M 3 3 L 3 21 L 21 21 L 21 10 L 19 10 L 19 19 L 5 19 L 5 5 L 14 5 L 14 3 L 3 3 z M 17 3 L 17 5 L 15 5 L 15 7 L 17 7 L 17 9 L 19 9 L 19 7 L 21 7 L 21 5 L 19 5 L 19 3 L 17 3 z M 11 7 L 11 17 L 13 17 L 13 7 L 11 7 z M 7 10 L 7 17 L 9 17 L 9 10 L 7 10 z M 15 13 L 15 17 L 17 17 L 17 13 L 15 13 z "},
{PackIconMaterialDesignKind.AddchartSharp, "M 17 2 L 17 5 L 14 5 L 14 7 L 17 7 L 17 10 L 19 10 L 19 7 L 22 7 L 22 5 L 19 5 L 19 2 L 17 2 z M 3 3 L 3 21 L 21 21 L 21 13 L 19 13 L 19 19 L 5 19 L 5 5 L 11 5 L 11 3 L 3 3 z M 11 9 L 11 17 L 13 17 L 13 9 L 11 9 z M 7 11 L 7 17 L 9 17 L 9 11 L 7 11 z M 15 13 L 15 17 L 17 17 L 17 13 L 15 13 z "},
{PackIconMaterialDesignKind.AddChartSharp, "M 3 3 L 3 21 L 21 21 L 21 10 L 19 10 L 19 19 L 5 19 L 5 5 L 14 5 L 14 3 L 3 3 z M 17 3 L 17 5 L 15 5 L 15 7 L 17 7 L 17 9 L 19 9 L 19 7 L 21 7 L 21 5 L 19 5 L 19 3 L 17 3 z M 11 7 L 11 17 L 13 17 L 13 7 L 11 7 z M 7 10 L 7 17 L 9 17 L 9 10 L 7 10 z M 15 13 L 15 17 L 17 17 L 17 13 L 15 13 z "},
{PackIconMaterialDesignKind.AddCircle, "M 12,2 C 6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22 17.52,22 22,17.52 22,12 22,6.48 17.52,2 12,2 Z m 5,11 h -4 v 4 H 11 V 13 H 7 v -2 h 4 V 7 h 2 v 4 h 4 z"},
{PackIconMaterialDesignKind.AddCircleOutlineOutline, "M 12 2 C 6.4800055 2 2 6.4800055 2 12 C 2 17.519994 6.4800055 22 12 22 C 17.519994 22 22 17.519994 22 12 C 22 6.4800055 17.519994 2 12 2 z M 12 4 C 16.409996 4 20 7.5900044 20 12 C 20 16.409996 16.409996 20 12 20 C 7.5900044 20 4 16.409996 4 12 C 4 7.5900044 7.5900044 4 12 4 z M 11 7 L 11 11 L 7 11 L 7 13 L 11 13 L 11 17 L 13 17 L 13 13 L 17 13 L 17 11 L 13 11 L 13 7 L 11 7 z "},
{PackIconMaterialDesignKind.AddCircleRound, "M 12 2 C 6.4800055 2 2 6.4800055 2 12 C 2 17.519994 6.4800055 22 12 22 C 17.519994 22 22 17.519994 22 12 C 22 6.4800055 17.519994 2 12 2 z M 12 7 C 12.549999 7 13 7.4500006 13 8 L 13 11 L 16 11 C 16.549999 11 17 11.450001 17 12 C 17 12.549999 16.549999 13 16 13 L 13 13 L 13 16 C 13 16.549999 12.549999 17 12 17 C 11.450001 17 11 16.549999 11 16 L 11 13 L 8 13 C 7.4500006 13 7 12.549999 7 12 C 7 11.450001 7.4500006 11 8 11 L 11 11 L 11 8 C 11 7.4500006 11.450001 7 12 7 z "},
Expand Down
4 changes: 2 additions & 2 deletions src/MahApps.Metro.IconPacks/Icons/MaterialDesign/PackIconMaterialDesignKind.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,12 +337,12 @@ public enum PackIconMaterialDesignKind
[Description("add_card (Sharp, eb86)")] AddCardSharp,
[Description("addchart (Regular, ef3c)")] Addchart,
[Description("add_chart (Regular, e97b)")] AddChart,
[Description("add_chart (Outline, e97b)")] AddChartOutline,
[Description("addchart (Outline, ef3c)")] AddchartOutline,
[Description("add_chart (Outline, e97b)")] AddChartOutline,
[Description("addchart (Round, ef3c)")] AddchartRound,
[Description("add_chart (Round, e97b)")] AddChartRound,
[Description("add_chart (Sharp, e97b)")] AddChartSharp,
[Description("addchart (Sharp, ef3c)")] AddchartSharp,
[Description("add_chart (Sharp, e97b)")] AddChartSharp,
[Description("add_circle (Regular, e147)")] AddCircle,
[Description("add_circle_outline (Outline, e148)")] AddCircleOutlineOutline,
[Description("add_circle (Round, e147)")] AddCircleRound,
Expand Down
4 changes: 2 additions & 2 deletions src/MahApps.Metro.IconPacks/Icons/Microns/PackIconMicrons.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
namespace MahApps.Metro.IconPacks
{
/// <summary>
/// The Microns icons are licensed under [CC BY-SA](<see><cref>https://creativecommons.org/licenses/by-sa/3.0/</cref></see>) license.
/// Microns font files are available under the SIL Open Font Licence, artwork available under the CC BY-SA Licence <see><cref>https://github.com/stephenhutchings/microns?tab=License-1-ov-file#readme</cref></see>.
/// Contributions, corrections and requests can be made on GitHub <see><cref>https://github.com/stephenhutchings/microns</cref></see>.
/// </summary>
[MetaData("Microns", "https://www.s-ings.com/projects/microns-icon-font/", "https://github.com/stephenhutchings/microns/blob/master/LICENCE.md")]
[MetaData("Microns", "https://github.com/stephenhutchings/microns", "https://github.com/stephenhutchings/microns?tab=License-1-ov-file#readme")]
public class PackIconMicrons : PackIconControlBase
{
public static readonly DependencyProperty KindProperty
Expand Down
Loading

0 comments on commit e820187

Please sign in to comment.