Updating docs for 1,000,000 icon correction

bower_components/mana/.bower.json

@@ -28,11 +28,11 @@
     ".git",
     ".gitignore"
   ],
-  "_release": "ccd4be1b7c",
+  "_release": "0735159a32",
   "_resolution": {
     "type": "branch",
     "branch": "master",
-    "commit": "ccd4be1b7cd05aca93a9e6bf1dae741869acd1d3"
+    "commit": "0735159a3249cbd47b39ead6c8974e82a293d3be"
   },
   "_source": "https://github.com/andrewgioia/Mana.git",
   "_target": "*",

bower_components/mana/README.md

@@ -1,9 +1,27 @@
-# Mana v1.3.0
+# Mana v1.3.1
 
 ## The Magic: the Gathering mana symbol font!
 
+**New:** view the [documentation site](https://andrewgioia.github.io/Mana) to see Mana in action!
+
 Mana is a complete set of Magic: the Gathering mana, tap, and card type symbols as a pictographic font. You can use this font anywhere you want to display mana and tap symbols—in your MtG app or website, documents, card images, anything!
 
+## Installing
+
+The easiest way to get Mana into your project is to use either the Bower or NPM packages, depending on your package manager:
+
+```shell
+$> bower install mana
+```
+
+```shell
+$> npm install mana-font
+```
+
+We've registered `mana` with [Bower](https://bower.io/#getting-started) and 'mana-font' with [NPM](https://docs.npmjs.com/getting-started/what-is-npm). Just install using the above commands in your project and you can edit anything as needed.
+
+You can also download the [zip file](https://github.com/andrewgioia/Mana/archive/master.zip) here at Github and use the font files and CSS files in your project as needed.
+
 ## Usage
 
 Each mana symbol has its own font character. Display them in a manner similar to [Keyrune](http://andrewgioia.github.io/Keyrune) using the `<i class="ms ms-g"></i>` element and class syntax. Class name codes are based on textual mana symbol codes (like g for Green or 3 for, well, {3}).
@@ -18,6 +36,12 @@ To use Mana, move the web font files to your `/fonts` directory and include the
 
 Feel free to edit the source files and compile Mana to fit your needs. Currently LESS is supported, with Sass coming soon.
 
+## Using Mana on the Desktop
+
+If you'd like to use Mana as a desktop font (e.g., in a Word document) there are a few steps and things to know. First, to get it loaded on your system just download the [latest zip file](https://github.com/andrewgioia/Mana/archive/master.zip), extract it, and navigate to `Mana-master\fonts`. In there, install the `mana.ttf` font (typically by double clicking it).
+
+Mana uses [private use characters](https://en.wikipedia.org/wiki/Private_Use_Areas) for the font glyphs so you unfortunately can't normally "type" anything in Word to see the symbols. To do so, open up the [Mana Cheatsheet](http://andrewgioia.github.io/Mana/cheatsheet.html) and copy the symbol you want, then paste it into Word (or whatever software you're using).
+
 ## License
 
 All mana, tap, and card type symbol images are copyright Wizards of the Coast ([http://magicthegathering.com](http://magicthegathering.com))
@@ -30,14 +54,15 @@ Attribution is **greatly appreciated** but not required!
 
 ## Changelog
 
-* v0.1 - initial font creation and CSS/LESS files added
+* v1.3.1 - fixed class name issue for 1,000,000 symbol
-* v0.2 - Flashback symbol added
-* v0.3 - phyrexian mana classes use MTGJson standard; project-specific LESS prefix added (@JayGray)
-* v0.4 - adding classes for 16, 17, 18, 19, and 20 symbols
-* v0.5 - adding the new colorless wastes symbol
-* v0.6 - adding double-faced card symbols (day, night)
-* v1.0 - new documentation page at http://andrewgioia.github.io/Mana/
-* v1.0.1 - added classes for -12 and -14 loyalty (sorry Jace and Karn!)
-* v1.1.0 - added the new Energy symbol
-* v1.2.0 - added DFC symbols for the Origins planeswalkers (ignite and spark) and the Eldritch Moon meld cards (emrakul and moon)
 * v1.3.0 - added Guild and Clan symbols
+* v1.2.0 - added DFC symbols for the Origins planeswalkers (ignite and spark) and the Eldritch Moon meld cards (emrakul and moon)
+* v1.1.0 - added the new Energy symbol
+* v1.0.1 - added classes for -12 and -14 loyalty (sorry Jace and Karn!)
+* v1.0 - new documentation page at http://andrewgioia.github.io/Mana/
+* v0.6 - adding double-faced card symbols (day, night)
+* v0.5 - adding the new colorless wastes symbol
+* v0.4 - adding classes for 16, 17, 18, 19, and 20 symbols
+* v0.3 - phyrexian mana classes use MTGJson standard; project-specific LESS prefix added (@JayGray)
+* v0.2 - Flashback symbol added
+* v0.1 - initial font creation and CSS/LESS files added

bower_components/mana/css/mana.css

@@ -2,15 +2,15 @@
  * Global */
 @font-face {
   font-family: 'Mana';
-  src: url('../fonts/mana.eot?v=1.3.0');
+  src: url('../fonts/mana.eot?v=1.3.1');
-  src: url('../fonts/mana.eot?#iefix&v=1.3.0') format('embedded-opentype'), url('../fonts/mana.woff?v=1.3.0') format('woff'), url('../fonts/mana.ttf?v=1.3.0') format('truetype'), url('../fonts/mana.svg?v=1.3.0#mana') format('svg');
+  src: url('../fonts/mana.eot?#iefix&v=1.3.1') format('embedded-opentype'), url('../fonts/mana.woff?v=1.3.1') format('woff'), url('../fonts/mana.ttf?v=1.3.1') format('truetype'), url('../fonts/mana.svg?v=1.3.1#mana') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 @font-face {
   font-family: 'MPlantin';
-  src: url('../fonts/mplantin.eot?v=1.3.0');
+  src: url('../fonts/mplantin.eot?v=1.3.1');
-  src: url('../fonts/mplantin.eot?#iefix&v=1.3.0') format('embedded-opentype'), url('../fonts/mplantin.woff?v=1.3.0') format('woff'), url('../fonts/mplantin.ttf?v=1.3.0') format('truetype'), url('../fonts/mplantin.svg?v=1.3.0#mplantin') format('svg');
+  src: url('../fonts/mplantin.eot?#iefix&v=1.3.1') format('embedded-opentype'), url('../fonts/mplantin.woff?v=1.3.1') format('woff'), url('../fonts/mplantin.ttf?v=1.3.1') format('truetype'), url('../fonts/mplantin.svg?v=1.3.1#mplantin') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -289,7 +289,7 @@
 .ms-100 {
   width: 2.4em;
 }
-.ms-100000 {
+.ms-1000000 {
   width: 5.4em;
 }
 /**
@@ -666,7 +666,7 @@
 .ms-100:before {
   content: "\e900";
 }
-.ms-100000:before {
+.ms-1000000:before {
   content: "\e901";
 }
 /**

bower_components/mana/index.html

@@ -127,7 +127,7 @@
         <i class="ms ms-1-2 ms-cost ms-shadow"></i>
         <i class="ms ms-infinity ms-cost ms-shadow"></i>
         <i class="ms ms-100 ms-cost ms-shadow"></i>
-        <i class="ms ms-100000 ms-cost ms-shadow"></i>
+        <i class="ms ms-1000000 ms-cost ms-shadow"></i>
     </p>
     <h3>Future Sight type symbols</h3>
     <p>

bower_components/mana/less/cost.less

@@ -287,6 +287,6 @@
 .@{ms-prefix}-100 {
     width: 2.4em;
 }
-.@{ms-prefix}-100000 {
+.@{ms-prefix}-1000000 {
     width: 5.4em;
 }

bower_components/mana/less/icons.less

@@ -100,7 +100,7 @@
  * Un-set symbols */
 
 .@{ms-prefix}-100:before { content: "\e900"; }
-.@{ms-prefix}-100000:before { content: "\e901"; }
+.@{ms-prefix}-1000000:before { content: "\e901"; }
 
 /**
  * Planeswalker symbols */

bower_components/mana/less/variables.less

@@ -2,7 +2,7 @@
  * Global */
 
 @ms-font-path: '../fonts';
-@ms-version: '1.3.0';
+@ms-version: '1.3.1';
 @ms-font-size-base: 14px;
 @ms-prefix: ms;
 @ms-serif-font: 'MPlantin, Garamond, Palatino, 'Times New Roman', Times, serif';

cheatsheet.html

@@ -97,7 +97,7 @@
                 </div>
                 <div class="vectors">
                     <span class="utf"><i style="width:auto;">&#xe900;</i> ms-100 <code>&amp;#xe900;</code></span>
-                    <span class="utf long"><i class="long">&#xe901;</i> ms-100000 <code>&amp;#xe901;</code></span>
+                    <span class="utf long"><i class="long">&#xe901;</i> ms-1000000 <code>&amp;#xe901;</code></span>
                     <div class="clear"></div>
                 </div>
                 <div class="vectors overflow">

icons.html

@@ -154,7 +154,7 @@
                         <span><i class="ms ms-100 ms-fw" style="font-size: 1.0em"></i> 100 <em>(100)</em></span>
                     </div>
                     <div class="icon" id="1000000" name="1000000">
-                        <span><i class="ms ms-100000 ms-fw" style="font-size: .75em"></i> &nbsp;&nbsp;&nbsp;&nbsp;1,000,000 <em>(1000000)</em></span>
+                        <span><i class="ms ms-1000000 ms-fw" style="font-size: .75em"></i> &nbsp;&nbsp;&nbsp;&nbsp;1,000,000 <em>(1000000)</em></span>
                     </div>
                     <div class="icon" id="e" name="Energy">
                         <span><i class="ms ms-e"></i> Energy <em>(e)</em></span>

index.html

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