Pulling in the energy icon and updating the docs

README.md

@@ -1,4 +1,4 @@
-# Mana v1.0.1
+# Mana v1.1.0
 
 ## The Magic: the Gathering mana symbol font!
 
@@ -38,3 +38,4 @@ Attribution is **greatly appreciated** but not required!
 * v0.6 - adding double-faced card symbols (day, night)
 * v1.0.0 - finally documentation is live!
 * v1.0.1 - fixed 100 in icon list
+* v1.1.0 - added the Energy icon

bower_components/mana/.bower.json

@@ -28,11 +28,11 @@
     ".git",
     ".gitignore"
   ],
-  "_release": "69250142e0",
+  "_release": "007e469395",
   "_resolution": {
     "type": "branch",
     "branch": "master",
-    "commit": "69250142e0b556ba2b160eda19ce2a1999b2aa89"
+    "commit": "007e4693953bc05448ed55e02275e45b63018396"
   },
   "_source": "https://github.com/andrewgioia/Mana.git",
   "_target": "*",

bower_components/mana/README.md

@@ -1,4 +1,4 @@
-# Mana v1.0
+# Mana v1.1
 
 ## The Magic: the Gathering mana symbol font!
 
@@ -38,3 +38,4 @@ Attribution is **greatly appreciated** but not required!
 * 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

bower_components/mana/bower.json

@@ -1,7 +1,7 @@
 {
   "name": "mana",
   "homepage": "https://github.com/andrewgioia/Mana",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "authors": [
     "Andrew Gioia <andrewgioia@gmail.com>"
   ],

bower_components/mana/css/mana.css

@@ -2,15 +2,15 @@
  * Global */
 @font-face {
   font-family: 'Mana';
-  src: url('../fonts/mana.eot?v=0.6');
-  src: url('../fonts/mana.eot?#iefix&v=0.6') format('embedded-opentype'), url('../fonts/mana.woff?v=0.6') format('woff'), url('../fonts/mana.ttf?v=0.6') format('truetype'), url('../fonts/mana.svg?v=0.6#mana') format('svg');
+  src: url('../fonts/mana.eot?v=1.1.0');
+  src: url('../fonts/mana.eot?#iefix&v=1.1.0') format('embedded-opentype'), url('../fonts/mana.woff?v=1.1.0') format('woff'), url('../fonts/mana.ttf?v=1.1.0') format('truetype'), url('../fonts/mana.svg?v=1.1.0#mana') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 @font-face {
   font-family: 'MPlantin';
-  src: url('../fonts/mplantin.eot?v=0.6');
-  src: url('../fonts/mplantin.eot?#iefix&v=0.6') format('embedded-opentype'), url('../fonts/mplantin.woff?v=0.6') format('woff'), url('../fonts/mplantin.ttf?v=0.6') format('truetype'), url('../fonts/mplantin.svg?v=0.6#mplantin') format('svg');
+  src: url('../fonts/mplantin.eot?v=1.1.0');
+  src: url('../fonts/mplantin.eot?#iefix&v=1.1.0') format('embedded-opentype'), url('../fonts/mplantin.woff?v=1.1.0') format('woff'), url('../fonts/mplantin.ttf?v=1.1.0') format('truetype'), url('../fonts/mplantin.svg?v=1.1.0#mplantin') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -570,6 +570,10 @@
 .ms-c:before {
   content: "\e904";
 }
+.ms-e:before,
+.ms-energy:before {
+  content: "\e907";
+}
 /**
  * Tap/roll symbols */
 .ms-tap:before {

bower_components/mana/fonts/mana.svg

@@ -61,4 +61,5 @@
 <glyph unicode="&#xe904;" glyph-name="c" d="M429.026 770.134c32.402 45.904 53.618 98.288 82.782 146.198 28.158-46.29 48.602-96.976 79.462-141.646 65.654-97.052 150.21-181.454 247.262-247.106 44.824-30.938 95.588-51.46 141.878-79.85-46.598-27.774-97.208-48.372-141.954-79.31-98.596-66.732-184.31-152.676-250.272-251.812-29.394-43.436-49.144-92.348-76.454-136.94-28.236 46.212-48.68 96.898-79.54 141.568-65.732 96.976-149.978 181.686-247.186 247.184-44.668 30.784-95.278 51.304-141.414 79.772 47.988 28.778 100.14 50.224 146.044 82.396 93.582 64.188 175.050 146.12 239.392 239.546zM235.922 448.038c107.47-74.68 201.282-168.262 275.73-275.884 74.836 107.392 168.186 201.59 276.194 275.73-107.7 74.68-201.436 168.416-276.194 275.962-74.68-107.392-168.184-201.204-275.73-275.808z" />
 <glyph unicode="&#xe905;" glyph-name="dfc-night" d="M472.98 956.64c65.98 4.82 133-2.96 195.94-23.38 118.68-38.44 221.6-122.5 283.42-230.8 43-74.62 66.48-160.3 67.58-246.42 1.4-79.040-15.88-158.32-50.2-229.54-50.42-105.48-138.3-192.54-244.5-241.56-70.78-33.060-149.3-49.060-227.38-46.76-83.96 2.020-167.18 25.78-239.74 68.020-112.24 64.7-197.66 173.88-233.66 298.32-25.72 87.9-27.060 182.72-4.16 271.36 27.020 106.54 90.1 203.32 176.080 271.68 78.52 63 176.3 101.34 276.62 109.080zM253.66 790.3c-58.92-44.18-107.7-102.4-138.62-169.4-29.18-62.44-42.72-132.2-38.32-201.020 3.96-70.9 27.020-140.42 65.060-200.3 38.74-61.12 92.6-112.32 154.88-149.040 77.12-45.66 166.74-70.14 256.38-69.62-19.92 5.98-39.46 13.22-58.38 21.8-77.96 35.64-148.24 89.72-198.5 159.56-43.22 59.28-71.94 129.16-82.060 201.88-11.38 82 0.76 167.22 35.2 242.56 40.080 88.86 109.32 163.74 193.34 212.82 35.060 20.76 72.36 37.94 111.48 49.54-107.22-0.34-214.020-35.3-300.46-98.78z" />
 <glyph unicode="&#xe906;" glyph-name="dfc-day" d="M473.302 956.394c117.026 9.518 236.88-23.568 332.59-91.56 104.974-73.712 180.536-188.228 205.73-314.102 18.722-91.384 12.092-187.95-19.732-275.712-24.086-67.302-62.896-129.18-112.374-180.728-52.704-54.656-117.6-97.636-188.828-124.074-92.642-34.986-195.516-41.398-291.998-19.63-61.096 13.952-119.618 39.24-171.55 74.326-62.798 42.426-116.116 98.882-154.59 164.204-38.058 64.272-61.49 137.074-68.358 211.42-7.878 84.516 5.542 171.010 39.246 248.958 30.736 71.694 78.412 135.966 137.766 186.564 81.282 69.716 185.186 112.854 292.098 120.334zM392.634 886.106c-7.284-27.050-20.168-52.974-39.98-73.040-22.344-23.824-52.346-40.23-84.35-46.66-25.55-5.126-52.248-3.522-77.284 3.582 5.542-22.48 9.48-45.89 5.66-69.002-5.066-42.15-28.162-81.806-62.342-106.996-18.088-13.992-39.562-22.58-61.452-28.596 29.628-27.782 48.806-66.666 50.944-107.372 2.018-31.444-6.076-63.6-22.246-90.67-8.054-13.852-18.98-25.646-30.024-37.122 7.938-2.91 16.19-4.85 24.086-7.936 31.864-12.268 59.532-35.224 77.206-64.47 19.83-32.058 27.668-71.418 21.098-108.56-1.188-7.896-4.058-15.474-4.572-23.488 14.388 2.434 28.538 7.024 43.302 6.826 36.832 1.762 74-10.112 103.212-32.552 29.568-22.48 50.21-55.644 58.72-91.7 24.918 27.012 58.84 45.87 95.394 50.936 30.538 5.046 62.362-0.652 90.288-13.654 19.454-9.024 36.236-22.856 50.824-38.43 4.63 15.95 9.024 32.176 17.554 46.582 23.572 43.278 68.972 73.832 117.976 79.254 23.234 3.562 46.924-0.318 69.288-6.906-9.638 30.692-10.886 64.034-1.346 94.904 13.518 46.424 50.032 85.25 95.434 101.812 7.618 3.008 15.792 4.394 23.254 7.896-19.87 18.324-36.178 40.824-44.886 66.568-15.814 43.494-10.252 93.678 13.834 133.096 7.856 13.932 19.434 25.052 30.004 36.866-6.018 1.722-12.074 3.166-17.992 5.086-47.834 14.822-86.606 54.676-100.914 102.564-6.73 20.658-7.324 42.644-5.622 64.134 1.168 10.686 4.434 20.976 6.532 31.484-14.368-2.712-28.618-6.946-43.382-6.828-35.744-1.404-71.782 9.836-100.48 31.148-21.176 15.336-37.86 36.41-49.22 59.86-5.108 10.488-8.116 21.786-11.994 32.73-22.126-23.41-51.14-40.27-82.708-47.038-42.036-9.478-87.734-0.554-123.358 23.568-10.192 6.67-18.94 15.178-27.984 23.212-0.614-0.276-1.862-0.812-2.474-1.088zM471.284 758.392c48.388 7.518 98.204 0 144.080-16.346 55.196-20.362 105.506-55.606 140.854-102.92 28.478-37.46 48.508-81.25 58.166-127.298 4.056-17.652 5.304-35.718 6.866-53.706 0.912-76.008-26.54-151.996-75.938-209.836-26.48-31.762-60.58-56.694-97.332-75.336-54.566-26.99-117.086-38.904-177.568-30.334-63.074 8.824-123.338 36.964-170.422 79.846-55.93 51.648-91.494 124.35-99.114 199.982-6.926 72.406 14.072 146.532 55.614 205.996 48.646 71.378 129.632 118.434 214.794 129.952zM476.924 780.020c-77.284-5.936-151.204-42.486-204.602-98.428-56.008-56.338-90.564-134.046-92.642-213.636-1.326-11.774-1.246-23.706 0.060-35.48 0.692-30.514 6.59-60.81 16.228-89.74 21.216-64.056 64.362-119.502 117.936-159.95 55.99-41.656 125.99-64.986 195.912-62.69 26.818-0.732 53.694 1.602 79.74 8.132 84.904 19.572 159.12 76.306 204.66 149.998 23.532 38.092 38.474 81.25 44.432 125.576 5.382 46.484 3.462 94.252-9.56 139.39-12.944 46.384-36.97 89.504-68.892 125.518-14.468 15.178-29.054 30.434-45.62 43.356-31.784 25.212-68.358 44.406-107.248 55.942-42.096 12.724-86.744 15.99-130.404 12.012z" />
+<glyph unicode="&#xe907;" glyph-name="e, energy" horiz-adv-x="872" d="M651.096 879.704c14.242 2.256 27.87 7.214 41.974 10.206-0.17-5.678 0.936-11.234 1.58-16.85 0.69-22.668 4.528-45.058 6.598-67.618 4.712-34.882 10.882-69.564 18.402-103.956 2.976-13.336 5.064-26.902 9.038-40.008 4.328-13.996 5.848-28.744 11.28-42.434 4.512-16.114 9.162-32.228 15.024-47.912 3.928-9.238 6.462-18.984 9.822-28.436 4.834-16.712 13.090-32.12 19.352-48.312 3.208-9.068 7.646-16.83 11.156-25.724 5.242-13.276 11.53-24.108 18.17-35.986 12.508-23.554 19.952-36.762 29.698-48.916 5.448-8.732 11.462-17.654 18.338-25.374 3.79-4.804 9.406-8.962 9.96-15.516-8.334-3.038-16.284-6.966-24.402-10.496-24.554-8.118-48.31-18.462-71.698-29.48-32.382-13.89-63.044-31.37-93.046-49.724-45.104-27.286-88.12-58.254-126.67-94.288-24.57-23.036-48.172-47.19-69.382-73.372-7.856-9.684-15.438-19.644-21.776-30.402-6.568-11.094-14.964-20.978-21.638-32.028-3.454-5.708-6.538-11.678-10.636-16.988-4.466 5.418-7.934 11.54-11.51 17.572-27.624 45.518-61.554 87.106-99.936 123.984-45.026 43.6-96.008 80.722-149.844 112.69-27.608 15.776-55.906 30.354-84.498 44.274-7.58 3.928-16.098 5.724-23.28 10.466-20.304 9.96-42.080 16.452-62.66 25.782 5.342 10.636 13.076 19.752 19.858 29.436 14.228 19.612 26.396 40.59 38.136 61.738 30.602 55.508 53.238 115.084 70.978 175.856 18.202 61.14 30.002 124.030 38.044 187.258 3.040 23.818 5.172 47.726 6.752 71.682 0.108 6.83 0.66 13.644 1.474 20.428 6.89-0.124 13.612-1.644 20.212-3.516 22.374-6.322 45.272-10.542 68.168-14.456 36.402-6.062 73.004-11.356 109.896-13.074 23.496-1.366 46.992-3.346 70.548-3.1 22.576-0.108 45.088 1.794 67.602 3.238 21.070 1.61 42.090 3.836 62.936 7.288 17.758 2.942 21.11 3.344 23.256 3.748 17.988 3.372 35.23 6.934 52.724 12.32zM551.13 812.61c-21.716-7.95-44.52-12.216-67.156-16.544-17.664-2.118-35.39-4.112-53.208-3.59-34.666-0.814-69.688 4.312-101.992 17.202-0.414-4.004-0.23-8.042 0.446-12.016 2.394-16.498 3.314-33.27 1.318-49.86-2.532-36.694-12.506-72.42-25.398-106.72-3.16-8.732-7.658-17.020-9.392-26.228-32.274-72.512-75.536-139.714-124.552-201.99-4.742-6.030-10.006-11.664-13.996-18.246 7.26-0.124 14.012 2.746 20.978 4.342 36.020 9.316 72.728 16.36 109.774 19.858 25.444 3.392 51.196 2.532 76.824 2.548 28.698-0.154 57.336-4.22 85.036-11.74 1.166-2.486 0.384-5.28-0.154-7.812-9.192-29.94-14.64-60.924-18.124-92.002-4.19-37.676-3.622-75.688-2.978-113.548 2.15-38.688 5.402-77.454 13.076-115.528 3.024 13.366 4.696 27.024 8.026 40.33 7.766 33.838 19.352 66.68 32.534 98.754 22.376 53.76 49.862 105.262 79.802 155.154 32.444 53.604 67.494 105.644 105.446 155.506 3.208 3.3 1.75 8.042 1.872 12.124-3.008-0.124-6.046-0.216-8.992-0.86-15.884-3.53-32.014-5.74-48.080-8.288-11.434-1.272-22.79-3.468-34.316-3.712 1.52-0.43 3.054-0.844 4.604-1.26-6.598 0.446-13.212 0.138-19.796-0.152-17.266-2.472-34.776-1.32-52.164-1.688-16.866 0.368-33.87-0.814-50.612 1.688-14.304 0.092-28.176 4.188-42.372 5.218-0.936 14.056 2.886 27.806 5.386 41.512 18.002 84.358 62.87 161.446 121.254 224.396 4.074 4.392 10.726 7.72 13.826 13.52-2.010 1.95-4.696 0.122-6.92-0.368z" />
 </font></defs></svg>

bower_components/mana/index.html

@@ -72,7 +72,7 @@
         <i class="ms ms-y ms-cost ms-shadow"></i>
         <i class="ms ms-z ms-cost ms-shadow"></i>
     </p>
-    <h3>Phyrexian, snow, colorless, and split symbols</h3>
+    <h3>Phyrexian, snow, colorless, energy, and split symbols</h3>
     <p>
         <i class="ms ms-wp ms-cost ms-shadow"></i>
         <i class="ms ms-up ms-cost ms-shadow"></i>
@@ -81,6 +81,7 @@
         <i class="ms ms-gp ms-cost ms-shadow"></i>
         <i class="ms ms-s ms-cost ms-shadow"></i>
         <i class="ms ms-c ms-cost ms-shadow"></i>
+        <i class="ms ms-e"></i>
         <br />
         <i class="ms ms-wu ms-split ms-cost ms-shadow"></i>
         <i class="ms ms-wb ms-split ms-cost ms-shadow"></i>

bower_components/mana/less/icons.less

@@ -38,6 +38,8 @@
 .@{ms-prefix}-gp:before { content: "\e618"; }
 .@{ms-prefix}-s:before { content: "\e619"; }
 .@{ms-prefix}-c:before { content: "\e904"; }
+.@{ms-prefix}-e:before,
+.@{ms-prefix}-energy:before{ content: "\e907"; }
 
 /**
  * Tap/roll symbols */

bower_components/mana/less/variables.less

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

bower_components/mana/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mana",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Magic: the Gathering mana symbol pictographic font",
   "main": "css/mana.css",
   "repository": {

cheatsheet.html

@@ -82,6 +82,7 @@
                     <span class="utf"><i>&#xe617;</i> ms-z <code>&amp;#xe617;</code></span>
                     <span class="utf"><i>&#xe618;</i> ms-p <code>&amp;#xe618;</code></span>
                     <span class="utf"><i>&#xe619;</i> ms-s <code>&amp;#xe619;</code></span>
+                    <span class="utf"><i>&#xe907;</i> ms-e <code>&amp;#xe907;</code></span>
                     <div class="clear"></div>
                 </div>
                 <div class="vectors">

icons.html

@@ -46,7 +46,7 @@
                 </h3>
             </section>
             <section class="content icons">
-                <h4>Mana Symbols</h4>
+                <h4>Mana &amp; Resource Symbols</h4>
                 <div class="icons">
                     <div class="icon" id="w" name="W">
                         <span><i class="ms ms-w"></i> White <em>(w)</em></span>
@@ -156,6 +156,9 @@
                     <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>
                     </div>
+                    <div class="icon" id="e" name="Energy">
+                        <span><i class="ms ms-e"></i> Energy <em>(e)</em></span>
+                    </div>
                 </div>
 
                 <h4 style="padding-top:25px;">Card Symbols</h4>

index.html

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