deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of github.com:ornicar/lila

Browse source 
* 'master' of github.com:ornicar/lila:
  Fix alignment of blurs count while in-game
  Align over-board items better
  Make quotes consistent
  cancel rematch offers if going to RPA
  Fix display of RPA when rematch available
This commit is contained in:
Thibault Duplessis 2014-12-05 00:48:55 +01:00
parent 127b5100c6 40e5fd4f2b
commit 12887a9be0
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
public/javascripts/big.js
View file

@ -502,9 +502,12 @@ var storage = {
var $lichessGame = $(".lichess_game");
var px = function(i) { return Math.round(i) + 'px'; };
$boardWrap.css("width", 512 * getZoom() + 'px');
$(".underboard_content").css("margin-left", px((getZoom() - 1) * 250));
$(".underboard").css("margin-left", px((getZoom() - 1) * 250));
$boardWrap.css("width", px(512 * getZoom()));
$('.progress_bar_container').css("width", px(512 * getZoom()));
$('.underboard_content').css("margin-left", px((getZoom() - 1) * 250));
$('.underboard').css("margin-left", px((getZoom() - 1) * 250));
$('.lichess_game > .lichess_overboard').css("left", px(56 + (getZoom() - 1) * 254));
if ($('body').hasClass('is3d')) {
$boardWrap.css("height", px(479.08572 * getZoom()));
$lichessGame.css({
@ -525,7 +528,7 @@ var storage = {
if ($lichessGame.length) {
// if on a board with a game
$("body > .content").css("margin-left", 'calc(50% - ' + px(246.5 + 256 * getZoom()) + ')');
$('body > .content').css("margin-left", 'calc(50% - ' + px(246.5 + 256 * getZoom()) + ')');
}
};

4
public/stylesheets/board.css
View file

@ -1469,12 +1469,16 @@ div.underboard .center {
text-align: center;
padding-top: 15px;
}
div.underboard .blurs,
div.underboard .right {
display: table-cell;
vertical-align: top;
padding-left: 15px;
width: 242px;
}
div.underboard .blurs {
padding-top: 25px;
}
div.underboard a {
display: inline-block;
}

3
ui/round/src/view/button.js
View file

@ -142,7 +142,8 @@ module.exports = {
}, m('span[data-icon=O]'));
},
analysis: function(ctrl) {
if (game.replayable(ctrl.data) && !ctrl.data.player.offeringRematch) return m('a.button.replay_and_analyse', {
if (game.replayable(ctrl.data)) return m('a.button.replay_and_analyse', {
onclick: partial(ctrl.socket.send, 'rematch-no', null),
href: ctrl.router.Round.watcher(ctrl.data.game.id, ctrl.data.player.color).url
}, ctrl.trans('analysis'));
}

2
ui/round/src/view/main.js
View file

@ -89,7 +89,7 @@ module.exports = function(ctrl) {
onclick: toggleDontTouch
}, ctrl.trans('youAreViewingThisGameAsASpectator')) : null
]),
m('div.right', [
m('div.blurs', [
[ctrl.data.opponent, ctrl.data.player].map(partial(mod.blursOf, ctrl)), [ctrl.data.opponent, ctrl.data.player].map(partial(mod.holdOf, ctrl))
])
])