Adds CBL set symbol (#186) and NNC set symbol (#184)

CHANGELOG.md

@@ -4,11 +4,17 @@ All notable changes to this project will be documented in this file.
 
 ## Unreleased
 
+* Support apparent "tri-layered" symbols, like SNC and CBL where there's a rarity layer, a fixed white layer, and a border. These are unlike the dual-layered symbols like AFR and MID.
 * Validate all class names to handle official set codes, MODO codes, and MTGJson/community fallbacks
 * Update this changelog for better formatting 
 
 ## Versions 
 
+### [3.9.2] 2022-03-26 Commander Legends: Battle for Baldur's Gate and Streets of New Capenna Commander
+
+* **Added:** Commander Legends: Battle for Baldur's Gate (CBL) set symbol, along with it's white insert dual-layered symbol ([#186](https://github.com/andrewgioia/keyrune/issues/186))
+* **Added:** Streets of New Capenna Commander (NNC) set symbol and 2 additional dual-layered symbols as an alternate ([#184](https://github.com/andrewgioia/keyrune/issues/184))
+
 ### [3.9.1] 2022-03-25 Kamigawa Commander and Streets of New Capenna
 
 * **Added:** Kamigawa, Neon Dynasty Commander (NEC) set symbol ([#180](https://github.com/andrewgioia/keyrune/issues/180))

README.md

@@ -1,4 +1,4 @@
-# Keyrune v3.9.1
+# Keyrune v3.9.2
 
 ## The Magic: the Gathering set symbol font!
 

bower.json

@@ -1,7 +1,7 @@
 {
     "name": "keyrune",
     "homepage": "http://keyrune.andrewgioia.com",
-    "version": "3.9.1",
+    "version": "3.9.2",
     "authors": [
         "Andrew Gioia <andrew@gioia.email>"
     ],

css/keyrune.css

@@ -2,8 +2,8 @@
  * Global */
 @font-face {
   font-family: 'Keyrune';
-  src: url('../fonts/keyrune.eot?v=3.9.1');
+  src: url('../fonts/keyrune.eot?v=3.9.2');
-  src: url('../fonts/keyrune.eot?#iefix&v=3.9.1') format('embedded-opentype'), url('../fonts/keyrune.woff2?v=3.9.1') format('woff2'), url('../fonts/keyrune.woff?v=3.9.1') format('woff'), url('../fonts/keyrune.ttf?v=3.9.1') format('truetype'), url('../fonts/keyrune.svg?v=3.9.1#keyrune') format('svg');
+  src: url('../fonts/keyrune.eot?#iefix&v=3.9.2') format('embedded-opentype'), url('../fonts/keyrune.woff2?v=3.9.2') format('woff2'), url('../fonts/keyrune.woff?v=3.9.2') format('woff'), url('../fonts/keyrune.ttf?v=3.9.2') format('truetype'), url('../fonts/keyrune.svg?v=3.9.2#keyrune') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -71,6 +71,9 @@
 .ss-duo.ss-c21::after {
   content: "\e97f";
 }
+.ss-duo.ss-cbl::after {
+  content: "\e992";
+}
 .ss-duo.ss-cc2::after {
   content: "\e988";
 }
@@ -80,6 +83,12 @@
 .ss-duo.ss-mid::after {
   content: "\e979";
 }
+.ss-duo.ss-nnc::before {
+  content: "\e98f";
+}
+.ss-duo.ss-nnc::after {
+  content: "\e990";
+}
 .ss-duo.ss-common:after {
   color: #fff;
 }
@@ -88,6 +97,11 @@
 .ss-duo.ss-mythic::after {
   color: #000;
 }
+.ss-duo.ss-uncommon.ss-cbl::after,
+.ss-duo.ss-rare.ss-cbl::after,
+.ss-duo.ss-mythic.ss-cbl::after {
+  color: #fff;
+}
 /**
  * Rarity colors */
 .ss-common {
@@ -709,6 +723,12 @@
 .ss-nec:before {
   content: "\e98d";
 }
+.ss-nnc:before {
+  content: "\e98e";
+}
+.ss-cbl:before {
+  content: "\e991";
+}
 /**
  * Reprint */
 .ss-chr:before {

docs/cheatsheet.html

@@ -99,6 +99,7 @@
                     <span class="utf"><i>&#xe95f;</i> ss-c19 <code>&amp;#xe95f;</code></span>
                     <span class="utf"><i>&#xe966;</i> ss-c20 <code>&amp;#xe966;</code></span>
                     <span class="utf"><i>&#xe97e;</i> ss-c21 <code>&amp;#xe97e;</code></span>
+                    <span class="utf"><i>&#xe991;</i> ss-cbl <code>&amp;#xe991;</code></span>
                     <span class="utf"><i>&#xe968;</i> ss-cc1 <code>&amp;#xe968;</code></span>
                     <span class="utf"><i>&#xe987;</i> ss-cc2 <code>&amp;#xe987;</code></span>
                     <span class="utf"><i>&#xe634;</i> ss-chk <code>&amp;#xe634;</code></span>
@@ -225,6 +226,7 @@
                     <span class="utf"><i>&#xe98d;</i> ss-nec <code>&amp;#xe98d;</code></span>
                     <span class="utf"><i>&#xe98c;</i> ss-neo <code>&amp;#xe98c;</code></span>
                     <span class="utf"><i>&#xe626;</i> ss-nms <code>&amp;#xe626;</code></span>
+                    <span class="utf"><i>&#xe98e;</i> ss-nnc <code>&amp;#xe98e;</code></span>
                     <span class="utf"><i>&#xe649;</i> ss-nph <code>&amp;#xe649;</code></span>
                     <span class="utf"><i>&#xe62b;</i> ss-ody <code>&amp;#xe62b;</code></span>
                     <span class="utf"><i>&#xe901;</i> ss-ogw <code>&amp;#xe901;</code></span>
@@ -367,10 +369,13 @@
                 <div class="vectors overflow-hidden">
                     <span class="utf"><i>&#xe982;</i> afc border <code>&amp;#xe982;</code></span>
                     <span class="utf"><i>&#xe973;</i> afr border <code>&amp;#xe973;</code></span>
+                    <span class="utf"><i>&#xe992;</i> cbl inner <code>&amp;#xe992;</code></span>
                     <span class="utf"><i>&#xe97f;</i> c21 border <code>&amp;#xe97f;</code></span>
                     <span class="utf"><i>&#xe988;</i> cc2 border <code>&amp;#xe988;</code></span>
                     <span class="utf"><i>&#xe984;</i> j21 border <code>&amp;#xe984;</code></span>
                     <span class="utf"><i>&#xe979;</i> mid border <code>&amp;#xe979;</code></span>
+                    <span class="utf"><i>&#xe98f;</i> nnc inner color <code>&amp;#xe98f;</code></span>
+                    <span class="utf"><i>&#xe990;</i> nnc inner wing <code>&amp;#xe990;</code></span>
                     <div class="clear"></div>
                 </div>
             </section>

docs/icons.html

@@ -37,7 +37,7 @@
                 <i class="ss ss-pmtg2"></i>
                 Download
             </a>
-            <h2 class="sub">Complete 291 Magic set symbol font icons</h2>
+            <h2 class="sub">Complete 293 Magic set symbol font icons</h2>
         </div>
     </header>
 
@@ -45,7 +45,7 @@
         <div class="wrapper">
             <section>
                 <h3>
-                    View the full list of 291 set and expansion symbols below, for all sets and special edition products up to <strong>Streets of New Capenna</strong>. To use the symbols on your desktop or just get the vectors, check out the <a href="cheatsheet.html">Cheatsheet</a>.
+                    View the full list of 291 set and expansion symbols below, for all sets and special edition products up to <strong>Streets of New Capenna</strong> and <strong>Commander Legends: Battle for Baldur's Gate</strong>. To use the symbols on your desktop or just get the vectors, check out the <a href="cheatsheet.html">Cheatsheet</a>.
                 </h3>
                 <p style="margin: -15px 0 25px;">
                     <strong>Note:</strong> you can now link directly to a preview of each symbol's by adding the symbol code at the end of the url like this: <a href="https://keyrune.andrewgioia.com/icons.html?icon=ody">https://keyrune.andrewgioia.com/icons.html?icon=ody</a>.
@@ -407,7 +407,7 @@
                     <div class="icon" id="stx" name="Strixhaven: School of Mages" data-name="Strixhaven: School of Mages" data-class="stx" data-unicode="e975" data-added="v3.7.0">
                         <span class="name"><i class="ss ss-stx"></i> Strixhaven: School of Mages <em>(stx)</em></span>
                     </div>
-                    <div class="icon" id="mid" name="Innistrad Werewolves" data-name="Innistrad Werewolves" data-class="mid" data-unicode="e978" data-added="v3.7.0" data-duo="true">
+                    <div class="icon" id="mid" name="Innistrad: Midnight Hunt" data-name="Innistrad: Midnight Hunt" data-class="mid" data-unicode="e978" data-added="v3.7.0" data-duo="true">
                         <span class="name"><i class="ss ss-mid ss-duo"></i> Innistrad: Midnight Hunt <em>(mid)</em></span>
                     </div>
                     <div class="icon" id="vow" name="Innistrad: Crimson Vow" data-name="Innistrad: Crimson Vow" data-class="vow" data-unicode="e977" data-added="v3.7.0">
@@ -520,9 +520,15 @@
                     <div class="icon" id="cc2" name="Commander Collection: Black" data-name="Commander Collection: Black" data-class="cc2" data-unicode="e987" data-added="v3.8.4" data-duo="true">
                         <span class="name"><i class="ss ss-cc2 ss-duo ss-common"></i> Commander Collection: Black <em>(cc2)</em></span>
                     </div>
-                    <div class="icon" id="nec" name="Kamigawa: Neon Dynasty Commander" data-name="Kamigawa: Neon Dynasty Commander" data-class="nec" data-unicode="e98d" data-added="v3.9.1">
+                    <div class="icon" id="nec" name="Kamigawa: Neon Dynasty: Commander" data-name="Kamigawa: Neon Dynasty: Commander" data-class="nec" data-unicode="e98d" data-added="v3.9.1">
                         <span class="name"><i class="ss ss-nec"></i> Kamigawa Commander <em>(nec)</em></span>
                     </div>
+                    <div class="icon" id="nnc" name="Streets of New Capenna: Commander" data-name="Streets of New Capenna: Commander" data-class="nnc" data-unicode="e98e" data-added="v3.9.2" data-duo="true">
+                        <span class="name"><i class="ss ss-nnc ss-common"></i> Streets of New Capenna Commander <em>(nnc)</em></span>
+                    </div>
+                    <div class="icon" id="cbl" name="Commander Legends: Battle for Baldur's Gate" data-name="Commander Legends: Battle for Baldur's Gate" data-class="cbl" data-unicode="e991" data-added="v3.9.2" data-duo="true">
+                        <span class="name"><i class="ss ss-cbl ss-duo ss-common"></i> Commander Legends: Battle for Baldur's Gate <em>(cbl)</em></span>
+                    </div>
                 </div>
             </section>
             <section class="content">

docs/index.html

@@ -43,7 +43,7 @@
                 </a>
             </div>
             <p>
-                Current version 3.9.1 includes all sets to Streets of New Capenna.
+                Current version 3.9.2 includes all sets to Streets of New Capenna.
             </p>
         </div>
     </header>

less/duo.less

@@ -38,6 +38,11 @@
         content: "\e97f";
     }
 
+    // Commander Legends: Battle for Baldur's Gate
+    &.@{ss-prefix}-cbl::after {
+        content: "\e992";
+    }
+
     // Commander Collection: Black
     &.@{ss-prefix}-cc2::after {
         content: "\e988";
@@ -53,14 +58,31 @@
         content: "\e979";
     }
 
+    // Streets of New Capenna: Commander
+    // uses 2 separate glyphs to construct this
+    &.@{ss-prefix}-nnc {
+        &::before {
+            content: "\e98f";
+        }
+        &::after {
+            content: "\e990";
+        }
+    }
+
     // rarity border colors
     &.@{ss-prefix}-common:after {
         color: #fff;
     }
-    &.@{ss-prefix}-uncommon::after,
+    &.@{ss-prefix}-uncommon,
-    &.@{ss-prefix}-rare::after,
+    &.@{ss-prefix}-rare,
-    &.@{ss-prefix}-mythic::after {
+    &.@{ss-prefix}-mythic {
-        color: #000;
+        &::after {
+            color: #000;
+        }
+        // exceptions
+        &.@{ss-prefix}-cbl::after {
+            color: #fff;
+        }
     }
 
 }

less/icons.less

@@ -203,6 +203,8 @@
 .@{ss-prefix}-voc:before { content: "\e986"; } // Crimson Vow Commander
 .@{ss-prefix}-cc2:before { content: "\e987"; } // Commander Collection: Black (inner)
 .@{ss-prefix}-nec:before { content: "\e98d"; } // Kamigawa: Neon Dynasty Commander
+.@{ss-prefix}-nnc:before { content: "\e98e"; } // Streets of New Capenna Commander
+.@{ss-prefix}-cbl:before { content: "\e991"; } // Commander Legends: Battle for Baldur's Gate
 
 /**
  * Reprint */

less/variables.less

@@ -2,6 +2,6 @@
  * Global */
 
 @ss-font-path: '../fonts';
-@ss-version: '3.9.1';
+@ss-version: '3.9.2';
 @ss-font-size-base: 14px;
 @ss-prefix: ss;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "keyrune",
   "description": "Keyrune",
-  "version": "3.9.1",
+  "version": "3.9.2",
   "author": {
     "name": "Andrew Gioia",
     "email": "andrew@gioia.email",

sass/_helpers.scss

@@ -73,6 +73,11 @@
         }
     }
 
+    // manual corrections
+    &.#{$keyrune_prefix}-nnc::before {
+        content: "\e98f";
+    }
+
     // rarity border colors
     &.#{$keyrune_prefix}-common {
         color: #fff;

sass/_variables.scss

@@ -1,7 +1,7 @@
 /**
  * Globals */
 
-$keyrune_version: '3.9.1' !default;
+$keyrune_version: '3.9.2' !default;
 $keyrune_font_path:  '../fonts' !default;
 
 // font specific
@@ -55,9 +55,11 @@ $dual-layered: (
     'afc': '\e982',
     'afr': '\e973',
     'c21': '\e97f',
+    'cbl': '\e992',
     'cc2': '\e988',
     'j21': '\e984',
-    'mid': '\e979'
+    'mid': '\e979',
+    'nnc': '\e990'
 ) !default;
 
 // sets
@@ -259,7 +261,8 @@ $keyrune_sets: (
     ("Innistrad: Crimson Vow Commander", "voc", "\e986"),
     ("Commander Collection: Black", "cc2", "\e987"),
     ("Kamigawa: Neon Dynasty Commander", "nec", "\e98d"),
-
+    ("Streets of New Capenna Commander", "nnc", "\e98e"),
+    ("Commander Legends: Battle for Baldur's Gate", "cbl", "\e991"),
     //
     // Reprint sets
     ("Chronicles", "chr", "\e65e"),