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

Teambuilder: Use Gen 6 minisprites in clipboard/move functions

Browse Source
This commit is contained in:
Marty-D
2016-10-04 17:39:26 -04:00
parent 256885354e
commit a435eb3695
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/client-teambuilder.js
View File

@@ -1265,7 +1265,7 @@
var pokemon = Tools.getTemplate(res.species);
buf += '<div class="result" data-id="' + i + '">';
buf += '<div class="section"><span class="icon" style="' + Tools.getIcon(res.species) + '"></span>';
buf += '<div class="section"><span class="icon" style="' + Tools.getPokemonIcon(res.species) + '"></span>';
buf += '<span class="species">' + (pokemon.species === pokemon.baseSpecies ? pokemon.species : (pokemon.baseSpecies + '-<small>' + pokemon.species.substr(pokemon.baseSpecies.length + 1) + '</small>')) + '</span></div>';
buf += '<div class="section"><span class="ability-item">' + (res.ability || '<i>No ability</i>') + '<br />' + (res.item || '<i>No item</i>') + '</span></div>';
buf += '<div class="section no-border">';
@@ -1292,7 +1292,7 @@
clipboardExpanded: false,
clipboardExpand: function () {
var $clipboard = $('.teambuilder-clipboard-data');
$clipboard.animate({height: this.clipboardCount() * 28}, 500, function () {
$clipboard.animate({height: this.clipboardCount() * 34}, 500, function () {
setTimeout(function () { $clipboard.focus(); }, 100);
});
@@ -1302,7 +1302,7 @@
},
clipboardShrink: function () {
var $clipboard = $('.teambuilder-clipboard-data');
$clipboard.animate({height: 26}, 500);
$clipboard.animate({height: 32}, 500);
setTimeout(function () {
this.clipboardExpanded = false;
@@ -3264,7 +3264,7 @@
if (i !== data.i && i !== data.i + 1) {
buf += '<li><button name="moveHere" value="' + i + '"><i class="fa fa-arrow-right"></i> Move here</button></li>';
}
buf += '<li' + (i === data.i ? ' style="opacity:.3"' : ' style="opacity:.6"') + '><span class="pokemonicon" style="display:inline-block;vertical-align:middle;' + Tools.getIcon(set) + '"></span> ' + Tools.escapeHTML(set.name) + '</li>';
buf += '<li' + (i === data.i ? ' style="opacity:.3"' : ' style="opacity:.6"') + '><span class="pokemonicon" style="display:inline-block;vertical-align:middle;' + Tools.getPokemonIcon(set) + '"></span> ' + Tools.escapeHTML(set.name) + '</li>';
}
if (i !== data.i && i !== data.i + 1) {
buf += '<li><button name="moveHere" value="' + i + '"><i class="fa fa-arrow-right"></i> Move here</button></li>';

16
style/client.css
View File

@@ -2640,8 +2640,8 @@ a.ilink.yours {
}
.teambuilder-clipboard-container {
height: 52px;
max-width: 455px;
height: 58px;
max-width: 463px;
font-size: 8pt;
padding: 4px;
position: relative;
@@ -2661,8 +2661,8 @@ a.ilink.yours {
}
.teambuilder-clipboard-data {
display: block;
width: 447px;
height: 26px;
width: 455px;
height: 32px;
overflow: hidden;
cursor: pointer;
@@ -2687,16 +2687,16 @@ a.ilink.yours {
border: 1px solid #BBBBBB;
}
.teambuilder-clipboard-data .result {
height: 26px;
height: 32px;
}
.teambuilder-clipboard-data span {
display: block;
height: 24px;
height: 30px;
float: left;
}
.teambuilder-clipboard-data .icon {
width: 32px;
width: 40px;
}
.teambuilder-clipboard-data .species {
width: 100px;
@@ -2727,7 +2727,7 @@ a.ilink.yours {
width: 385px;
position: absolute;
top: 34px;
top: 40px;
right: 8px;
}
.teambuilder-clipboard-button-left {