Consolidate outline vs filled icons (Fixes #117)

microsoft · Aug 1, 2022 · f56638a · f56638a
1 parent f99aff7
commit f56638a
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 19 deletions.
diff --git a/dist/codicon.css b/dist/codicon.css
@@ -6,7 +6,7 @@
 @font-face {
 	font-family: "codicon";
 	font-display: block;
-	src: url("./codicon.ttf?0e5b0adf625a37fbcd638d31f0fe72aa") format("truetype");
+	src: url("./codicon.ttf?b9ce860ffcb3d78b0fd52f6fea7bea72") format("truetype");
 }
 
 .codicon[class*='codicon-'] {
@@ -226,6 +226,7 @@
 .codicon-chrome-minimize:before { content: "\eaba" }
 .codicon-chrome-restore:before { content: "\eabb" }
 .codicon-circle-outline:before { content: "\eabc" }
+.codicon-circle:before { content: "\eabc" }
 .codicon-debug-breakpoint-unverified:before { content: "\eabc" }
 .codicon-circle-slash:before { content: "\eabd" }
 .codicon-circuit-board:before { content: "\eabe" }
@@ -479,6 +480,7 @@
 .codicon-pinned-dirty:before { content: "\ebb2" }
 .codicon-pass-filled:before { content: "\ebb3" }
 .codicon-circle-large-filled:before { content: "\ebb4" }
+.codicon-circle-large:before { content: "\ebb5" }
 .codicon-circle-large-outline:before { content: "\ebb5" }
 .codicon-combine:before { content: "\ebb6" }
 .codicon-gather:before { content: "\ebb6" }

diff --git a/dist/codicon.csv b/dist/codicon.csv
@@ -52,11 +52,11 @@ chrome-minimize,,EABA
 chrome-restore,,EABB
 circle-filled,,EA71
 circle-large-filled,,EBB4
-circle-large-outline,,EBB5
-circle-outline,,EABC
+circle-large,,EBB5
 circle-slash,,EABD
 circle-small-filled,,EB8A
 circle-small,,EC07
+circle,,EABC
 circuit-board,,EABE
 clear-all,,EABF
 clippy,,EAC0

diff --git a/dist/codicon.html b/dist/codicon.html
@@ -577,20 +577,12 @@ <h1>codicon</h1>
             <span class='label'>circle-large-filled</span>
             <span class='description'></span>
         </div>
-        <div class="icon" data-name="circle-large-outline" title="circle-large-outline">
+        <div class="icon" data-name="circle-large" title="circle-large">
             <span class="inner">
-                <i class="codicon codicon-circle-large-outline" aria-hidden="true"></i>
+                <i class="codicon codicon-circle-large" aria-hidden="true"></i>
             </span>
             <br>
-            <span class='label'>circle-large-outline</span>
-            <span class='description'></span>
-        </div>
-        <div class="icon" data-name="circle-outline" title="circle-outline">
-            <span class="inner">
-                <i class="codicon codicon-circle-outline" aria-hidden="true"></i>
-            </span>
-            <br>
-            <span class='label'>circle-outline</span>
+            <span class='label'>circle-large</span>
             <span class='description'></span>
         </div>
         <div class="icon" data-name="circle-slash" title="circle-slash">
@@ -617,6 +609,14 @@ <h1>codicon</h1>
             <span class='label'>circle-small</span>
             <span class='description'></span>
         </div>
+        <div class="icon" data-name="circle" title="circle">
+            <span class="inner">
+                <i class="codicon codicon-circle" aria-hidden="true"></i>
+            </span>
+            <br>
+            <span class='label'>circle</span>
+            <span class='description'></span>
+        </div>
         <div class="icon" data-name="circuit-board" title="circuit-board">
             <span class="inner">
                 <i class="codicon codicon-circuit-board" aria-hidden="true"></i>
@@ -3663,11 +3663,11 @@ <h1>codicon</h1>
             description: 'dot round bullet'
         },
         {
-            name: 'circle-large-outline',
+            name: 'circle-large',
             description: 'dot round bullet'
         },
         {
-            name: 'circle-outline',
+            name: 'circle',
             description: 'dot round small bullet unverified breakpoint'
         },
         {

diff --git a/dist/codicon.svg b/dist/codicon.svg
diff --git a/dist/codicon.ttf b/dist/codicon.ttf
diff --git a/src/icons/circle-large-outline.svg → src/icons/circle-large.svg b/src/icons/circle-large-outline.svg → src/icons/circle-large.svg
diff --git a/src/icons/circle-outline.svg → src/icons/circle.svg b/src/icons/circle-outline.svg → src/icons/circle.svg
diff --git a/src/template/mapping.json b/src/template/mapping.json
@@ -168,6 +168,7 @@
   "chrome-minimize": 60090,
   "chrome-restore": 60091,
   "circle-outline": 60092,
+  "circle": 60092,
   "debug-breakpoint-unverified": 60092,
   "circle-slash": 60093,
   "circuit-board": 60094,
@@ -421,6 +422,7 @@
   "pinned-dirty": 60338,
   "pass-filled": 60339,
   "circle-large-filled": 60340,
+  "circle-large": 60341,
   "circle-large-outline": 60341,
   "combine": 60342,
   "gather": 60342,

diff --git a/src/template/preview.hbs b/src/template/preview.hbs
@@ -305,11 +305,11 @@
             description: 'dot round bullet'
         },
         {
-            name: 'circle-large-outline',
+            name: 'circle-large',
             description: 'dot round bullet'
         },
         {
-            name: 'circle-outline',
+            name: 'circle',
             description: 'dot round small bullet unverified breakpoint'
         },
         {