Teambuilder: Use new icons in teambar

This commit is contained in:
Guangcong Luo 2015-12-24 12:38:30 -05:00
parent fac99e2091
commit fa09ddcf8a
2 changed files with 13 additions and 6 deletions

View File

@ -1424,7 +1424,7 @@
}
for (var i = 0; i < this.curSetList.length; i++) {
var set = this.curSetList[i];
var pokemonicon = '<span class="pokemonicon pokemonicon-' + i + '" style="' + Tools.getIcon(set) + '"></span>';
var pokemonicon = '<span class="pokemonicon-' + i + '" style="' + Tools.getPokemonIcon(set) + '"></span>';
if (!set.name) {
buf += '<button disabled="disabled" class="addpokemon"><i class="fa fa-plus"></i></button> ';
isAdd = true;
@ -1450,7 +1450,7 @@
this.$('.setcol-icon').css('background-image', Tools.getTeambuilderSprite(set).substr(17));
this.$('.pokemonicon-' + this.curSetLoc).css('background', Tools.getIcon(set).substr(11));
this.$('.pokemonicon-' + this.curSetLoc).css('background', Tools.getPokemonIcon(set).substr(11));
var item = Tools.getItem(set.item);
if (item.id) {

View File

@ -2221,16 +2221,20 @@ a.ilink.yours {
border: 1px solid #AAAAAA;
padding: 0;
margin: -1px 2px 0 0;
height: 42px;
height: 44px;
float: left;
width: 88px;
cursor: pointer;
white-space: pre;
font-size: 8pt;
font-family: Verdana, Arial, sans-serif;
overflow: hidden;
}
.teambar button .pokemonicon {
margin: 0 auto;
.teambar button span {
margin: -2px auto;
display: block;
width: 40px;
height: 30px;
}
.teambar button:hover {
background: #DCDCDC;
@ -2702,7 +2706,7 @@ a.ilink.yours {
.teamchartbox {
position: absolute;
top: 40px;
top: 42px;
left: 0;
bottom: 0;
right: 0;
@ -2722,6 +2726,9 @@ a.ilink.yours {
.teamchartbox.individual {
overflow: visible;
}
.teamchartbox.individual .teamchart {
margin-top: -2px;
}
.teambuilder-results .result a {
border-radius: 4px;
cursor: pointer;