From 731012b0b6ef1e47205953dd9601b609e93155da Mon Sep 17 00:00:00 2001
From: Dan Allen <dan@opendevise.com>
Date: Wed, 30 Dec 2020 02:55:26 -0700
Subject: [PATCH] rename octicons.svg to octicons-16.svg and remove size suffix
 from IDs

---
 gulp.d/tasks/build.js                     |  2 +-
 src/img/{octicons.svg => octicons-16.svg} | 10 +++++-----
 src/js/06-copy-to-clipboard.js            |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename src/img/{octicons.svg => octicons-16.svg} (84%)

diff --git a/gulp.d/tasks/build.js b/gulp.d/tasks/build.js
index 64642ad..6f213e2 100644
--- a/gulp.d/tasks/build.js
+++ b/gulp.d/tasks/build.js
@@ -110,7 +110,7 @@ module.exports = (src, dest, preview) => () => {
             imagemin.optipng(),
             imagemin.svgo({
               plugins: [
-                { cleanupIDs: { preservePrefixes: ['symbol-', 'view-'] } },
+                { cleanupIDs: { preservePrefixes: ['icon-', 'view-'] } },
                 { removeViewBox: false },
                 { removeDesc: false },
               ],
diff --git a/src/img/octicons.svg b/src/img/octicons-16.svg
similarity index 84%
rename from src/img/octicons.svg
rename to src/img/octicons-16.svg
index 3503b58..d8415d0 100644
--- a/src/img/octicons.svg
+++ b/src/img/octicons-16.svg
@@ -1,5 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg">
-  <title>Octicons (subset)</title>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <title>Octicons (16px subset)</title>
   <desc>Octicons v11.2.0 by GitHub - https://primer.style/octicons/ - License: MIT</desc>
   <metadata
     xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -26,11 +26,11 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <symbol id="symbol-clippy-16" viewBox="0 0 16 16">
+  <symbol id="icon-clippy" viewBox="0 0 16 16">
     <path
        fill-rule="evenodd"
        d="M5.75 1a.75.75 0 00-.75.75v3c0 .414.336.75.75.75h4.5a.75.75 0 00.75-.75v-3a.75.75 0 00-.75-.75h-4.5zm.75 3V2.5h3V4h-3zm-2.874-.467a.75.75 0 00-.752-1.298A1.75 1.75 0 002 3.75v9.5c0 .966.784 1.75 1.75 1.75h8.5A1.75 1.75 0 0014 13.25v-9.5a1.75 1.75 0 00-.874-1.515.75.75 0 10-.752 1.298.25.25 0 01.126.217v9.5a.25.25 0 01-.25.25h-8.5a.25.25 0 01-.25-.25v-9.5a.25.25 0 01.126-.217z" />
   </symbol>
-  <use href="#symbol-clippy-16" width="16" height="16" x="0" y="0" />
-  <view id="view-clippy-16" viewBox="0 0 16 16" />
+  <use href="#icon-clippy" width="16" height="16" x="0" y="0" />
+  <view id="view-clippy" viewBox="0 0 16 16" />
 </svg>
diff --git a/src/js/06-copy-to-clipboard.js b/src/js/06-copy-to-clipboard.js
index 4749373..cc9a270 100644
--- a/src/js/06-copy-to-clipboard.js
+++ b/src/js/06-copy-to-clipboard.js
@@ -34,7 +34,7 @@
       svg.setAttribute('aria-hidden', 'true')
       svg.setAttribute('class', 'copy-icon')
       var use = document.createElementNS('http://www.w3.org/2000/svg', 'use')
-      use.setAttribute('href', window.uiRootPath + '/img/octicons.svg#symbol-clippy-16')
+      use.setAttribute('href', window.uiRootPath + '/img/octicons-16.svg#icon-clippy')
       svg.appendChild(use)
       copy.appendChild(svg)
       ;(toast = document.createElement('span')).className = 'copy-toast'
-- 
2.11.0