From c2a98387ac0055ed7e536111802aad8160e682be Mon Sep 17 00:00:00 2001
From: Shawn Allen <shawn.allen@github.com>
Date: Wed, 7 Aug 2019 13:41:08 -0700
Subject: [PATCH 1/2] import @primer/octicons/index.scss in core

as requested by @jonrohan in #845
---
 src/core/index.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/core/index.scss b/src/core/index.scss
index f350b9ac66..f843bdbb7e 100644
--- a/src/core/index.scss
+++ b/src/core/index.scss
@@ -5,6 +5,9 @@
  * Released under MIT license. Copyright (c) 2019 GitHub Inc.
  */
 
+// Include .octicon base styles
+@import "@primer/octicons/index.scss";
+
 // Primer master file
 //
 // Imports all Primer files in their intended order for easy mass-inclusion.

From e67c1745853ebf2119151e6290f8767e57a06db4 Mon Sep 17 00:00:00 2001
From: Shawn Allen <shawn.allen@github.com>
Date: Wed, 7 Aug 2019 13:44:37 -0700
Subject: [PATCH 2/2] add @primer/octicons as a dependency

---
 package-lock.json | 11 +++++++++--
 package.json      |  3 +++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 639375ea3d..d3551cd1ba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1520,6 +1520,14 @@
         }
       }
     },
+    "@primer/octicons": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/@primer/octicons/-/octicons-9.1.1.tgz",
+      "integrity": "sha512-7EGM0+Kx39bIgaYr9bTCzFvBCxm+fqh/YJIoSns8zfCwss32ZJ2GDP3024UH709VQtM5cKFU4JcIYPHyGdSfIg==",
+      "requires": {
+        "object-assign": "^4.1.1"
+      }
+    },
     "@reach/router": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@reach/router/-/router-1.2.1.tgz",
@@ -13921,8 +13929,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-copy": {
       "version": "0.1.0",
diff --git a/package.json b/package.json
index 2a7b03d90d..b7dba17d4d 100644
--- a/package.json
+++ b/package.json
@@ -121,5 +121,8 @@
     "unist-util-stringify-position": "^2.0.0",
     "unist-util-visit": "^1.4.0",
     "webpack": "4.20.2"
+  },
+  "dependencies": {
+    "@primer/octicons": "9.1.1"
   }
 }