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

Merge pull request #515 from urkerab/tour-elimination-highlight-user

Browse Source 
Highlight the current user in elimination tournaments
This commit is contained in:
Guangcong Luo 2015-10-28 19:38:49 -05:00
commit 3533bc9ac2
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/client-chat-tournament.js
View File

@ -554,6 +554,7 @@
if (!data.rootNode)
return;
var name = app.user.get('name');
var nodeSize = {
width: 150, height: 20,
radius: 5,
@ -635,6 +636,7 @@
elem.attr('y', -nodeSize.smallRealHeight / 2).attr('height', nodeSize.smallRealHeight);
else
elem.attr('y', -nodeSize.realHeight / 2).attr('height', nodeSize.realHeight);
if (node.team === name) elem.attr('stroke-dasharray', '5,5');
});
nodeGroup.each(function (node) {
var elem = d3.select(this);

16
style/client.css
View File

@ -1280,20 +1280,20 @@ a.ilink.yours {
}
.tournament-bracket-tree-node > rect {
/* Note: Due to SVG limitations, dimensions and border radii are in client-chat-tournament.js (nodeSize) */
fill: rgba(225, 232, 242, 0.7);
stroke: rgba(178, 183, 191, 0.7);
fill: rgba(74, 77, 80, 0.2);
stroke: rgba(74, 77, 80, 0.7);
}
.tournament-bracket-tree-node-win > rect {
fill: rgba(0, 255, 0, 0.2);
stroke: rgba(0, 255, 0, 0.5);
fill: rgba(0, 128, 0, 0.2);
stroke: rgba(0, 128, 0, 0.7);
}
.tournament-bracket-tree-node-draw > rect {
fill: rgba(255, 255, 0, 0.2);
stroke: rgba(255, 255, 0, 0.5);
fill: rgba(255, 128, 0, 0.2);
stroke: rgba(255, 128, 0, 0.7);
}
.tournament-bracket-tree-node-loss > rect {
fill: rgba(255, 0, 0, 0.2);
stroke: rgba(255, 0, 0, 0.5);
stroke: rgba(255, 0, 0, 0.7);
}
.tournament-bracket-tree-node > text {
font-size: 0.8em;
@ -1310,7 +1310,7 @@ a.ilink.yours {
font-weight: bold;
}
.tournament-bracket-tree-node-match-team-draw, .tournament-bracket-tree-node-match-team-loss {
fill: #aaa;
fill: #555;
}
.tournament-tools {