Pulling in 1.6.0

attributes.html

@@ -103,7 +103,7 @@
                     </span>
                 </div>
                 <div class="explanation">
-                    <p>Even though there's only been <a href="http://magiccards.info/uh/en/16.html">one of these ever printed</a> you can still create them :P Half costs <a href="https://github.com/andrewgioia/Mana/issues/6">used to require a wrapping element</a> but as of v1.4.1 they are a regular single element:</p>
+                    <p>Even though there's only been <a href="http://magiccards.info/uh/en/16.html"><strike>one</strike></a> <a href="https://scryfall.com/card/unh/82/monss-goblin-waiters">two</a> of these ever printed you can still create them :P Half costs <a href="https://github.com/andrewgioia/Mana/issues/6">used to require a wrapping element</a> but as of v1.4.1 they are a regular single element:</p>
                     <blockquote>
                         &lt;<span class="e">i</span> <span class="a">class</span>=<span class="v">"ms ms-w ms-half ms-cost"</span>&gt;&lt;/<span class="e">i</span>&gt;<br />
                     </blockquote>
@@ -129,6 +129,25 @@
                 </div>
                 <div class="clear"></div>
             </section>
+            <section class="content">
+                <h4>Saga Symbols</h4>
+                <div class="example float-left">
+                    <span class="each">
+                        <i class="ms ms-saga ms-saga-1 ms-2x"></i> .ms-saga-1
+                    </span>
+                    <span class="each">
+                        <i class="ms ms-saga ms-saga-4 ms-2x"></i> .ms-saga-4
+                    </span>
+                </div>
+                <div class="explanation">
+                    <p>Saga symbols are supported natively up to V, even though only IV has ever been printed. The number that appears inside the hexagon is based on a class you add, like <code>.ms-saga-2</code>.</p>
+                    <blockquote>
+                        &lt;<span class="e">i</span> <span class="a">class</span>=<span class="v">"ms ms-saga ms-saga-1"</span>&gt;&lt;/<span class="e">i</span>&gt;<br />
+                        &lt;<span class="e">i</span> <span class="a">class</span>=<span class="v">"ms ms-saga ms-saga-4"</span>&gt;&lt;/<span class="e">i</span>&gt;
+                    </blockquote>
+                </div>
+                <div class="clear"></div>
+            </section>
             <section class="content">
                 <h4>Increase the Symbol's Size</h4>
                 <div class="example float-left">

cheatsheet.html

@@ -124,6 +124,8 @@
                     <span class="utf"><i>&#xe922;</i> ms-toughness <code>&amp;#xe922;</code></span>
                     <span class="utf"><i>&#xe923;</i> ms-artist-brush <code>&amp;#xe923;</code></span>
                     <span class="utf"><i>&#xe924;</i> ms-artist-nib <code>&amp;#xe924;</code></span>
+                    <span class="utf"><i>&#xe92a;</i> ms-saga <code>&amp;#xe92a;</code></span>
+                    <span class="utf"><i>&#xe929;</i> ms-acorn <code>&amp;#xe929;</code></span>
                     <div class="clear"></div>
                 </div>
                 <div class="vectors overflow">

icons.html

@@ -247,6 +247,12 @@
                     <div class="icon" id="artist-nib" name="Artist (Nib)">
                         <span><i class="ms ms-artist-nib"></i> Artist (Nib) <em>(artist-nib)</em></span>
                     </div>
+                    <div class="icon" id="saga" name="Saga">
+                        <span><i class="ms ms-saga ms-saga-1"></i> Saga <em>(saga)</em></span>
+                    </div>
+                    <div class="icon" id="acorn" name="Acorn">
+                        <span><i class="ms ms-acorn"></i> Acorn <em>(acorn)</em></span>
+                    </div>
                 </div>
 
                 <h4 style="padding-top:25px;">Guild and Clan Watermarks</h4>

index.html

@@ -44,7 +44,7 @@
                 </a>
             </div>
             <p>
-                Current version 1.4.1 includes all known mana and card icons.
+                Current version 1.6.0 includes all known mana and card icons.
             </p>
         </div>
     </header>

node_modules/mana-font/css/mana.css

@@ -2,15 +2,15 @@
  * Global */
 @font-face {
   font-family: 'Mana';
-  src: url('../fonts/mana.eot?v=1.4.1');
-  src: url('../fonts/mana.eot?#iefix&v=1.4.1') format('embedded-opentype'), url('../fonts/mana.woff?v=1.4.1') format('woff'), url('../fonts/mana.ttf?v=1.4.1') format('truetype'), url('../fonts/mana.svg?v=1.4.1#mana') format('svg');
+  src: url('../fonts/mana.eot?v=1.6.0');
+  src: url('../fonts/mana.eot?#iefix&v=1.6.0') format('embedded-opentype'), url('../fonts/mana.woff?v=1.6.0') format('woff'), url('../fonts/mana.ttf?v=1.6.0') format('truetype'), url('../fonts/mana.svg?v=1.6.0#mana') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 @font-face {
   font-family: 'MPlantin';
-  src: url('../fonts/mplantin.eot?v=1.4.1');
-  src: url('../fonts/mplantin.eot?#iefix&v=1.4.1') format('embedded-opentype'), url('../fonts/mplantin.woff?v=1.4.1') format('woff'), url('../fonts/mplantin.ttf?v=1.4.1') format('truetype'), url('../fonts/mplantin.svg?v=1.4.1#mplantin') format('svg');
+  src: url('../fonts/mplantin.eot?v=1.6.0');
+  src: url('../fonts/mplantin.eot?#iefix&v=1.6.0') format('embedded-opentype'), url('../fonts/mplantin.woff?v=1.6.0') format('woff'), url('../fonts/mplantin.ttf?v=1.6.0') format('truetype'), url('../fonts/mplantin.svg?v=1.6.0#mplantin') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -145,7 +145,7 @@
 .ms-cost.ms-2r:after,
 .ms-cost.ms-2g:after {
   top: 0.5em;
-  left: 1.0em;
+  left: 1em;
 }
 .ms-cost.ms-wu {
   background: #edf2b0;
@@ -313,8 +313,8 @@
   -moz-transform: scale(1.2, 1.2);
   -webkit-transform: scale(1.2, 1.2);
   transform: scale(1.2, 1.2);
-  padding-left: .06em;
-  padding-bottom: 0.10em;
+  padding-left: 0.06em;
+  padding-bottom: 0.1em;
 }
 .ms-cost.ms-s:before {
   color: #fff;
@@ -359,22 +359,22 @@
 }
 .ms-split:after {
   top: 0.5em;
-  left: 1.0em;
+  left: 1em;
 }
 /**
  * Half costs */
 span.ms-half {
-  width: .675em;
+  width: 0.675em;
   overflow: hidden;
   display: inline-block;
-  margin-left: .675em;
+  margin-left: 0.675em;
 }
 span.ms-half > .ms-cost {
   margin-left: -0.675em;
 }
 .ms-half {
-  width: .675em;
-  margin-left: .675em;
+  width: 0.675em;
+  margin-left: 0.675em;
   overflow: hidden;
   border-radius: 0 1em 1em 0;
 }
@@ -396,12 +396,13 @@ span.ms-half > .ms-cost {
 .ms-loyalty-zero,
 .ms-loyalty-start {
   color: #111;
-  font-size: 1.5em;
+  font-size: 21px;
   position: relative;
   text-align: center;
+  line-height: 0.9em;
 }
 .ms-loyalty-start {
-  font-size: 2.0em;
+  font-size: 25px;
 }
 .ms-loyalty-0:after,
 .ms-loyalty-1:after,
@@ -424,6 +425,7 @@ span.ms-half > .ms-cost {
 .ms-loyalty-18:after,
 .ms-loyalty-19:after,
 .ms-loyalty-20:after,
+.ms-loyalty-25:after,
 .ms-loyalty-x:after {
   color: #fff;
   display: inline-block;
@@ -431,10 +433,9 @@ span.ms-half > .ms-cost {
   font-family: MPlantin, Garamond, Palatino, 'Times New Roman', Times, serif;
   position: absolute;
   left: 0;
-  line-height: 1.75em;
+  line-height: 2em;
   width: 100%;
   text-align: center;
-  -webkit-padding-before: 0.15em;
 }
 .ms-loyalty-0:after {
   content: "0";
@@ -499,6 +500,9 @@ span.ms-half > .ms-cost {
 .ms-loyalty-up.ms-loyalty-20:after {
   content: "+20";
 }
+.ms-loyalty-up.ms-loyalty-25:after {
+  content: "+25";
+}
 .ms-loyalty-up.ms-loyalty-x:after {
   content: "+X";
 }
@@ -562,11 +566,14 @@ span.ms-half > .ms-cost {
 .ms-loyalty-start.ms-loyalty-20:after {
   content: "20";
 }
+.ms-loyalty-start.ms-loyalty-25:after {
+  content: "25";
+}
 .ms-loyalty-start.ms-loyalty-x:after {
   content: "X";
 }
 .ms-loyalty-down:after {
-  line-height: 1.6em;
+  line-height: 1.8em;
 }
 .ms-loyalty-down.ms-loyalty-1:after {
   content: "-1";
@@ -628,14 +635,49 @@ span.ms-half > .ms-cost {
 .ms-loyalty-down.ms-loyalty-20:after {
   content: "-20";
 }
+.ms-loyalty-down.ms-loyalty-25:after {
+  content: "-25";
+}
 .ms-loyalty-down.ms-loyalty-x:after {
   content: "-X";
 }
+/**
+ * Saga loyalty */
+.ms-saga-1:after,
+.ms-saga-2:after,
+.ms-saga-3:after,
+.ms-saga-4:after,
+.ms-saga-5:after {
+  color: #fff;
+  display: inline-block;
+  font-size: 0.6em;
+  font-family: MPlantin, Garamond, Palatino, 'Times New Roman', Times, serif;
+  position: absolute;
+  left: 0;
+  line-height: 1.75em;
+  width: 100%;
+  text-align: center;
+}
+.ms-saga-1:after {
+  content: "I";
+}
+.ms-saga-2:after {
+  content: "II";
+}
+.ms-saga-3:after {
+  content: "III";
+}
+.ms-saga-4:after {
+  content: "IV";
+}
+.ms-saga-5:after {
+  content: "V";
+}
 /**
  * Double faced cards */
 .ms-dfc {
   color: #111;
-  border: .05em solid #111;
+  border: 0.05em solid #111;
   border-radius: 2em;
   padding: 0.025em;
 }
@@ -648,7 +690,7 @@ span.ms-half > .ms-cost {
   font-size: 2.25em;
 }
 .ms-4x {
-  font-size: 3.0em;
+  font-size: 3em;
 }
 .ms-5x {
   font-size: 3.75em;
@@ -809,6 +851,12 @@ span.ms-half > .ms-cost {
 .ms-multiple:before {
   content: "\e925";
 }
+.ms-saga:before {
+  content: "\e92a";
+}
+.ms-acorn:before {
+  content: "\e929";
+}
 /**
  * Split symbols */
 .ms-wu:before,

node_modules/mana-font/fonts/mana.svg

@@ -95,4 +95,6 @@
 <glyph unicode="&#xe926;" glyph-name="polis-setessa" d="M497.574 642.676c10.036 0.812 20.178 0.834 30.214-0.128 34.526-4.206 65.316-28.974 77.528-61.43 6.256-15.566 7.452-32.732 5.51-49.28-4.206-30.62-24.15-58.42-51.63-72.47-27.714-14.198-61.92-14.754-90.254-1.964-25.324 11.36-44.968 34.356-52.59 61.024-7.624 24.982-4.25 52.89 8.604 75.566 14.54 26.604 42.448 45.416 72.618 48.682zM246.344 475.156c21.058-131.582 130.764-230.454 264.34-234.090 131.748 1.038 246.836 102.844 265.968 232.846 2.532-21.92 1.896-11.906 2.418-30.002 0-129.716-119.502-240.21-267.318-240.21s-267.968 110.494-267.968 240.21c0.534 18.512-0.114 8.082 2.56 31.246zM122.478 868.878c-4.010-0.1-8.028-0.006-12.026-0.298-8.216-0.602-10.968-1.272-18.022-2.626-16.078-3.436-31.076-7.854-44.786-16.486-14.724-9.27-27.804-21.21-36.558-36.050-5.254-8.968-10.554-20.488-10.874-31.1-0.342-12.874-0.79-26.156 3.288-38.54 3.116-11.808 14.134-19.516 24.896-23.808 9.458-1.878 19.516-1.75 28.932 0.428 15.182 4.142 21.908 21.972 19.474 36.362-1.346 10.698-10.036 18.94-10.592 29.85-1.6 15.608 10.206 30.47 25.132 34.142 17.7 4.1 37.11 4.506 53.764-3.694 26.284-12.020 43.73-37.216 54.448-63.222 15.716-39.544 18.768-84.406 6.534-125.316-4.506-15.672-12.684-29.914-18.662-45.010-38.178-92.006-43.964-197.486-13.088-292.416 22.568-71.36 65.742-136.29 123.906-183.542 55.494-45.608 124.994-74.156 196.652-79.878 39.928-2.712 79.942 4.824 117.8 17.124 44.348 14.968 85.664 38.732 121.172 69.18 55.986 48.534 97.43 113.55 118.44 184.546 30.17 99.97 20.54 210.702-24.234 304.8-10.912 22.42-17.082 47.21-16.976 72.192-1.344 38.006 8.156 77.038 30 108.49 12.064 17.402 29.316 31.856 50.028 37.43 12.96 3.502 26.648 2.242 39.672-0.15 15.352-2.776 27.822-17.21 27.758-32.86-0.342-9.674-6.684-17.466-9.694-26.306-2.606-12.364-1.688-27.182 8.178-36.298 8.39-7.56 20.434-7.26 31.002-6.94 10.89 0.064 20.136 7.174 27.48 14.498 8.264 11.68 8.392 26.754 8.456 40.504 0.172 9.16-0.598 18.576-4.826 26.882-9.5 19.688-23.678 37.986-43.28 48.406-14.84 7.836-30.598 14.54-47.23 17.316-17.104 3.032-34.442 0.406-51.652 0.128-35.316-3.224-64.14-27.822-85.386-54.532-14.562-19.11-29.722-39.224-34.42-63.352-4.654-24.832-7.344-50.006-9.052-75.202-0.598-35.274 9.842-69.458 12.64-104.432 1.344-27.738-0.172-55.858-8.542-82.506-9.010-26.946-19.216-53.528-31.494-79.172-13.196-26.734-35.252-47.936-59.208-65.168-41.594-30.084-92.070-47.806-143.358-50.070-60.234-0.982-119.806 21.332-166.824 58.526-19.622 15.608-37.004 34.612-48 57.31-9.224 19.708-17.572 39.82-24.896 60.298-14.99 37.6-19.41 79.3-12.79 119.186 4.228 31.41 12.362 62.648 9.992 94.568-1.964 22.932-4.42 45.866-8.988 68.434-4.228 20.050-16.058 37.196-27.908 53.488-14.776 19.836-32.134 38.412-53.806 50.732-12.982 7.152-28.106 10.522-42.862 12.516-11.082 1.324-4.556 0.672-19.61 1.638z" />
 <glyph unicode="&#xe927;" glyph-name="polis-akros" horiz-adv-x="800" d="M177.356 902.572c144.694 0.088 289.366-0.090 434.060 0.088-0.2-46.112 0.112-92.224-0.154-138.334 62.92-0.202 125.818-0.090 188.738-0.068-0.088-256.95 0.088-513.902-0.066-770.852-29.348 0.044-58.696 0.090-88.022-0.022-3.292-0.178-6.448 0.312-9.516 1.49 0.6 13.874-0.69 27.746-1.068 41.598l-0.978 1.268c-4.624 62.164-19.832 123.55-43.4 181.224-0.778 2.2-1.512 4.424-2.178 6.624-7.76 16.232-14.252 33.128-23.234 48.714-4.892 9.628-9.628 19.388-15.696 28.37-15.942 28.348-34.93 54.916-55.34 80.218-7.892 10.428-17.208 19.654-25.346 29.904-9.938 8.626-17.23 19.766-27.414 28.192-8.692 10.116-20.232 16.896-29.192 26.68-9.182 7.048-17.876 14.696-26.99 21.832-5.336 3.358-10.118 7.494-15.276 11.118-18.876 13.272-37.93 26.368-58.094 37.684-15.608 9.406-32.040 17.232-48.18 25.614-2.49 0.978-4.936 2.090-7.404 3.112-22.212 10.538-45.156 19.322-68.324 27.526-7.514 1.934-14.918 4.268-22.232 6.848-14.030 3.868-28.014 7.78-42.2 10.96-14.806 3.29-29.636 6.426-44.666 8.448-5.136 1.068-10.406 1.446-15.496 2.646-42.978 5.604-86.356 6.96-129.666 5.248 0 45.178 0.066 90.334-0.022 135.49 59.186 0.088 118.348-0.022 177.534 0.066-0.29 46.090 0.066 92.202-0.178 138.314zM0 535.5c0.112-180.668 0-361.36 0.044-542.050 197.322-0.066 394.62 0.046 591.918-0.022 5.47 0.312 11.474-1.156 16.432 1.868-1.046 3.202-1.58 6.448-1.624 9.782-0.466 28.592-4.714 56.984-9.938 85.066l-0.822 1.312c-3.78 23.21-10.762 45.822-18.432 68.034-29.86 86.998-82.508 165.66-150.298 227.646-15.718 12.54-29.792 27.28-47.046 37.864-23.478 17.742-48.868 32.838-74.882 46.556-5.936 3.246-11.872 6.492-18.164 8.96-4.914 2.846-10.472 4.38-15.274 7.404-29.616 12.54-60.208 22.566-91.18 31.126-29.992 7.048-60.408 12.362-91.066 15.43-11.362 1.334-22.834 0.802-34.196 1.802-18.476 2.046-36.996-0.134-55.472-0.778z" />
 <glyph unicode="&#xe928;" glyph-name="polis-meletis" horiz-adv-x="584" d="M301.056 905.17l5.584-0.246c30.796-2.040 60.866-15.126 82.998-36.714 25.062-24.032 40.288-58.464 39.824-93.298 1.514-45.74-23.71-91.34-63.21-114.442-8.48-4.848-17.244-9.794-27.040-11.228 18.862-3.554 37.946-6.382 56.342-12.056 52.204-15.066 101.72-42.692 137.948-83.666 26.050-28.898 44.326-65.33 49.536-104.042 1.536-44.832 0.978-49.668 0.958-54.374l-0.002-361.298v-41.010h-120.422v41.010h0.094c0.078 187.454 0.084 87.2-0.056 300.766-0.444 13.408 1.15 27.040-1.676 40.268-3.938 19.022-18.276 35.078-36.148 42.306-3.312 0.97-6.624 1.878-9.876 2.95-10.278 1.050-20.76 0.786-30.554-2.748-17.426-6.986-31.584-22.132-36.066-40.53-2.746-11.794-2.788-24.010-2.646-36.046-0.202-115.412-0.020-230.844-0.12-346.254-35.886 0.080-71.772 0.060-107.656 0.020-0.020 118.744 0.12 237.486-0.122 356.23 0.284 10.924-0.746 22.032-4.482 32.372-5.15 13.852-15.812 25.020-28.738 31.946-4.038 1.516-8.118 2.99-12.176 4.444-8.542 1.474-17.348 1.596-25.89-0.060-3.534-1.172-7.028-2.384-10.602-3.374-21.122-9.712-35.098-31.906-35.016-55.11-0.384-122.116-0.202-244.252-0.142-366.368-40.914-0.060-80.678 0.002-121.57 0.184l-0.020 7.794c0.242 83.060 0.264 166.118 0.264 249.198 0.342 57.212-0.688 114.462 0.766 171.654 2.99 33.26 5.634 50.748 12.178 67.066 2.16 5.25 4.442 10.44 6.764 15.61 15.934 32.552 40.934 59.896 69.59 81.726 28.272 21.244 60.462 37.078 94.268 47.336l1.292 0.606c17.892 5.29 36.148 9.27 54.584 12.158 5.474 0.202 10.926 0.402 16.378 0.828-33.34 9.732-61.208 34.936-76.374 65.934-14.218 28.332-17.59 61.876-9.37 92.47 7.734 29.808 26.372 56.666 51.716 74.194 24.48 17.11 49.434 23.206 78.89 23.794z" />
+<glyph unicode="&#xe929;" glyph-name="acorn" horiz-adv-x="988" d="M913.404 958.754c1.694-2.016 1.108-1.006 1.956-2.908 15.536-42.664 25.55-88.846 69.304-125.368 8.016-9.104-8.66-22.726-14.542-28.008-8.336-7.482-19.63-16.062-28.142-22.422-21.558-16.108-43.834-31.29-64.56-48.488 10.644-49.962-0.146-101.642 12.492-151.388 62.704-96.904 151.16-270.1 56.856-374.522-31.804-30.844-75.712-41.774-119.042-39.836 14.496 21.338 23.246 45.85 25.362 71.494-0.004 38.504-18.698 91.45-39.254 123.102-47.652 73.378-104.116 143.886-164.45 207.038-58.066 57.25-119.85 108.198-185.562 156.608-44.474 32.764-133.58 79.688-191.068 67.494-20.308-5.632-38.16-16.574-56.044-27.284-3.83 50.608 4.578 93.804 39.248 132.194 110.11 97.696 288.406-0.53 388.554-66.078 24.356-10.148 52.172-5.25 77.678-4.502 25.012 0.014 51.794 1.188 75.566-8.196 36.342 37.754 61.2 84.56 94.164 124.98 4.456 5.462 11.048 14.89 18.668 16.69 0.934 0.222 1.878-0.4 2.816-0.6zM352.928 643.734c12.956-15.23 36.792-47.198 12.864-63.63-221.086-113.786-283.26-415.156-283.26-415.156s-109.826 265.548 163.458 488.798c37.216 30.402 73.878 21.614 106.938-10.012zM609.366 527.844c-54.738 53.942-110.362 106.762-172.594 152.086-42.118 30.674-115.322 82.852-170.712 70.148-122.424-40.14-228.756-209.29-260.57-362.2-16.632-79.94 8.398-182.872 23.752-265.97 15.726-85.114 12.042-144.498 12.042-144.498s42.964 9.616 124.43-4.014c83.11-13.906 205.474-50.87 279.966-31.108 147.51 39.136 354.224 169.586 363.254 288.998 0.666 36.958-23.348 75.664-42.526 105.688-44.464 69.602-100.228 131.304-157.042 190.87z" />
+<glyph unicode="&#xe92a;" glyph-name="saga" horiz-adv-x="908" d="M13.222 193c-17.954 25.666-16.67 483.662 0 510 16.668 26.338 400.52 254.912 441.672 255 41.154 0.088 429.206-226.932 441.674-255 12.466-28.068 17.208-481.262 0-510-17.21-28.738-403.69-254.984-441.674-255-37.982-0.016-423.72 229.334-441.672 255z" />
 </font></defs></svg>

package-lock.json

@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "mana-font": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/mana-font/-/mana-font-1.4.1.tgz",
-      "integrity": "sha512-1Taj0AOaszqA3VoEKaPH73NIH5kT7sZBJMt455UGAquan80UVh2Nu3ZNkSDqpj+ZgR6pIKtyhlyT6ntVGzKQlw=="
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mana-font/-/mana-font-1.6.0.tgz",
+      "integrity": "sha512-Hsou/8NEW9v0fyaWBxudKLZrGxN3stPwmEOGBOLSphhLrdyqtSLGfPrEph/xJnynSHdDiNmxdU7GxfAktFRGHQ=="
     },
     "zepto": {
       "version": "1.2.0",

package.json

@@ -20,7 +20,7 @@
     "font"
   ],
   "author": "Andrew Gioia <andrewgioia@gmail.com>",
-  "license": "OFL 1.1",
+  "license": "(OFL-1.1 AND GPL-3.0-only)",
   "bugs": {
     "url": "https://github.com/andrewgioia/Mana/issues"
   },