From 917117277939b6b4f928871772188352b7a211b8 Mon Sep 17 00:00:00 2001 From: Mike Wheaton Date: Sun, 3 Dec 2017 14:05:59 +0700 Subject: [PATCH 1/3] Update icon version to 2.58 --- src/sass/_Icon.Definitions.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sass/_Icon.Definitions.scss b/src/sass/_Icon.Definitions.scss index 01bbb61d7..8a5298f16 100644 --- a/src/sass/_Icon.Definitions.scss +++ b/src/sass/_Icon.Definitions.scss @@ -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; From 8bb943921b980f6979c8f039e23a1faa478ddbb0 Mon Sep 17 00:00:00 2001 From: Peter Jahn Date: Mon, 4 Dec 2017 13:10:41 -0800 Subject: [PATCH 2/3] Update icons to version 2.58 --- src/data/icons.json | 6 +++++- src/sass/mixins/_Icon.Mixins.scss | 6 +++++- src/sass/variables/_Icon.Variables.scss | 17 +++++++++++++++-- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/data/icons.json b/src/data/icons.json index 0ad2528c7..4b5095be4 100644 --- a/src/data/icons.json +++ b/src/data/icons.json @@ -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" }, @@ -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" }, @@ -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" }, @@ -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" }, @@ -653,7 +657,6 @@ { "name": "Hospital", "unicode": "E91D" }, { "name": "Hotel", "unicode": "E824" }, { "name": "HourGlass", "unicode": "EA03" }, - { "name": "HumanResources", "unicode": "F240" }, { "name": "IconSetsFlag", "unicode": "F2A4" }, { "name": "IDBadge", "unicode": "F427" }, { "name": "ImageCrosshair", "unicode": "F2C9" }, @@ -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" }, diff --git a/src/sass/mixins/_Icon.Mixins.scss b/src/sass/mixins/_Icon.Mixins.scss index 4c4a03134..9d0945db3 100644 --- a/src/sass/mixins/_Icon.Mixins.scss +++ b/src/sass/mixins/_Icon.Mixins.scss @@ -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; } @@ -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; } @@ -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; } @@ -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; } @@ -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; } @@ -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; } diff --git a/src/sass/variables/_Icon.Variables.scss b/src/sass/variables/_Icon.Variables.scss index 9d9731743..da20d0917 100644 --- a/src/sass/variables/_Icon.Variables.scss +++ b/src/sass/variables/_Icon.Variables.scss @@ -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'; @@ -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'; @@ -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'; @@ -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'; @@ -661,7 +665,6 @@ $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'; @@ -1279,6 +1282,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'; @@ -1411,6 +1415,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. @@ -1469,6 +1477,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, @@ -1559,6 +1568,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, @@ -1813,6 +1823,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, @@ -2038,6 +2049,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, @@ -2069,7 +2081,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, @@ -2687,6 +2698,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, @@ -2820,6 +2832,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 ); From 946c601b0ad4494158b1baaf896e734cbe97627d Mon Sep 17 00:00:00 2001 From: Peter Jahn Date: Mon, 4 Dec 2017 13:16:52 -0800 Subject: [PATCH 3/3] Add HumanResources back in as deprecations --- src/sass/mixins/_Icon.Mixins.scss | 5 +++++ src/sass/variables/_Icon.Variables.scss | 1 + 2 files changed, 6 insertions(+) diff --git a/src/sass/mixins/_Icon.Mixins.scss b/src/sass/mixins/_Icon.Mixins.scss index 9d0945db3..3eaa23c6e 100644 --- a/src/sass/mixins/_Icon.Mixins.scss +++ b/src/sass/mixins/_Icon.Mixins.scss @@ -1522,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; diff --git a/src/sass/variables/_Icon.Variables.scss b/src/sass/variables/_Icon.Variables.scss index da20d0917..93260e0a0 100644 --- a/src/sass/variables/_Icon.Variables.scss +++ b/src/sass/variables/_Icon.Variables.scss @@ -665,6 +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-IconSetsFlag: '\F2A4'; $ms-icon-code-IDBadge: '\F427'; $ms-icon-code-ImageCrosshair: '\F2C9';