CHANGELOG.md

@@ -10,10 +10,6 @@ All notable changes to this project will be documented in this file.
 
 ## Versions 
 
-### [1.15.2] 2023-03-04 GUP and GWP classes (@Araneline)
-
-* **Merged:** ([PR #93](https://github.com/andrewgioia/mana/pull/93)) by @Araneline to add support for the GUP and GWP split phyrexian classes
-
 ### [1.15.1] 2023-03-03 Fabricate
 
 * **Fixed:** Fabricate has its own correct symbol now. It had previously been aliased and this got messed up in the last build.

README.md

@@ -1,4 +1,4 @@
-# Mana v1.15.2
+# Mana v1.15.1
 
 ## The Magic: the Gathering mana symbol font!
 

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "mana",
   "homepage": "https://github.com/andrewgioia/mana",
-  "version": "1.15.2",
+  "version": "1.15.1",
   "authors": [
     "Andrew Gioia <andrew@gioia.email>"
   ],

css/mana.css

@@ -123,11 +123,7 @@
 .ms-up::before,
 .ms-bp::before,
 .ms-rp::before,
-.ms-gp::before,
+.ms-gp::before {
-.ms-gup::before,
-.ms-gup::after,
-.ms-gwp::before,
-.ms-gwp::after {
   content: "\e618";
 }
 .ms-s::before {
@@ -826,9 +822,7 @@
 .ms-cost.ms-2u,
 .ms-cost.ms-2b,
 .ms-cost.ms-2r,
-.ms-cost.ms-2g,
+.ms-cost.ms-2g {
-.ms-cost.ms-gup,
-.ms-cost.ms-gwp {
   position: relative;
   width: 1.3em;
   height: 1.3em;
@@ -848,8 +842,6 @@
 .ms-cost.ms-2b::before,
 .ms-cost.ms-2r::before,
 .ms-cost.ms-2g::before,
-.ms-cost.ms-gup::before,
-.ms-cost.ms-gwp::before,
 .ms-cost.ms-wu::after,
 .ms-cost.ms-wb::after,
 .ms-cost.ms-ub::after,
@@ -864,9 +856,7 @@
 .ms-cost.ms-2u::after,
 .ms-cost.ms-2b::after,
 .ms-cost.ms-2r::after,
-.ms-cost.ms-2g::after,
+.ms-cost.ms-2g::after {
-.ms-cost.ms-gup::after,
-.ms-cost.ms-gwp::after {
   font-size: 0.55em !important;
   position: absolute;
 }
@@ -884,9 +874,7 @@
 .ms-cost.ms-2u::before,
 .ms-cost.ms-2b::before,
 .ms-cost.ms-2r::before,
-.ms-cost.ms-2g::before,
+.ms-cost.ms-2g::before {
-.ms-cost.ms-gup::before,
-.ms-cost.ms-gwp::before {
   top: -0.38em;
   left: 0.28em;
 }
@@ -904,9 +892,7 @@
 .ms-cost.ms-2u::after,
 .ms-cost.ms-2b::after,
 .ms-cost.ms-2r::after,
-.ms-cost.ms-2g::after,
+.ms-cost.ms-2g::after {
-.ms-cost.ms-gup::after,
-.ms-cost.ms-gwp::after {
   top: 0.5em;
   left: 1em;
 }
@@ -990,8 +976,7 @@
   background: linear-gradient(135deg, #db8664 0%, #db8664 50%, #93b483 50%, #93b483 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#db8664', endColorstr='#93b483', GradientType=1);
 }
-.ms-cost.ms-gw,
+.ms-cost.ms-gw {
-.ms-cost.ms-gwp {
   background: #93b483;
   background: -moz-linear-gradient(-45deg, #93b483 0%, #93b483 50%, #edf2b0 50%, #edf2b0 100%);
   background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, #93b483), color-stop(50%, #93b483), color-stop(50%, #edf2b0), color-stop(100%, #edf2b0));
@@ -1001,8 +986,7 @@
   background: linear-gradient(135deg, #93b483 0%, #93b483 50%, #edf2b0 50%, #edf2b0 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#93b483', endColorstr='#edf2b0', GradientType=1);
 }
-.ms-cost.ms-gu,
+.ms-cost.ms-gu {
-.ms-cost.ms-gup {
   background: #93b483;
   background: -moz-linear-gradient(-45deg, #93b483 0%, #93b483 50%, #b5cde3 50%, #b5cde3 100%);
   background: -webkit-gradient(linear, left top, right bottom, color-stop(0%, #93b483), color-stop(50%, #93b483), color-stop(50%, #b5cde3), color-stop(100%, #b5cde3));

index.html

@@ -146,9 +146,6 @@
             <i class="ms ms-2b ms-cost ms-shadow"></i>
             <i class="ms ms-2r ms-cost ms-shadow"></i>
             <i class="ms ms-2g ms-cost ms-shadow"></i>
-            <br />
-            <i class="ms ms-gup ms-cost ms-shadow"></i>
-            <i class="ms ms-gwp ms-cost ms-shadow"></i>
         </p>
         <h3>Tap and roll symbols</h3>
         <p>

less/cost.less

@@ -49,9 +49,7 @@
     &.@{ms-prefix}-2u,
     &.@{ms-prefix}-2b,
     &.@{ms-prefix}-2r,
-    &.@{ms-prefix}-2g,
+    &.@{ms-prefix}-2g {
-    &.@{ms-prefix}-gup,
-    &.@{ms-prefix}-gwp {
         position: relative;
         width: 1.3em;
         height: 1.3em;
@@ -149,8 +147,7 @@
         background: linear-gradient(135deg,  #db8664 0%,#db8664 50%,#93b483 50%,#93b483 100%); // W3C
         filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#db8664', endColorstr='#93b483',GradientType=1 ); // IE6-9 fallback on horizontal gradient
     }
-    &.@{ms-prefix}-gw,
+    &.@{ms-prefix}-gw {
-    &.@{ms-prefix}-gwp {
         background: #93b483; // Old browsers
         background: -moz-linear-gradient(-45deg,  #93b483 0%, #93b483 50%, #edf2b0 50%, #edf2b0 100%); // FF3.6+
         background: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#93b483), color-stop(50%,#93b483), color-stop(50%,#edf2b0), color-stop(100%,#edf2b0)); // Chrome,Safari4+
@@ -160,8 +157,7 @@
         background: linear-gradient(135deg,  #93b483 0%,#93b483 50%,#edf2b0 50%,#edf2b0 100%); // W3C
         filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#93b483', endColorstr='#edf2b0',GradientType=1 ); // IE6-9 fallback on horizontal gradient
     }
-    &.@{ms-prefix}-gu,
+    &.@{ms-prefix}-gu {
-    &.@{ms-prefix}-gup {
         background: #93b483; // Old browsers
         background: -moz-linear-gradient(-45deg,  #93b483 0%, #93b483 50%, #b5cde3 50%, #b5cde3 100%); // FF3.6+
         background: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#93b483), color-stop(50%,#93b483), color-stop(50%,#b5cde3), color-stop(100%,#b5cde3)); // Chrome,Safari4+

less/icons.less

@@ -35,15 +35,11 @@
     &-y::before { content: "\e616"; }
     &-z::before { content: "\e617"; }
     &-p::before,
-        &-wp::before,
+    &-wp::before,
-        &-up::before,
+    &-up::before,
-        &-bp::before,
+    &-bp::before,
-        &-rp::before,
+    &-rp::before,
-        &-gp::before,
+    &-gp::before { content: "\e618"; }
-        &-gup::before,
-        &-gup::after,
-        &-gwp::before,
-        &-gwp::after { content: "\e618"; }
     &-s::before { content: "\e619"; }
     &-s-mtga::before { content: "\e996"; }
     &-c::before { content: "\e904"; }

package.json

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

sass/_cost.scss

@@ -48,9 +48,7 @@
     &.#{$ms-prefix}-2u,
     &.#{$ms-prefix}-2b,
     &.#{$ms-prefix}-2r,
-    &.#{$ms-prefix}-2g,
+    &.#{$ms-prefix}-2g {
-    &.#{$ms-prefix}-gup,
-    &.#{$ms-prefix}-gwp {
         position: relative;
         width: 1.3em;
         height: 1.3em;
@@ -148,8 +146,7 @@
         background: linear-gradient(135deg,  #db8664 0%,#db8664 50%,#93b483 50%,#93b483 100%); // W3C
         filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#db8664', endColorstr='#93b483',GradientType=1 ); // IE6-9 fallback on horizontal gradient
     }
-    &.#{$ms-prefix}-gw,
+    &.#{$ms-prefix}-gw {
-    &.#{$ms-prefix}-gwp {
         background: #93b483; // Old browsers
         background: -moz-linear-gradient(-45deg,  #93b483 0%, #93b483 50%, #edf2b0 50%, #edf2b0 100%); // FF3.6+
         background: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#93b483), color-stop(50%,#93b483), color-stop(50%,#edf2b0), color-stop(100%,#edf2b0)); // Chrome,Safari4+
@@ -159,8 +156,7 @@
         background: linear-gradient(135deg,  #93b483 0%,#93b483 50%,#edf2b0 50%,#edf2b0 100%); // W3C
         filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#93b483', endColorstr='#edf2b0',GradientType=1 ); // IE6-9 fallback on horizontal gradient
     }
-    &.#{$ms-prefix}-gu,
+    &.#{$ms-prefix}-gu {
-    &.#{$ms-prefix}-gup {
         background: #93b483; // Old browsers
         background: -moz-linear-gradient(-45deg,  #93b483 0%, #93b483 50%, #b5cde3 50%, #b5cde3 100%); // FF3.6+
         background: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#93b483), color-stop(50%,#93b483), color-stop(50%,#b5cde3), color-stop(100%,#b5cde3)); // Chrome,Safari4+

sass/_icons.scss

@@ -35,15 +35,11 @@
     &-y::before { content: "\e616"; }
     &-z::before { content: "\e617"; }
     &-p::before,
-        &-wp::before,
+    &-wp::before,
-        &-up::before,
+    &-up::before,
-        &-bp::before,
+    &-bp::before,
-        &-rp::before,
+    &-rp::before,
-        &-gp::before,
+    &-gp::before { content: "\e618"; }
-        &-gup::before,
-        &-gup::after,
-        &-gwp::before,
-        &-gwp::after { content: "\e618"; }
     &-s::before { content: "\e619"; }
     &-s-mtga::before { content: "\e996"; }
     &-c::before { content: "\e904"; }