Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-10-01 07:10:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Teambuilder: Show typing in set details (#824)

Browse Source
This commit is contained in:
asgdf
2016-12-12 22:22:35 +01:00
committed by Guangcong Luo
parent edf6451e72
commit a2d09e8ac3
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
js/client-teambuilder.js
View File

@@ -1083,8 +1083,11 @@
buf += '<span class="detailcell"><label>Happiness</label>' + (typeof set.happiness === 'number' ? set.happiness : 255) + '</span>';
buf += '<span class="detailcell"><label>Shiny</label>' + (set.shiny ? 'Yes' : 'No') + '</span>';
}
buf += '</button></div></div>';
buf += '</button>';
// item/type icons
buf += '<div class="setrow setrow-icons">';
buf += '<div class="setcell">';
var itemicon = '<span class="itemicon"></span>';
if (set.item) {
var item = Tools.getItem(set.item);
@@ -1092,7 +1095,14 @@
}
buf += itemicon;
buf += '</div>';
buf += '</div><div class="setrow">';
buf += '<div class="setcell setcell-typeicons">';
var types = Tools.getTemplate(set.species).types;
if (types) {
for (var i = 0; i < types.length; i++) buf += Tools.getTypeIcon(types[i]);
}
buf += '</div></div>';
buf += '<div class="setrow">';
if (this.curTeam.gen > 1) buf += '<div class="setcell setcell-item"><label>Item</label><input type="text" name="item" class="textbox chartinput" value="' + Tools.escapeHTML(set.item) + '" /></div>';
if (this.curTeam.gen > 2) buf += '<div class="setcell setcell-ability"><label>Ability</label><input type="text" name="ability" class="textbox chartinput" value="' + Tools.escapeHTML(set.ability) + '" /></div>';
buf += '</div></div>';

14
style/client.css
View File

@@ -2545,12 +2545,22 @@ a.ilink.yours {
}
.setcol-details .itemicon {
display: block;
margin-top: 10px;
width: 24px;
height: 24px;
background-image: transparent none no-repeat scroll center center;
opacity: 0.8;
}
.setrow-icons {
height: 24px;
}
.setcell-typeicons {
margin-top: 4px;
margin-right: 4px;
float: right;
}
.setcell-typeicons img {
margin-left: 1px;
}
.setcell-sprite {
height: 82px;
padding: 1px;
@@ -2559,7 +2569,7 @@ a.ilink.yours {
margin-top: 0;
}
.setcell-details {
height: 84px;
height: 60px;
}
.setcol-moves .setcell {
padding-bottom: 1px;