From f92bd69168e9b9a09c6be6bfa952b6f2154a3c6b Mon Sep 17 00:00:00 2001 From: NoneNoname <git.noname@gmail.com> Date: Thu, 4 Feb 2021 19:53:26 +0100 Subject: [PATCH 1/2] chess css --- BondageClub/CSS/Chess.css | 76 +++++++++++++++++++ .../Screens/MiniGame/Chess/OLD/chessAIOLD.js | 42 +--------- BondageClub/Screens/MiniGame/Chess/chess.js | 44 +---------- BondageClub/Scripts/Server.js | 1 + 4 files changed, 83 insertions(+), 80 deletions(-) diff --git a/BondageClub/CSS/Chess.css b/BondageClub/CSS/Chess.css index 0f35fb0028..b4e1cdec82 100644 --- a/BondageClub/CSS/Chess.css +++ b/BondageClub/CSS/Chess.css @@ -12,3 +12,79 @@ width: auto !important; padding-right: 3px; } + +#DivChessBoard { + padding: 0; + margin: auto; + outline: none; + display: block; + top:0; + bottom: 0; + left: 0; + right: 0; + position: absolute; + width: 50vw; + height: 50vw; +} + +#DivChessBoard > div { + width: 50vw; +} + +#DivChessBoard > div > div { + width: 50vw; +} + +#DivChessBoard > div > div > div { + width: 50vw; + height: 6.25vw +} + +#DivChessBoard > div > div > div > div { + width: 6.25vw; + height: 6.25vw; +} + +#DivChessBoard > div > div > div > div > div { + width: 6.25vw; + height: 6.25vw; +} + +#DivChessBoard img { + width: 6.25vw; + height: 6.25vw; +} + +@media (min-aspect-ratio: 2/1) { + #DivChessBoard { + width: 100vh; + height: 100vh; + } + #DivChessBoard > div { + width: 100vh; + } + + #DivChessBoard > div > div { + width: 100vh; + } + + #DivChessBoard > div > div > div { + width: 100vh; + height: 12.5vh; + } + + #DivChessBoard > div > div > div > div { + width: 12.5vh; + height: 12.5vh; + } + + #DivChessBoard > div > div > div > div > div { + width: 12.5vh; + height: 12.5vh; + } + + #DivChessBoard img { + width: 12.5vh; + height: 12.5vh; + } +} \ No newline at end of file diff --git a/BondageClub/Screens/MiniGame/Chess/OLD/chessAIOLD.js b/BondageClub/Screens/MiniGame/Chess/OLD/chessAIOLD.js index 8b025c10aa..ac2ad19c70 100644 --- a/BondageClub/Screens/MiniGame/Chess/OLD/chessAIOLD.js +++ b/BondageClub/Screens/MiniGame/Chess/OLD/chessAIOLD.js @@ -323,43 +323,7 @@ function MiniGameChessStart(Depth) { // Resizes the chess board to fit the screen function MiniGameChessResize() { - - // Gets the chess board - let TileSize = (MainCanvas.height / 8).toString() + "px"; - let FullSize = MainCanvas.height.toString() + "px"; - var div = document.getElementById("DivChessBoard"); - - // If the board must be resized - if (DivChessBoard.style.width != FullSize) { - DivChessBoard.style.width = FullSize; - DivChessBoard.style.height = FullSize; - DivChessBoard.style.padding = "0"; - DivChessBoard.style.margin = "auto"; - DivChessBoard.style.outline = "none"; - DivChessBoard.style.display = "block"; - DivChessBoard.style.top = "0"; - DivChessBoard.style.bottom = "0"; - DivChessBoard.style.left = "0"; - DivChessBoard.style.right = "0"; - DivChessBoard.style.position = "absolute"; - for (let L0 = 0; L0 < DivChessBoard.children.length; L0++) { - DivChessBoard.children[L0].style.width = FullSize; - for (let L1 = 0; L1 < DivChessBoard.children[L0].children.length; L1++) { - DivChessBoard.children[L0].children[L1].style.width = FullSize; - for (let L2 = 0; L2 < DivChessBoard.children[L0].children[L1].children.length; L2++) { - DivChessBoard.children[L0].children[L1].children[L2].style.width = FullSize; - DivChessBoard.children[L0].children[L1].children[L2].style.height = TileSize; - for (let L3 = 0; L3 < DivChessBoard.children[L0].children[L1].children[L2].children.length; L3++) { - DivChessBoard.children[L0].children[L1].children[L2].children[L3].style.width = TileSize; - DivChessBoard.children[L0].children[L1].children[L2].children[L3].style.height = TileSize; - for (let L4 = 0; L4 < DivChessBoard.children[L0].children[L1].children[L2].children[L3].children.length; L4++) { - DivChessBoard.children[L0].children[L1].children[L2].children[L3].children[L4].style.width = TileSize; - DivChessBoard.children[L0].children[L1].children[L2].children[L3].children[L4].style.height = TileSize; - } - } - } - } - } - } - + DivChessBoard.removeAttribute("style"); + document.querySelectorAll('#DivChessBoard div').forEach(e => e.removeAttribute("style")); + document.querySelectorAll('#DivChessBoard img').forEach(e => e.removeAttribute("style")); } \ No newline at end of file diff --git a/BondageClub/Screens/MiniGame/Chess/chess.js b/BondageClub/Screens/MiniGame/Chess/chess.js index c58fad7b3f..3776ded656 100644 --- a/BondageClub/Screens/MiniGame/Chess/chess.js +++ b/BondageClub/Screens/MiniGame/Chess/chess.js @@ -303,8 +303,6 @@ function MiniGameChessStart(Depth) { var div = document.createElement("div"); div.setAttribute("ID", "DivChessBoard"); div.className = "HideOnDisconnect"; - div.style.width = "600px"; - div.style.height = "600px"; document.body.appendChild(div); } @@ -332,43 +330,7 @@ function MiniGameChessStart(Depth) { // Resizes the chess board to fit the screen function MiniGameChessResize() { - - // Gets the chess board - let TileSize = (MainCanvas.height / 8).toString() + "px"; - let FullSize = MainCanvas.height.toString() + "px"; - var div = document.getElementById("DivChessBoard"); - - // If the board must be resized - if (DivChessBoard.style.width != FullSize) { - DivChessBoard.style.width = FullSize; - DivChessBoard.style.height = FullSize; - DivChessBoard.style.padding = "0"; - DivChessBoard.style.margin = "auto"; - DivChessBoard.style.outline = "none"; - DivChessBoard.style.display = "block"; - DivChessBoard.style.top = "0"; - DivChessBoard.style.bottom = "0"; - DivChessBoard.style.left = "0"; - DivChessBoard.style.right = "0"; - DivChessBoard.style.position = "absolute"; - for (let L0 = 0; L0 < DivChessBoard.children.length; L0++) { - DivChessBoard.children[L0].style.width = FullSize; - for (let L1 = 0; L1 < DivChessBoard.children[L0].children.length; L1++) { - DivChessBoard.children[L0].children[L1].style.width = FullSize; - for (let L2 = 0; L2 < DivChessBoard.children[L0].children[L1].children.length; L2++) { - DivChessBoard.children[L0].children[L1].children[L2].style.width = FullSize; - DivChessBoard.children[L0].children[L1].children[L2].style.height = TileSize; - for (let L3 = 0; L3 < DivChessBoard.children[L0].children[L1].children[L2].children.length; L3++) { - DivChessBoard.children[L0].children[L1].children[L2].children[L3].style.width = TileSize; - DivChessBoard.children[L0].children[L1].children[L2].children[L3].style.height = TileSize; - for (let L4 = 0; L4 < DivChessBoard.children[L0].children[L1].children[L2].children[L3].children.length; L4++) { - DivChessBoard.children[L0].children[L1].children[L2].children[L3].children[L4].style.width = TileSize; - DivChessBoard.children[L0].children[L1].children[L2].children[L3].children[L4].style.height = TileSize; - } - } - } - } - } - } - + DivChessBoard.removeAttribute("style"); + document.querySelectorAll('#DivChessBoard div').forEach(e => e.removeAttribute("style")); + document.querySelectorAll('#DivChessBoard img').forEach(e => e.removeAttribute("style")); } \ No newline at end of file diff --git a/BondageClub/Scripts/Server.js b/BondageClub/Scripts/Server.js index 8e1ab8497d..f180a83897 100644 --- a/BondageClub/Scripts/Server.js +++ b/BondageClub/Scripts/Server.js @@ -23,6 +23,7 @@ var ServerReconnectCount = 0; /** Loads the server by attaching the socket events and their respective callbacks */ function ServerInit() { + return; ServerSocket = io(ServerURL); ServerSocket.on("connect", ServerConnect); ServerSocket.on("reconnecting", ServerReconnecting); -- GitLab From e357df89e8b8547ce5268e0ee8174b83d369a12d Mon Sep 17 00:00:00 2001 From: NoneNoname <git.noname@gmail.com> Date: Thu, 4 Feb 2021 20:09:17 +0100 Subject: [PATCH 2/2] remove style --- BondageClub/Screens/MiniGame/Chess/BondageChess.js | 3 --- BondageClub/Screens/MiniGame/Chess/OLD/chessAIOLD.js | 8 -------- BondageClub/Screens/MiniGame/Chess/chess.js | 8 -------- .../Screens/MiniGame/Chess/chessboard-0.3.0.js | 11 +++-------- BondageClub/Scripts/Server.js | 1 - 5 files changed, 3 insertions(+), 28 deletions(-) diff --git a/BondageClub/Screens/MiniGame/Chess/BondageChess.js b/BondageClub/Screens/MiniGame/Chess/BondageChess.js index 6db6c1bcc0..c97fc095bd 100644 --- a/BondageClub/Screens/MiniGame/Chess/BondageChess.js +++ b/BondageClub/Screens/MiniGame/Chess/BondageChess.js @@ -26,9 +26,6 @@ function ChessLoad() { */ function ChessRun() { - // Resize the board if needed - MiniGameChessResize(); - // Applies restraints or strip if there are special rules CollegeChessGameProgress(); diff --git a/BondageClub/Screens/MiniGame/Chess/OLD/chessAIOLD.js b/BondageClub/Screens/MiniGame/Chess/OLD/chessAIOLD.js index ac2ad19c70..a082d4d331 100644 --- a/BondageClub/Screens/MiniGame/Chess/OLD/chessAIOLD.js +++ b/BondageClub/Screens/MiniGame/Chess/OLD/chessAIOLD.js @@ -315,15 +315,7 @@ function MiniGameChessStart(Depth) { board.clear(); board.start(); game.reset(); - MiniGameChessResize(); MiniGameChessBoard = board; MiniGameChessGame = game; } - -// Resizes the chess board to fit the screen -function MiniGameChessResize() { - DivChessBoard.removeAttribute("style"); - document.querySelectorAll('#DivChessBoard div').forEach(e => e.removeAttribute("style")); - document.querySelectorAll('#DivChessBoard img').forEach(e => e.removeAttribute("style")); -} \ No newline at end of file diff --git a/BondageClub/Screens/MiniGame/Chess/chess.js b/BondageClub/Screens/MiniGame/Chess/chess.js index 3776ded656..e4399d5f46 100644 --- a/BondageClub/Screens/MiniGame/Chess/chess.js +++ b/BondageClub/Screens/MiniGame/Chess/chess.js @@ -322,15 +322,7 @@ function MiniGameChessStart(Depth) { board.clear(); board.start(); game.reset(); - MiniGameChessResize(); MiniGameChessBoard = board; MiniGameChessGame = game; } - -// Resizes the chess board to fit the screen -function MiniGameChessResize() { - DivChessBoard.removeAttribute("style"); - document.querySelectorAll('#DivChessBoard div').forEach(e => e.removeAttribute("style")); - document.querySelectorAll('#DivChessBoard img').forEach(e => e.removeAttribute("style")); -} \ No newline at end of file diff --git a/BondageClub/Screens/MiniGame/Chess/chessboard-0.3.0.js b/BondageClub/Screens/MiniGame/Chess/chessboard-0.3.0.js index 7ae3f1fd94..a3ce1174fd 100644 --- a/BondageClub/Screens/MiniGame/Chess/chessboard-0.3.0.js +++ b/BondageClub/Screens/MiniGame/Chess/chessboard-0.3.0.js @@ -563,7 +563,6 @@ function buildBoardContainer() { /* var buildSquare = function(color, size, id) { var html = '<div class="' + CSS.square + ' ' + CSS[color] + '" ' + - 'style="width: ' + size + 'px; height: ' + size + 'px" ' + 'id="' + id + '">'; if (cfg.showNotation === true) { @@ -599,7 +598,6 @@ function buildBoard(orientation) { html += '<div class="' + CSS.square + ' ' + CSS[squareColor] + ' ' + 'square-' + square + '" ' + - 'style="width: ' + SQUARE_SIZE + 'px; height: ' + SQUARE_SIZE + 'px" ' + 'id="' + SQUARE_ELS_IDS[square] + '" ' + 'data-square="' + square + '">'; @@ -656,16 +654,13 @@ function buildPiece(piece, hidden, id) { if (id && typeof id === 'string') { html += 'id="' + id + '" '; } - let NEW_SIZE = (MainCanvas.height / 8); html += 'alt="" ' + 'class="' + CSS.piece + '" ' + - 'data-piece="' + piece + '" ' + - 'style="width: ' + NEW_SIZE + 'px;' + - 'height: ' + NEW_SIZE + 'px;'; + 'data-piece="' + piece + '" '; if (hidden === true) { - html += 'display:none;'; + html += 'style="display:none;" '; } - html += '" />'; + html += '/>'; return html; } diff --git a/BondageClub/Scripts/Server.js b/BondageClub/Scripts/Server.js index f180a83897..8e1ab8497d 100644 --- a/BondageClub/Scripts/Server.js +++ b/BondageClub/Scripts/Server.js @@ -23,7 +23,6 @@ var ServerReconnectCount = 0; /** Loads the server by attaching the socket events and their respective callbacks */ function ServerInit() { - return; ServerSocket = io(ServerURL); ServerSocket.on("connect", ServerConnect); ServerSocket.on("reconnecting", ServerReconnecting); -- GitLab