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

Teambuilder and battle appearance tweaks

Browse Source
This commit is contained in:
Guangcong Luo 2013-05-06 13:42:50 -07:00
parent 7248038784
commit d463c4be3a
3 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/client-battle.js
View File

@ -102,7 +102,7 @@
} else if (this.battle.playbackState === 2) {
// battle is playing
this.$controls.html('<button name="skipTurn">Skip turn <i class="icon-step-forward"></i></button>');
this.$controls.html('<p><button name="skipTurn">Skip turn <i class="icon-step-forward"></i></button></p>');
return;
}
@ -128,7 +128,7 @@
if (this.battle.done) {
// battle has ended
this.$controls.html('<div class="controls"><em><button name="instantReplay"><i class="icon-undo"></i> Instant Replay</button> <button name="saveReplay"><i class="icon-upload"></i> Share replay</button></div>');
this.$controls.html('<div class="controls"><p><em><button name="instantReplay"><i class="icon-undo"></i> Instant Replay</button> <button name="saveReplay"><i class="icon-upload"></i> Share replay</button></p></div>');
} else if (this.side) {
@ -138,7 +138,7 @@
} else if (this.battle.mySide.initialized && this.battle.yourSide.initialized) {
// full battle
this.$controls.html('<em>Waiting for players...</em>');
this.$controls.html('<p><em>Waiting for players...</em></p>');
} else {

14
js/client-teambuilder.js
View File

@ -535,9 +535,9 @@
buf = '<div></div>';
var totalev = 0;
for (var stat in stats) {
var width = stats[stat]*200/504;
if (stat == 'hp') width = stats[stat]*200/704;
if (width > 200) width = 200;
var width = stats[stat]*180/504;
if (stat == 'hp') width = stats[stat]*180/704;
if (width > 179) width = 179;
var color = Math.floor(stats[stat]*180/714);
if (color > 360) color = 360;
buf += '<div><em><span style="width:'+Math.floor(width)+'px;background:hsl('+color+',85%,45%);border-color:hsl('+color+',85%,35%)"></span></em></div>';
@ -677,9 +677,9 @@
buf += '<div class="col graphcol"><div></div>';
for (var i in stats) {
stats[i] = this.getStat(i);
var width = stats[i]*200/504;
if (i=='hp') width = Math.floor(stats[i]*200/704);
if (width > 199) width = 199;
var width = stats[i]*180/504;
if (i=='hp') width = Math.floor(stats[i]*180/704);
if (width > 179) width = 179;
var color = Math.floor(stats[i]*180/714);
if (color>360) color = 360;
buf += '<div><em><span style="width:'+Math.floor(width)+'px;background:hsl('+color+',85%,45%);border-color:hsl('+color+',85%,35%)"></span></em></div>';
@ -726,7 +726,7 @@
for (var i in stats) {
if (typeof set.ivs[i] === 'undefined') set.ivs[i] = 31;
var val = ''+(set.ivs[i]);
buf += '<div><input type="number" name="iv-'+i+'" value="'+val+'" class="inputform numform" /></div>';
buf += '<div><input type="number" name="iv-'+i+'" value="'+val+'" class="inputform numform" min="1" max="31" step="1" /></div>';
}
buf += '</div>';

26
style/client.css
View File

@ -1030,6 +1030,10 @@ a.ilink:hover {
width: 640px;
}
.battle-controls p {
margin: 2px 0 8px 0;
padding: 0 8px;
}
.battle-controls .whatdo {
margin-top: -2px;
padding: 0 8px;
@ -1412,6 +1416,10 @@ a.ilink:hover {
font: 12pt Verdana, sans-serif;
}
.majorbutton {
font-size: 14pt;
}
.setmenu {
position: absolute;
top: 5px;
@ -1419,6 +1427,18 @@ a.ilink:hover {
width: 503px;
text-align: right;
}
.setmenu button {
cursor: pointer;
background: transparent;
border: 0;
border-radius: 4px;
padding: 3px 6px;
}
.setmenu button:hover {
border: 1px solid #888888;
padding: 2px 5px;
background: #D5D5D5;
}
.setmenu-left {
position: absolute;
top: 5px;
@ -1775,7 +1795,7 @@ a.ilink:hover {
font-weight: bold;
}
.statform .graphcol {
width: 205px;
width: 185px;
}
.statform .graphcol div span {
margin: 3px 0 0 5px;
@ -1791,14 +1811,14 @@ a.ilink:hover {
text-align: center;
}
.statform .evslidercol {
width: 173px;
width: 193px;
margin-right: 9px;
margin-left: 5px;
padding-top: 7px;
text-align: center;
}
.evslider {
width: 172px;
width: 192px;
margin: 0 auto;
}
.statform .totalev b {