introduce staunton pieces, rethink play layout

pull/132/head
Thibault Duplessis 2014-10-03 23:30:46 +02:00
parent cf0fbf5b00
commit 44992e1c62
7 changed files with 64 additions and 25 deletions

3
.gitmodules vendored
View File

@ -7,3 +7,6 @@
[submodule "modules/swisssystem"] [submodule "modules/swisssystem"]
path = modules/swisssystem path = modules/swisssystem
url = https://github.com/psuter/swisssystem url = https://github.com/psuter/swisssystem
[submodule "public/staunton"]
path = public/staunton
url = https://github.com/clarkerubber/Staunton-Pieces

View File

@ -60,7 +60,8 @@ RSYNC_OPTIONS=" \
--exclude logs \ --exclude logs \
--exclude RUNNING_PID \ --exclude RUNNING_PID \
--exclude bin/.translate_version \ --exclude bin/.translate_version \
--exclude local"; --exclude local
--exclude '*.psd'";
lilalog "Rsync scripts, binaries and assets" lilalog "Rsync scripts, binaries and assets"
stage="target/universal/stage" stage="target/universal/stage"

View File

@ -11,7 +11,7 @@ sealed class PieceSet private (val name: String) {
object PieceSet { object PieceSet {
val all = NonEmptyList("cburnett", "merida", "pirouetti", "alpha", "spatial") map { name => new PieceSet(name) } val all = NonEmptyList("cburnett", "merida", "pirouetti", "alpha", "spatial", "staunton") map { name => new PieceSet(name) }
val list = all.list val list = all.list

1
public/staunton 160000

@ -0,0 +1 @@
Subproject commit 263845c25fa45eb497c2fe6ff58ac003826aa55e

View File

@ -1,11 +1,10 @@
div.lichess_game {
display: table;
}
div.lichess_board_wrap { div.lichess_board_wrap {
float: left; display: table-cell;
border: 1px solid #ccc; border: 1px solid #ccc;
position: relative; position: relative;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
} }
span.board_mark { span.board_mark {
position: absolute; position: absolute;
@ -36,7 +35,6 @@ div.lcs {
width: 64px; width: 64px;
height: 64px; height: 64px;
} }
body.blue div.lichess_board, body.blue div.lichess_board,
body.blue #GameBoard, body.blue #GameBoard,
body.blue .mini_board, body.blue .mini_board,
@ -122,6 +120,7 @@ body.leather .cg-board,
background-image: url(../images/board/leather-512.jpg); background-image: url(../images/board/leather-512.jpg);
} }
/* KotH boards */ /* KotH boards */
body.blue div.lichess_board.kingOfTheHill, body.blue div.lichess_board.kingOfTheHill,
body.blue #GameBoard.kingOfTheHill { body.blue #GameBoard.kingOfTheHill {
background-image: url(../images/board/koth/blue.jpg); background-image: url(../images/board/koth/blue.jpg);
@ -170,7 +169,6 @@ body.leather div.lichess_board.kingOfTheHill,
body.leather #GameBoard.kingOfTheHill { body.leather #GameBoard.kingOfTheHill {
background-image: url(../images/board/koth/leather.jpg); background-image: url(../images/board/koth/leather.jpg);
} }
@media @media
only screen and (-webkit-min-device-pixel-ratio:2), only screen and (-webkit-min-device-pixel-ratio:2),
@ -178,11 +176,7 @@ only screen and (min--moz-device-pixel-ratio:2),
only screen and (min-device-pixel-ratio:2), only screen and (min-device-pixel-ratio:2),
only screen and (min-resolution:192dpi), only screen and (min-resolution:192dpi),
only screen and (min-resolution:2dppx) { only screen and (min-resolution:2dppx) {
body.wood div.lichess_board, body.wood div.lichess_board, body.wood #GameBoard, body.wood .mini_board, body.wood .cg-board, #top div.color_demo.wood {
body.wood #GameBoard,
body.wood .mini_board,
body.wood .cg-board,
#top div.color_demo.wood {
background-image: url(../images/board/wood3-1024.jpg); background-image: url(../images/board/wood3-1024.jpg);
} }
body.canvas div.lichess_board, body.canvas div.lichess_board,
@ -416,6 +410,50 @@ body.alpha div.queen.black {
body.alpha div.king.black { body.alpha div.king.black {
background-image: url(../piece/alpha/bK.svg); background-image: url(../piece/alpha/bK.svg);
} }
body.staunton div.pawn.white {
background-image: url(../staunton/Renders/Pieces/Wood/White-Pawn.png);
}
body.staunton div.bishop.white {
background-image: url(../staunton/Renders/Pieces/Wood/White-Bishop.png);
}
body.staunton div.knight.white,
#top div.piece_demo.staunton {
background-image: url(../staunton/Renders/Pieces/Wood/White-Knight.png);
}
body.staunton div.rook.white {
background-image: url(../staunton/Renders/Pieces/Wood/White-Rook.png);
}
body.staunton div.queen.white {
background-image: url(../staunton/Renders/Pieces/Wood/White-Queen.png);
}
body.staunton div.king.white {
background-image: url(../staunton/Renders/Pieces/Wood/White-King.png);
}
body.staunton div.pawn.black {
background-image: url(../staunton/Renders/Pieces/Wood/Black-Pawn.png);
}
body.staunton div.bishop.black {
background-image: url(../staunton/Renders/Pieces/Wood/Black-Bishop.png);
}
body.staunton div.knight.black {
background-image: url(../staunton/Renders/Pieces/Wood/Black-Knight.png);
}
body.staunton div.rook.black {
background-image: url(../staunton/Renders/Pieces/Wood/Black-Rook.png);
}
body.staunton div.queen.black {
background-image: url(../staunton/Renders/Pieces/Wood/Black-Queen.png);
}
body.staunton div.king.black {
background-image: url(../staunton/Renders/Pieces/Wood/Black-King.png);
}
body.staunton div.cg-piece {
height: 140%;
width: 120%;
left: -10%;
top: -10%;
z-index: 3;
}
div.lichess_game_not_started { div.lichess_game_not_started {
position: relative; position: relative;
} }
@ -430,7 +468,7 @@ div.lichess_overboard {
line-height: 1.8em; line-height: 1.8em;
text-decoration: none; text-decoration: none;
background: #fff; background: #fff;
box-shadow: 0 0 95px 25px rgba(0,0,0,0.6); box-shadow: 0 0 95px 25px rgba(0, 0, 0, 0.6);
text-align: center; text-align: center;
} }
div.lichess_overboard a.close { div.lichess_overboard a.close {
@ -517,14 +555,11 @@ div.lichess_join_url span {
border: 1px solid #D4D4D4; border: 1px solid #D4D4D4;
} }
div.lichess_ground { div.lichess_ground {
position: relative; display: table-cell;
margin-left: 532px; vertical-align: middle;
height: 514px; padding-left: 15px;
} }
div.lichess_table_wrap { div.lichess_table_wrap {
position: absolute;
top: 176px;
left: 0px;
width: 242px; width: 242px;
} }
div.lichess_table { div.lichess_table {
@ -926,9 +961,8 @@ div.underboard a {
div.underboard.replay_and_analyse a { div.underboard.replay_and_analyse a {
font-size: 1.4em; font-size: 1.4em;
} }
div.check_count span.player.color { div.check_count span.player.color {
display:inline-block; display: inline-block;
margin-left: 5px; margin-left: 5px;
font-weight: bold; font-weight: bold;
} }

View File

@ -30,7 +30,7 @@
"watchify": "^1.0.2" "watchify": "^1.0.2"
}, },
"dependencies": { "dependencies": {
"chessground": "^1.4.0", "chessground": "^1.4.1",
"lodash-node": "^2.4.1", "lodash-node": "^2.4.1",
"mithril": "^0.1.22" "mithril": "^0.1.22"
} }

View File

@ -8,7 +8,7 @@ module.exports = function(ctrl) {
if (isUpdate) return; if (isUpdate) return;
$('body').trigger('lichess.content_loaded'); $('body').trigger('lichess.content_loaded');
}, },
class: 'lichess_game clearfix not_spectator pov_' + ctrl.data.player.color class: 'lichess_game not_spectator pov_' + ctrl.data.player.color
}, [ }, [
ctrl.data.blindMode ? m('div#lichess_board_blind') : null, ctrl.data.blindMode ? m('div#lichess_board_blind') : null,
m('div.lichess_board_wrap', ctrl.data.blindMode ? null : [ m('div.lichess_board_wrap', ctrl.data.blindMode ? null : [