Skip to content
This repository has been archived by the owner on Jun 18, 2024. It is now read-only.

Update icons to version 2.58 #1074

Merged
merged 3 commits into from
Dec 5, 2017
Merged

Update icons to version 2.58 #1074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9171172
Update icon version to 2.58
Dec 3, 2017
8bb9439
Update icons to version 2.58
Jahnp Dec 4, 2017
946c601
Add HumanResources back in as deprecations
Jahnp Dec 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/data/icons.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
{ "name": "AnalyticsLogo", "unicode": "F1DE" },
{ "name": "AnalyticsQuery", "unicode": "F1DF" },
{ "name": "AnalyticsReport", "unicode": "F1E1" },
{ "name": "AnalyticsView", "unicode": "F5F1" },
{ "name": "AnchorLock", "unicode": "F511" },
{ "name": "Annotation", "unicode": "E924" },
{ "name": "AppIconDefault", "unicode": "ECAA" },
Expand Down Expand Up @@ -143,6 +144,7 @@
{ "name": "Breakfast", "unicode": "F49C" },
{ "name": "Brightness", "unicode": "E706" },
{ "name": "Broom", "unicode": "EA99" },
{ "name": "BrowserScreenShot", "unicode": "EBED" },
{ "name": "BrowserTab", "unicode": "F5D7" },
{ "name": "BrowserTabScreenshot", "unicode": "F5D8" },
{ "name": "Brunch", "unicode": "F49D" },
Expand Down Expand Up @@ -397,6 +399,7 @@
{ "name": "DocumentReply", "unicode": "EF57" },
{ "name": "DocumentSearch", "unicode": "EF6C" },
{ "name": "DocumentSet", "unicode": "EED6" },
{ "name": "DOM", "unicode": "EC8D" },
{ "name": "DonutChart", "unicode": "F368" },
{ "name": "Door", "unicode": "EB75" },
{ "name": "DoubleBookmark", "unicode": "EB8F" },
Expand Down Expand Up @@ -622,6 +625,7 @@
{ "name": "HailNight", "unicode": "EA13" },
{ "name": "HalfAlpha", "unicode": "E97E" },
{ "name": "HalfCircle", "unicode": "F501" },
{ "name": "HandsFree", "unicode": "EAD0" },
{ "name": "Handwriting", "unicode": "E929" },
{ "name": "HardDrive", "unicode": "EDA2" },
{ "name": "HardDriveGroup", "unicode": "F18F" },
Expand Down Expand Up @@ -653,7 +657,6 @@
{ "name": "Hospital", "unicode": "E91D" },
{ "name": "Hotel", "unicode": "E824" },
{ "name": "HourGlass", "unicode": "EA03" },
{ "name": "HumanResources", "unicode": "F240" },
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will remove the icon from the documentation, right? That's probably for the best, as we don't have a way to indicate deprecated icons in the documentation and would prefer that no one starts using it now.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, removing icons from the JSON will hide them on the site. I think it's the right thing to do in the absence of documenting deprecated icons--though I wonder if we should look into supporting those at some point as well (e.g. with something like deprecated-icons.json or something along those lines).

{ "name": "IconSetsFlag", "unicode": "F2A4" },
{ "name": "IDBadge", "unicode": "F427" },
{ "name": "ImageCrosshair", "unicode": "F2C9" },
Expand Down Expand Up @@ -1271,6 +1274,7 @@
{ "name": "ToggleFilled", "unicode": "EC11" },
{ "name": "ToggleOff", "unicode": "F19F" },
{ "name": "ToggleThumb", "unicode": "EC14" },
{ "name": "Toll", "unicode": "F160" },
{ "name": "Touch", "unicode": "E815" },
{ "name": "TouchPointer", "unicode": "E7C9" },
{ "name": "Train", "unicode": "E7C0" },
Expand Down
2 changes: 1 addition & 1 deletion src/sass/_Icon.Definitions.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@font-face {
$icon-font-family: 'FabricMDL2Icons';
$icon-font-name: 'fabricmdl2icons';
$icon-font-version: '2.57';
$icon-font-version: '2.58';

@if variable_exists(do-scope-styles) {
$icon-font-family: 'FabricMDL2Icons-' + $ms-fabric-version-major;
Expand Down
11 changes: 10 additions & 1 deletion src/sass/mixins/_Icon.Mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
@mixin ms-Icon--AnalyticsLogo { content: $ms-icon-code-AnalyticsLogo; }
@mixin ms-Icon--AnalyticsQuery { content: $ms-icon-code-AnalyticsQuery; }
@mixin ms-Icon--AnalyticsReport { content: $ms-icon-code-AnalyticsReport; }
@mixin ms-Icon--AnalyticsView { content: $ms-icon-code-AnalyticsView; }
@mixin ms-Icon--AnchorLock { content: $ms-icon-code-AnchorLock; }
@mixin ms-Icon--Annotation { content: $ms-icon-code-Annotation; }
@mixin ms-Icon--AppIconDefault { content: $ms-icon-code-AppIconDefault; }
Expand Down Expand Up @@ -257,6 +258,7 @@
@mixin ms-Icon--Breakfast { content: $ms-icon-code-Breakfast; }
@mixin ms-Icon--Brightness { content: $ms-icon-code-Brightness; }
@mixin ms-Icon--Broom { content: $ms-icon-code-Broom; }
@mixin ms-Icon--BrowserScreenShot { content: $ms-icon-code-BrowserScreenShot; }
@mixin ms-Icon--BrowserTab { content: $ms-icon-code-BrowserTab; }
@mixin ms-Icon--BrowserTabScreenshot { content: $ms-icon-code-BrowserTabScreenshot; }
@mixin ms-Icon--Brunch { content: $ms-icon-code-Brunch; }
Expand Down Expand Up @@ -511,6 +513,7 @@
@mixin ms-Icon--DocumentReply { content: $ms-icon-code-DocumentReply; }
@mixin ms-Icon--DocumentSearch { content: $ms-icon-code-DocumentSearch; }
@mixin ms-Icon--DocumentSet { content: $ms-icon-code-DocumentSet; }
@mixin ms-Icon--DOM { content: $ms-icon-code-DOM; }
@mixin ms-Icon--DonutChart { content: $ms-icon-code-DonutChart; }
@mixin ms-Icon--Door { content: $ms-icon-code-Door; }
@mixin ms-Icon--DoubleBookmark { content: $ms-icon-code-DoubleBookmark; }
Expand Down Expand Up @@ -736,6 +739,7 @@
@mixin ms-Icon--HailNight { content: $ms-icon-code-HailNight; }
@mixin ms-Icon--HalfAlpha { content: $ms-icon-code-HalfAlpha; }
@mixin ms-Icon--HalfCircle { content: $ms-icon-code-HalfCircle; }
@mixin ms-Icon--HandsFree { content: $ms-icon-code-HandsFree; }
@mixin ms-Icon--Handwriting { content: $ms-icon-code-Handwriting; }
@mixin ms-Icon--HardDrive { content: $ms-icon-code-HardDrive; }
@mixin ms-Icon--HardDriveGroup { content: $ms-icon-code-HardDriveGroup; }
Expand Down Expand Up @@ -767,7 +771,6 @@
@mixin ms-Icon--Hospital { content: $ms-icon-code-Hospital; }
@mixin ms-Icon--Hotel { content: $ms-icon-code-Hotel; }
@mixin ms-Icon--HourGlass { content: $ms-icon-code-HourGlass; }
@mixin ms-Icon--HumanResources { content: $ms-icon-code-HumanResources; }
@mixin ms-Icon--IconSetsFlag { content: $ms-icon-code-IconSetsFlag; }
@mixin ms-Icon--IDBadge { content: $ms-icon-code-IDBadge; }
@mixin ms-Icon--ImageCrosshair { content: $ms-icon-code-ImageCrosshair; }
Expand Down Expand Up @@ -1385,6 +1388,7 @@
@mixin ms-Icon--ToggleFilled { content: $ms-icon-code-ToggleFilled; }
@mixin ms-Icon--ToggleOff { content: $ms-icon-code-ToggleOff; }
@mixin ms-Icon--ToggleThumb { content: $ms-icon-code-ToggleThumb; }
@mixin ms-Icon--Toll { content: $ms-icon-code-Toll; }
@mixin ms-Icon--Touch { content: $ms-icon-code-Touch; }
@mixin ms-Icon--TouchPointer { content: $ms-icon-code-TouchPointer; }
@mixin ms-Icon--Train { content: $ms-icon-code-Train; }
Expand Down Expand Up @@ -1518,6 +1522,11 @@
@mixin ms-Icon--ZoomOut { content: $ms-icon-code-ZoomOut; }

// Deprecated mixins, to be removed in the next major release.
@mixin ms-Icon--HumanResources {
@warn 'The ms-Icon--HumanResources mixin has been deprecated and will be removed in the next major version.';
content: $ms-icon-code-HumanResources;
}

@mixin ms-Icon--StoreLogo {
@warn 'The ms-Icon--StoreLogo mixin has been deprecated and replaced with ms-Icon--StoreLogo16.';
content: $ms-icon-code-StoreLogo16;
Expand Down
18 changes: 16 additions & 2 deletions src/sass/variables/_Icon.Variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ $ms-icon-code-AlignVerticalTop: '\F4F6';
$ms-icon-code-AnalyticsLogo: '\F1DE';
$ms-icon-code-AnalyticsQuery: '\F1DF';
$ms-icon-code-AnalyticsReport: '\F1E1';
$ms-icon-code-AnalyticsView: '\F5F1';
$ms-icon-code-AnchorLock: '\F511';
$ms-icon-code-Annotation: '\E924';
$ms-icon-code-AppIconDefault: '\ECAA';
Expand Down Expand Up @@ -151,6 +152,7 @@ $ms-icon-code-Breadcrumb: '\EF8C';
$ms-icon-code-Breakfast: '\F49C';
$ms-icon-code-Brightness: '\E706';
$ms-icon-code-Broom: '\EA99';
$ms-icon-code-BrowserScreenShot: '\EBED';
$ms-icon-code-BrowserTab: '\F5D7';
$ms-icon-code-BrowserTabScreenshot: '\F5D8';
$ms-icon-code-Brunch: '\F49D';
Expand Down Expand Up @@ -405,6 +407,7 @@ $ms-icon-code-DocumentManagement: '\EFFC';
$ms-icon-code-DocumentReply: '\EF57';
$ms-icon-code-DocumentSearch: '\EF6C';
$ms-icon-code-DocumentSet: '\EED6';
$ms-icon-code-DOM: '\EC8D';
$ms-icon-code-DonutChart: '\F368';
$ms-icon-code-Door: '\EB75';
$ms-icon-code-DoubleBookmark: '\EB8F';
Expand Down Expand Up @@ -630,6 +633,7 @@ $ms-icon-code-HailDay: '\EA00';
$ms-icon-code-HailNight: '\EA13';
$ms-icon-code-HalfAlpha: '\E97E';
$ms-icon-code-HalfCircle: '\F501';
$ms-icon-code-HandsFree: '\EAD0';
$ms-icon-code-Handwriting: '\E929';
$ms-icon-code-HardDrive: '\EDA2';
$ms-icon-code-HardDriveGroup: '\F18F';
Expand Down Expand Up @@ -661,7 +665,7 @@ $ms-icon-code-HorizontalDistributeCenter: '\F4F9';
$ms-icon-code-Hospital: '\E91D';
$ms-icon-code-Hotel: '\E824';
$ms-icon-code-HourGlass: '\EA03';
$ms-icon-code-HumanResources: '\F240';

$ms-icon-code-IconSetsFlag: '\F2A4';
$ms-icon-code-IDBadge: '\F427';
$ms-icon-code-ImageCrosshair: '\F2C9';
Expand Down Expand Up @@ -1279,6 +1283,7 @@ $ms-icon-code-ToggleBorder: '\EC12';
$ms-icon-code-ToggleFilled: '\EC11';
$ms-icon-code-ToggleOff: '\F19F';
$ms-icon-code-ToggleThumb: '\EC14';
$ms-icon-code-Toll: '\F160';
$ms-icon-code-Touch: '\E815';
$ms-icon-code-TouchPointer: '\E7C9';
$ms-icon-code-Train: '\E7C0';
Expand Down Expand Up @@ -1411,6 +1416,10 @@ $ms-icon-code-Zoom: '\E71E';
$ms-icon-code-ZoomIn: '\E8A3';
$ms-icon-code-ZoomOut: '\E71F';

// Deprecated icons.
$ms-icon-code-HumanResources: '\F240';


// A map containing icon names and values. Someday SCSS will support string
// interpolation within a variable name and this map won't be necessary, as we'll
// be able to do something like #{$ms-icon-code-#{$iconName}} to get the value.
Expand Down Expand Up @@ -1469,6 +1478,7 @@ $ms-icon-map: (
'AnalyticsLogo': $ms-icon-code-AnalyticsLogo,
'AnalyticsQuery': $ms-icon-code-AnalyticsQuery,
'AnalyticsReport': $ms-icon-code-AnalyticsReport,
'AnalyticsView': $ms-icon-code-AnalyticsView,
'AnchorLock': $ms-icon-code-AnchorLock,
'Annotation': $ms-icon-code-Annotation,
'AppIconDefault': $ms-icon-code-AppIconDefault,
Expand Down Expand Up @@ -1559,6 +1569,7 @@ $ms-icon-map: (
'Breakfast': $ms-icon-code-Breakfast,
'Brightness': $ms-icon-code-Brightness,
'Broom': $ms-icon-code-Broom,
'BrowserScreenShot': $ms-icon-code-BrowserScreenShot,
'BrowserTab': $ms-icon-code-BrowserTab,
'BrowserTabScreenshot': $ms-icon-code-BrowserTabScreenshot,
'Brunch': $ms-icon-code-Brunch,
Expand Down Expand Up @@ -1813,6 +1824,7 @@ $ms-icon-map: (
'DocumentReply': $ms-icon-code-DocumentReply,
'DocumentSearch': $ms-icon-code-DocumentSearch,
'DocumentSet': $ms-icon-code-DocumentSet,
'DOM': $ms-icon-code-DOM,
'DonutChart': $ms-icon-code-DonutChart,
'Door': $ms-icon-code-Door,
'DoubleBookmark': $ms-icon-code-DoubleBookmark,
Expand Down Expand Up @@ -2038,6 +2050,7 @@ $ms-icon-map: (
'HailNight': $ms-icon-code-HailNight,
'HalfAlpha': $ms-icon-code-HalfAlpha,
'HalfCircle': $ms-icon-code-HalfCircle,
'HandsFree': $ms-icon-code-HandsFree,
'Handwriting': $ms-icon-code-Handwriting,
'HardDrive': $ms-icon-code-HardDrive,
'HardDriveGroup': $ms-icon-code-HardDriveGroup,
Expand Down Expand Up @@ -2069,7 +2082,6 @@ $ms-icon-map: (
'Hospital': $ms-icon-code-Hospital,
'Hotel': $ms-icon-code-Hotel,
'HourGlass': $ms-icon-code-HourGlass,
'HumanResources': $ms-icon-code-HumanResources,
'IconSetsFlag': $ms-icon-code-IconSetsFlag,
'IDBadge': $ms-icon-code-IDBadge,
'ImageCrosshair': $ms-icon-code-ImageCrosshair,
Expand Down Expand Up @@ -2687,6 +2699,7 @@ $ms-icon-map: (
'ToggleFilled': $ms-icon-code-ToggleFilled,
'ToggleOff': $ms-icon-code-ToggleOff,
'ToggleThumb': $ms-icon-code-ToggleThumb,
'Toll': $ms-icon-code-Toll,
'Touch': $ms-icon-code-Touch,
'TouchPointer': $ms-icon-code-TouchPointer,
'Train': $ms-icon-code-Train,
Expand Down Expand Up @@ -2820,6 +2833,7 @@ $ms-icon-map: (
'ZoomOut': $ms-icon-code-ZoomOut,

// Deprecated icons.
'HumanResources': $ms-icon-code-HumanResources,
'StoreLogo': $ms-icon-code-StoreLogo16,
'StoreLogoMed': $ms-icon-code-StoreLogoMed20
);