andrew/mana
andrew/mana
1
0
Fork 0
mirror of https://github.com/andrewgioia/mana.git synced 2024-11-22 06:54:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'erg-planeswalker-typo'

Browse Source
This commit is contained in:
Andrew Gioia 2015-12-02 14:02:01 -05:00
commit c38277efce
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
css/mana.css
View File

@ -395,6 +395,7 @@
left: 1.0em; left: 1.0em;
} }
/** /**
<<<<<<< HEAD
* Half costs */ * Half costs */
.ms-half { .ms-half {
width: .675em; width: .675em;
@ -406,7 +407,7 @@
margin-left: -0.675em; margin-left: -0.675em;
} }
/** /**
* Planesalker symbols */ * Planeswalker symbols */
.ms-loyalty-up, .ms-loyalty-up,
.ms-loyalty-down, .ms-loyalty-down,
.ms-loyalty-zero, .ms-loyalty-zero,

2
less/loyalty.less
View File

@ -1,5 +1,5 @@
/** /**
* Planesalker symbols */ * Planeswalker symbols */
.@{ms-prefix}-loyalty { .@{ms-prefix}-loyalty {