diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html index fb371c293..92b461075 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/game.html @@ -12,16 +12,16 @@ } .borderOverlay { - border: 2px solid #000000; + border: solid #000000; } .selectableCard > .borderOverlay { - border: 2px solid #00ff00; + border-color: #00af00; cursor: pointer; } .selectedCard > .borderOverlay { - border: 2px solid #00cccc; + border-color: #009f9f; } .player { diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html index ebe96a0c7..f6f5b1122 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/index.html @@ -22,7 +22,7 @@ } .chatMessage { - color: #000000; + color: #ffffff; } .warningMessage { @@ -84,9 +84,10 @@ - -
-
-
+ +
+
+
+17 \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js index 84004aa4c..d1b464fe3 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js @@ -43,8 +43,11 @@ var CardGroup = Class.extend({ tokenOverlay.css({position: "absolute", left: 0 + "px", top: 0 + "px", width: width, height: height}) .html(""); + var maxDimension = Math.max(width, height); + var borderWidth = Math.floor(maxDimension / 30); + var borderOverlay = $(".borderOverlay", cardElem); - borderOverlay.css({position: "absolute", left: 0 + "px", top: 0 + "px", width: width - 4, height: height - 4}); + borderOverlay.css({position: "absolute", left: 0 + "px", top: 0 + "px", width: width - 2 * borderWidth, height: height - 2 * borderWidth, "border-width": borderWidth + "px"}); var maxDimension = Math.max(width, height); var tokenSize = Math.floor(maxDimension / 12) * 2;