Adds D20 symbol from AFR, adds MTGA's snow mana variant (#69), adds the 2 alternate white mana symbols (#70), fixes missing Sass gradiant variable (#64 and #76), fixes Sass overwrite for kicker (#65)

2021-07-10 13:27:04 -04:00 · 2021-07-10 13:27:04 -04:00 · 3507f0ebf2
parent 958d12b79a
commit 3507f0ebf2
21 changed files with 379 additions and 241 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -11,6 +11,14 @@ All notable changes to this project will be documented in this file.

 ## Versions 

+### [1.13.0] 2021-07-10 D20, alternate white symbols, basic ligature support
+
+* **Added:** D20 ability symbol from Arena
+* **Added:** Alternate white mana symbols (the original pre-Ice Age symbol and the recent List variant) ([#70](https://github.com/andrewgioia/mana/issues/70))
+* **Added:** Arena's snow mana symbol variant ([#69](https://github.com/andrewgioia/mana/issues/69))
+* **Fixed:** Missing variable in `_variables.scss` for `.ms-ability-grad` added ([#64](https://github.com/andrewgioia/mana/issues/64) and [#76](https://github.com/andrewgioia/mana/issues/76))
+* **Fixed:** Kicker icon is no longer overwritten by the static ability icon in the Sass version ([#65](https://github.com/andrewgioia/mana/issues/65))
+
 ### [1.12.1] 2021-07-08 SVG files

 * **Added:** missing SVG files for the most recent abilities and type symbols.
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# Mana v1.12.1
+# Mana v1.13.0

 ## The Magic: the Gathering mana symbol font!

--- a/bower.json
+++ b/bower.json
@ -1,7 +1,7 @@
 {
  "name": "mana",
  "homepage": "https://github.com/andrewgioia/mana",
-  "version": "1.12.1",
+  "version": "1.13.0",
  "authors": [
    "Andrew Gioia <andrew@gioia.email>"
  ],
--- a/css/mana.css
+++ b/css/mana.css
@ -1,14 +1,14 @@
@font-face {
  font-family: 'Mana';
-  src: url('../fonts/mana.eot?v=1.12.0');
-  src: url('../fonts/mana.eot?#iefix&v=1.12.0') format('embedded-opentype'), url('../fonts/mana.woff?v=1.12.0') format('woff'), url('../fonts/mana.ttf?v=1.12.0') format('truetype'), url('../fonts/mana.svg?v=1.12.0#mana') format('svg');
+  src: url('../fonts/mana.eot?v=1.13.0');
+  src: url('../fonts/mana.eot?#iefix&v=1.13.0') format('embedded-opentype'), url('../fonts/mana.woff?v=1.13.0') format('woff'), url('../fonts/mana.ttf?v=1.13.0') format('truetype'), url('../fonts/mana.svg?v=1.13.0#mana') format('svg');
  font-weight: normal;
  font-style: normal;
 }
@font-face {
  font-family: 'MPlantin';
-  src: url('../fonts/mplantin.eot?v=1.12.0');
-  src: url('../fonts/mplantin.eot?#iefix&v=1.12.0') format('embedded-opentype'), url('../fonts/mplantin.woff?v=1.12.0') format('woff'), url('../fonts/mplantin.ttf?v=1.12.0') format('truetype'), url('../fonts/mplantin.svg?v=1.12.0#mplantin') format('svg');
+  src: url('../fonts/mplantin.eot?v=1.13.0');
+  src: url('../fonts/mplantin.eot?#iefix&v=1.13.0') format('embedded-opentype'), url('../fonts/mplantin.woff?v=1.13.0') format('woff'), url('../fonts/mplantin.ttf?v=1.13.0') format('truetype'), url('../fonts/mplantin.svg?v=1.13.0#mplantin') format('svg');
  font-weight: normal;
  font-style: normal;
 }
@ -28,6 +28,12 @@
 .ms-w::before {
  content: "\e600";
 }
+.ms-w-original::before {
+  content: "\e997";
+}
+.ms-w-list::before {
+  content: "\e998";
+}
 .ms-u::before {
  content: "\e601";
 }
@ -123,6 +129,9 @@
 .ms-s::before {
  content: "\e619";
 }
+.ms-s-mtga::before {
+  content: "\e996";
+}
 .ms-c::before {
  content: "\e904";
 }
@ -505,6 +514,9 @@
 .ms-ability-convoke::before {
  content: "\e949";
 }
+.ms-ability-d20::before {
+  content: "\e999";
+}
 .ms-ability-deathtouch::before {
  content: "\e94b";
 }
@ -954,6 +966,9 @@
  margin-left: -0.9em;
  font-size: 1.1em;
 }
+.ms-cost.ms-s-mtga::before {
+  color: #fff;
+}
 .ms-cost.ms-untap {
  background-color: #111;
  color: #fff;
--- a/css/mana.min.css
+++ b/css/mana.min.css
--- a/fonts/mana.eot
+++ b/fonts/mana.eot
--- a/fonts/mana.svg
+++ b/fonts/mana.svg
--- a/fonts/mana.ttf
+++ b/fonts/mana.ttf
--- a/fonts/mana.woff
+++ b/fonts/mana.woff
--- a/fonts/mana.woff2
+++ b/fonts/mana.woff2
--- a/index.html
+++ b/index.html
@ -86,6 +86,9 @@
                <i class="ms ms-b ms-cost ms-shadow"></i>
                <i class="ms ms-r ms-cost ms-shadow"></i>
                <i class="ms ms-g ms-cost ms-shadow"></i>
+                &nbsp;&nbsp;
+                <i class="ms ms-w ms-w-original ms-cost ms-shadow"></i>
+                <i class="ms ms-w ms-w-list ms-cost ms-shadow"></i>
            </div>
            <div class="sm-screen">
                <i class="ms ms-0 ms-cost ms-shadow"></i>
@ -124,6 +127,7 @@
            <i class="ms ms-rp ms-cost ms-shadow"></i>
            <i class="ms ms-gp ms-cost ms-shadow"></i>
            <i class="ms ms-s ms-cost ms-shadow"></i>
+            <i class="ms ms-s-mtga ms-cost ms-shadow"></i>
            <i class="ms ms-c ms-cost ms-shadow"></i>
            <i class="ms ms-e"></i>
            <br />
@ -349,6 +353,7 @@
            <i class="ms ms-ability-companion ms-2x" title="Companion"></i>
            <i class="ms ms-ability-constellation ms-2x" title="Constellation"></i>
            <i class="ms ms-ability-convoke ms-2x" title="Convoke"></i>
+            <i class="ms ms-ability-d20 ms-2x" title="D20"></i>
            <i class="ms ms-ability-deathtouch ms-2x" title="Deathtouch"></i>
            <i class="ms ms-ability-defender ms-2x" title="Defender"></i>
            <i class="ms ms-ability-devotion ms-2x" title="Devotion"></i>
--- a/less/cost.less
+++ b/less/cost.less
@ -242,21 +242,26 @@
    }

    // Snow mana
-    &.@{ms-prefix}-s::before {
-        color: #fff;
-        -webkit-text-stroke: 2px #fff;
-        font-size: 0.85em;
-        top: -0.05em;
-        position: relative;
-        display: inline-block;
-    }
-    &.@{ms-prefix}-s::after {
-        //text-shadow: -1px 1px 0 #fff, -1px -1px 0 #fff, 1px -1px 0 #fff, 1px 1px 0 #fff;
-        content: "\e619";
-        position: absolute;
-        color: #333;
-        margin-left: -0.9em;
-        font-size: 1.1em;
+    &.@{ms-prefix}-s {
+        &::before {
+            color: #fff;
+            -webkit-text-stroke: 2px #fff;
+            font-size: 0.85em;
+            top: -0.05em;
+            position: relative;
+            display: inline-block;
+        }
+        &::after {
+            //text-shadow: -1px 1px 0 #fff, -1px -1px 0 #fff, 1px -1px 0 #fff, 1px 1px 0 #fff;
+            content: "\e619";
+            position: absolute;
+            color: #333;
+            margin-left: -0.9em;
+            font-size: 1.1em;
+        }
+        &-mtga::before {
+            color: #fff;
+        }
    }

    // Tap symbols
--- a/less/icons.less
+++ b/less/icons.less
@ -4,6 +4,8 @@

    // resources
    &-w::before { content: "\e600"; }
+    &-w-original::before { content: "\e997"; }
+    &-w-list::before { content: "\e998"; }
    &-u::before { content: "\e601"; }
    &-b::before { content: "\e602"; }
    &-r::before { content: "\e603"; }
@ -39,6 +41,7 @@
    &-rp::before,
    &-gp::before { content: "\e618"; }
    &-s::before { content: "\e619"; }
+    &-s-mtga::before { content: "\e996"; }
    &-c::before { content: "\e904"; }
    &-e::before,
    &-energy::before{ content: "\e907"; }
@ -220,6 +223,7 @@
        &-companion::before { content: "\e97b"; }
        &-constellation::before { content: "\e97c"; }
        &-convoke::before { content: "\e949"; }
+        &-d20::before { content: "\e999"; }
        &-deathtouch::before { content: "\e94b"; }
        &-defender::before { content: "\e94c"; }
        &-devotion::before { content: "\e97d"; }
--- a/less/variables.less
+++ b/less/variables.less
@ -1,6 +1,6 @@
 // base variables
@ms-font-path: '../fonts';
-@ms-version: '1.12.0';
+@ms-version: '1.13.0';
@ms-font-size-base: 14px;
@ms-prefix: ms;
@ms-serif-font: MPlantin, Garamond, Palatino, 'Times New Roman', Times, serif;
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "mana-font",
-  "version": "1.12.1",
+  "version": "1.13.0",
  "description": "Magic: the Gathering mana symbol pictographic font",
  "main": "css/mana.css",
  "repository": {
--- a/sass/_cost.scss
+++ b/sass/_cost.scss
@ -241,21 +241,26 @@
    }

    // snow mana
-    &.#{$ms-prefix}-s::before {
-        color: #fff;
-        -webkit-text-stroke: 2px #fff;
-        font-size: 0.85em;
-        top: -0.05em;
-        position: relative;
-        display: inline-block;
-    }
-    &.#{$ms-prefix}-s::after {
-        //text-shadow: -1px 1px 0 #fff, -1px -1px 0 #fff, 1px -1px 0 #fff, 1px 1px 0 #fff;
-        content: "\e619";
-        position: absolute;
-        color: #333;
-        margin-left: -0.9em;
-        font-size: 1.1em;
+    &.#{$ms-prefix}-s {
+        &::before {
+            color: #fff;
+            -webkit-text-stroke: 2px #fff;
+            font-size: 0.85em;
+            top: -0.05em;
+            position: relative;
+            display: inline-block;
+        }
+        &::after {
+            //text-shadow: -1px 1px 0 #fff, -1px -1px 0 #fff, 1px -1px 0 #fff, 1px 1px 0 #fff;
+            content: "\e619";
+            position: absolute;
+            color: #333;
+            margin-left: -0.9em;
+            font-size: 1.1em;
+        }
+        &-mtga::before {
+            color: #fff;
+        }
    }

    // tap symbols
--- a/sass/_icons.scss
+++ b/sass/_icons.scss
@ -4,6 +4,8 @@

    // resources
    &-w::before { content: "\e600"; }
+    &-w-original::before { content: "\e997"; }
+    &-w-list::before { content: "\e998"; }
    &-u::before { content: "\e601"; }
    &-b::before { content: "\e602"; }
    &-r::before { content: "\e603"; }
@ -39,6 +41,7 @@
    &-rp::before,
    &-gp::before { content: "\e618"; }
    &-s::before { content: "\e619"; }
+    &-s-mtga::before { content: "\e996"; }
    &-c::before { content: "\e904"; }
    &-e::before,
    &-energy::before{ content: "\e907"; }
@ -220,6 +223,7 @@
        &-companion::before { content: "\e97b"; }
        &-constellation::before { content: "\e97c"; }
        &-convoke::before { content: "\e949"; }
+        &-d20::before { content: "\e999"; }
        &-deathtouch::before { content: "\e94b"; }
        &-defender::before { content: "\e94c"; }
        &-devotion::before { content: "\e97d"; }
@ -263,8 +267,7 @@
        &-spectacle::before { content: "\e96b"; }
        &-static::before,
            &-enchant::before,
-            &-improvise::before,
-            &-kicker::before { content: "\e962"; }
+            &-improvise::before { content: "\e962"; }
        &-summoning-sickness::before { content: "\e96a"; }
        &-surveil::before { content: "\e963"; }
        &-trample::before { content: "\e964"; }
--- a/sass/_variables.scss
+++ b/sass/_variables.scss
@ -1,6 +1,6 @@
 // base variables
 $ms-font-path: '../fonts' !default;
-$ms-version: '1.12.0' !default;
+$ms-version: '1.13.0' !default;
 $ms-font-size-base: 14px !default;
 $ms-prefix: ms !default;
 $ms-serif-font: 'MPlantin, Garamond, Palatino, 'Times New Roman', Times, serif' !default;
@ -21,4 +21,5 @@ $ms-green: #3d684b;

 // colors
 $ms-multicolor-flat: #cca753;
-$ms-multicolor-grad: linear-gradient(45deg, #cca54f 0%, #e0d3bb 50%, #cca54f 100%);
+$ms-multicolor-grad: linear-gradient(45deg, #cca54f 0%, #e0d3bb 50%, #cca54f 100%);
+$ms-ability-grad: linear-gradient(0deg, #c8913b 0%, #ecc65a 100%);
--- a/svg/ability-d20.svg
+++ b/svg/ability-d20.svg
@ -0,0 +1,5 @@
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="30" height="32" viewBox="0 0 30 32">
+<title>ability-d20</title>
+<path fill="#444" d="M4.654 18.61l10.584-10.096c0.514-0.509 0.811-0.123 0.927 0.312l3.409 14.3c0 0.404-0.171 0.576-0.576 0.576l-14.034-3.985c-0.531-0.088-0.841-0.664-0.31-1.107zM4.61 5.992c-0.404 0-0.724 0.271-0.724 0.676l0.303 9.926c0 0.404 0.191 0.953 0.997 0.422l9.474-9.209c0.354-0.487 0.044-0.841-0.599-0.865l-9.451-0.951zM20.37 22.107c0.117 0.636 0.727 0.647 1.043 0.255l7.236-9.066c0.185-0.329 0.125-0.547-0.204-0.733l-10.827-4.597c-0.329-0.185-0.864-0.064-0.679 0.615l3.432 13.524zM10.117 28.716c0.165 0.369 0.543 0.551 0.912 0.386l6.508-3.807c0.369-0.165 0.664-0.708-0.004-0.974l-11.861-3.497c-0.589-0.125-0.892 0.132-0.509 0.856l4.954 7.037zM15.191 6.341c0.781 0.089 0.656-0.063 0.974-0.664l1.466-3.095c0.324-0.643 0.301-0.95-0.274-0.801l-11.466 1.948c-1.471 0.31-1.964 1.195-1.383 1.372l10.683 1.24zM17.183 6.922c-0.603-0.343-0.369-0.633-0.084-1.312l1.376-3.168c0.279-0.607 0.531-0.839 1.099-0.39l7.98 7.352c1.166 1.417 0.907 2.16-0.129 1.818l-10.242-4.301zM21.441 23.868c-0.341 0.541-0.097 0.807 0.479 0.94l2.789 0.797c0.708 0.065 1.184-0.43 1.594-1.372l3.028-7.904c0.441-1.598-0.042-2.364-0.726-1.526zM22.656 27.080c1.299-0.587 0.849-0.874 0.105-1.122l-2.335-0.734c-0.657-0.2-1.107-0.033-1.694 0.32l-6.552 3.795c-1.042 0.709-1.579 1.093 0.153 0.837zM3.016 7.143c-0.191-1.392-1.14 0.397-1.24 1.245l-1.55 9.69c0 0.404 0.001 0.788 0.708 0.93l1.823 0.216c0.404 0 0.591-0.574 0.568-1.146l-0.31-10.935zM1.334 19.893c-0.305 0.011-1.921-0.103-1.107 0.908l7.792 8.362c0.708 0.603 1.151 0.404 1.151 0l-4.9-7.587c-0.353-0.552-0.895-1.301-1.229-1.412s-1.402-0.28-1.708-0.27z"></path>
+</svg>
--- a/svg/w-list.svg
+++ b/svg/w-list.svg
@ -0,0 +1,5 @@
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<title>w-list</title>
+<path fill="#444" d="M16 22.38c-3.524 0-6.38-2.856-6.38-6.38s2.856-6.38 6.38-6.38c3.523 0 6.38 2.856 6.38 6.38s-2.856 6.38-6.38 6.38zM16 9.029c3.854 0 6.979 3.124 6.979 6.979s-3.125 6.979-6.979 6.979-6.979-3.124-6.979-6.979c0-3.854 3.124-6.979 6.979-6.979zM16 0.078l-2.345 7.063-5.711-4.969 1.502 7.292-7.232-1.489 4.895 5.626-7.108 2.444 7.116 2.362-4.903 5.635 7.226-1.488-1.495 7.262 5.708-4.966 2.348 7.072 2.376-6.911 5.594 4.867-1.514-7.354 7.371 1.518-4.911-5.644 7.084-2.436-7.079-2.35 4.905-5.638-7.364 1.516 1.507-7.319-5.581 4.855-2.389-6.949z"></path>
+</svg>
--- a/svg/w-original.svg
+++ b/svg/w-original.svg
@ -0,0 +1,5 @@
+<!-- Generated by IcoMoon.io -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+<title>w-original</title>
+<path fill="#444" d="M16.929 0.001c0.414 0.004 0.617 0.373 0.776 0.709 0.588 1.364 0.804 2.848 1.099 4.293 0.12 0.564 0.635 1.099 1.246 1.038 0.662 0.069 1.253-0.288 1.763-0.668 0.917-0.64 1.94-1.167 3.043-1.389 0.539-0.035 1.159 0.045 1.567 0.434 0.151 0.114 0.138 0.318 0.108 0.484-0.111 0.147-0.249 0.271-0.379 0.399-0.62 0.57-1.109 1.279-1.443 2.052-0.204 0.418-0.208 0.908-0.126 1.356 0.123 0.141 0.242 0.347 0.454 0.344 0.525 0.032 1.053 0.021 1.578-0.010 0.745-0.133 1.491-0.297 2.193-0.586 0.356-0.106 0.764-0.304 1.121-0.097 0.228 0.092 0.314 0.341 0.378 0.558-0.113 0.766-0.586 1.399-1.054 1.987-0.434 0.538-0.9 1.046-1.376 1.546-0.218 0.274-0.521 0.554-0.495 0.936-0.011 0.165 0.011 0.339 0.091 0.485 0.467 0.010 0.952 0.059 1.404-0.094 0.687-0.185 1.353-0.432 2.030-0.652 0.266-0.101 0.601-0.034 0.761 0.216 0.15 0.31 0.108 0.661 0.053 0.989-0.039 0.695-0.135 1.473-0.667 1.98-1.090 0.933-2.257 1.775-3.476 2.532-0.354 0.178-0.35 0.634-0.224 0.956 0.669 1.11 1.706 1.944 2.387 3.046 0.173 0.257 0.201 0.612 0 0.863-0.382 0.496-0.988 0.827-1.611 0.88-0.886-0.109-1.648-0.608-2.432-0.995-0.365-0.055-0.849-0.117-1.057 0.268-0.281 0.527-0.41 1.118-0.589 1.685-0.337 1.195-0.573 2.417-0.766 3.642-0.021 0.352-0.12 0.691-0.221 1.026-0.284 0.048-0.486-0.145-0.634-0.362-0.756-0.971-1.47-1.974-2.14-3.007-0.189-0.283-0.336-0.607-0.609-0.823-0.151-0.083-0.338-0.040-0.501-0.028-0.176 0.16-0.274 0.383-0.341 0.607-0.346 1.115-0.739 2.221-1.278 3.26-0.301 0.603-0.829 1.046-1.354 1.451-0.403 0.293-0.829 0.59-1.327 0.689-0.476-0.054-0.677-0.57-0.806-0.968-0.348-1.377-0.422-2.8-0.602-4.203-0.021-0.598-0.175-1.322-0.781-1.59-0.394-0.066-0.821-0.090-1.206 0.021-0.521 0.345-0.861 0.892-1.297 1.331-0.615 0.607-1.121 1.378-1.944 1.727-0.293-0.744-0.334-1.576-0.183-2.357 0.123-0.489 0.298-0.908 0.463-1.385 0.113-0.325 0.162-0.813 0.025-1.075-0.256-0.49-0.869-0.7-1.352-0.928-1.333-0.585-2.911-0.999-4.311-1.384-0.156-0.043-0.199-0.188 0.196-0.396 0.74-0.39 1.674-0.415 2.285-1.032 0.028-0.257 0.119-0.617-0.133-0.79-0.361-0.283-0.81-0.425-1.248-0.541-0.593-0.052-1.195-0.058-1.787 0.008-0.573 0.17-1.28 0.089-1.672-0.402-0.444-0.589-0.342-1.403-0.021-2.024 0.237-0.459 0.727-0.706 1.203-0.846 0.761-0.201 1.551-0.27 2.337-0.272 0.312-0.041 0.642-0.058 0.931-0.196 0.428-0.502 0.332-1.207 0.3-1.815-0.183-0.428-0.6-0.686-0.887-1.037-0.325-0.398-0.702-0.819-0.802-1.306-0.038-0.183 0.074-0.352 0.138-0.502 0.355-0.553 1.025-0.786 1.64-0.912 0.929-0.204 1.856 0.108 2.771 0.253 0.701 0.111 0.829 0.035 1.243 0.021 0.025-0.174 0.101-0.373 0.003-0.536-0.218-0.297-0.535-0.534-0.647-0.898-0.074-0.455 0.144-0.883 0.335-1.28 0.514-0.982 1.081-1.937 1.673-2.874 0.182-0.28 0.352-0.58 0.621-0.785 0.212 0.108 0.273 0.352 0.357 0.555 0.25 0.711 0.548 1.404 0.825 2.104 0.113 0.274 0.221 0.562 0.435 0.776 0.194 0.040 0.397 0.042 0.595 0.009 0.572-0.28 1.055-0.773 1.226-1.399 0.373-1.39 0.672-2.813 1.268-4.13 0.186-0.353 0.367-0.789 0.777-0.927l0.080-0.012zM16.427 8.67c-4.030 0-7.298 3.267-7.298 7.298s3.267 7.298 7.298 7.298c4.030 0 7.298-3.267 7.298-7.298s-3.267-7.298-7.298-7.298zM16.427 22.321c3.509 0 6.353-2.844 6.353-6.353s-2.844-6.353-6.353-6.353-6.353 2.844-6.353 6.353c0 3.509 2.844 6.353 6.353 6.353z"></path>
+</svg>