Skip to content

Commit

Permalink
fix UI styling, fix English translation, fix Fin translation
Browse files Browse the repository at this point in the history
  • Loading branch information
@Areso
Areso committed Oct 28, 2020
1 parent bbb1bbb commit 7b63a5c
Show file tree
Hide file tree
Showing 6 changed files with 122 additions and 124 deletions.
58 changes: 28 additions & 30 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,19 +128,19 @@
border: thin solid black;
overflow:scroll;
/*
overflow-x: hidden;
overflow-y: scroll;
*/
overflow-x: hidden;
overflow-y: scroll;
*/
}
#lblEventLBDetails {
width: 795px;
height: 425px;
border: thin solid black;
overflow:scroll;
/*
overflow-x: hidden;
overflow-y: scroll;
*/
overflow-x: hidden;
overflow-y: scroll;
*/
}
#htmlGame {
margin: auto;
Expand All @@ -151,9 +151,9 @@
border: thin solid black;
overflow:scroll;
/*
overflow-x: hidden;
overflow-y: scroll;
*/
overflow-x: hidden;
overflow-y: scroll;
*/
}

/*-- Some new styles --*/
Expand All @@ -163,18 +163,18 @@
height: 45px;
}

.btnArrow {
padding-left: 1px;
padding-right: 1px;
}
.lblHiringTroops {
font-size: 12px;
}
.btnArrow {
padding-left: 1px;
padding-right: 1px;
}
.lblHiringTroops {
font-size: 12px;
}

.btnDismiss {
padding: 0 1px;
height: 22px;
}
.btnDismiss {
padding: 0 1px;
height: 22px;
}

</style>
<script id="chatBroEmbedCode">
Expand Down Expand Up @@ -663,29 +663,29 @@ <h2>How to play</h2>
<label class="lblHiringTroops" id="lblTabHiringTroopsSergeantsGarrison">sergeants: </label><div id="lblGarnisonSergeants" style="display: inline">0</div>
<button class="btnArrow" id="btnMoveSergeantToHero" onclick="game.moveSergeantsToHero()" onmouseover="game.help(this)">↓</button>
<button class="btnArrow" id="btnMoveAllSergeantsToHero" onclick="game.moveAllSergeantsToHero()" onmouseover="game.help(this)">⇓</button>

<br>
<button id="btnDismissGarrisonSergeant" class="btnDismiss" onclick="game.dismissGarrisonSergeant()" onmouseover="game.help(this)">X</button>
<button id="btnDismissAllGarrisonSergeants" class="btnDismiss" onclick="game.dismissAllGarrisonSergenats()" onmouseover="game.help(this)">XX</button>

</td>
<td>
<label class="lblHiringTroops" id="lblTabHiringTroopsTurkopolsGarrison">turkopols: </label><div id="lblGarnisonTurkopols" style="display: inline">0</div>
<button class="btnArrow" id="btnMoveTurkopolToHero" onclick="game.moveTurkopolsToHero()" onmouseover="game.help(this)">↓</button>
<button class="btnArrow" id="btnMoveAllTurkopolsToHero" onclick="game.moveAllTurkopolsToHero()" onmouseover="game.help(this)">⇓</button>

<br>
<button id="btnDismissGarrisonTurkopol" class="btnDismiss" onclick="game.dismissGarrisonTurkopol()" onmouseover="game.help(this)">X</button>
<button id="btnDismissAllGarrisonTurkopols" class="btnDismiss" onclick="game.dismissAllGarrisonTurkopols()" onmouseover="game.help(this)">XX</button>

</td>
<td>
<label class="lblHiringTroops" id="lblTabHiringTroopsKnightsGarrison">knights: </label><div id="lblGarnisonKnights" style="display: inline">0</div>
<button class="btnArrow" id="btnMoveKnightToHero" onclick="game.moveKnightsToHero()" onmouseover="game.help(this)">↓</button>
<button class="btnArrow" id="btnMoveAllKnightsToHero" onclick="game.moveAllKnightsToHero()" onmouseover="game.help(this)">⇓</button>
<br>
<button id="btnDismissGarrisonKnight" class="btnDismiss" onclick="game.dismissGarrisonKnight()" onmouseover="game.help(this)">X</button>
<button id="btnDismissAllGarrisonKnights" class="btnDismiss" onclick="game.dismissAllGarrisonKnights()" onmouseover="game.help(this)">XX</button>
</td>
<td>
<button class="btnArrow" id="btnMoveAllTroopsToHero" onclick="game.moveAllTroopsToHero()" onmouseover="game.help(this)">⤋</button>
<br>
<button id="btnDismissAllGarrisonForces" class="btnDismiss" onclick="game.dismissAllGarrisonForces()" onmouseover="game.help(this)">XXX</button>
</td>
</tr>
Expand All @@ -698,31 +698,29 @@ <h2>How to play</h2>
<label class="lblHiringTroops" id="lblTabHiringTroopsSergeantsHeroSquad">sergeants: </label><div id="lblHeroSergeants" style="display: inline">0</div>
<button class="btnArrow" id="btnMoveSergeantToGarrison" onclick="game.moveSergeantsToGarnison()" onmouseover="game.help(this)">↑</button>
<button class="btnArrow" id="btnMoveAllSergeantsToGarrison" onclick="game.moveAllSergeantsToGarrison()" onmouseover="game.help(this)">⇑</button>

<br>
<button id="btnDismissHeroSergeant" class="btnDismiss" onclick="game.dismissHeroSergeant()" onmouseover="game.help(this)">X</button>
<button id="btnDismissAllHeroSergeants" class="btnDismiss" onclick="game.dismissAllHeroSergeants()" onmouseover="game.help(this)">XX</button>

</td>
<td>
<label class="lblHiringTroops" id="lblTabHiringTroopsTurkopolsHeroSquad">turkopols: </label><div id="lblHeroTurkopols" style="display: inline">0</div>
<button class="btnArrow" id="btnMoveTurkopolToGarrison" onclick="game.moveTurkopolsToGarnison()" onmouseover="game.help(this)">↑</button>
<button class="btnArrow" id="btnMoveAllTurkopolsToGarrison" onclick="game.moveAllTurkopolsToGarrison()" onmouseover="game.help(this)">⇑</button>

<br>
<button id="btnDismissHeroTurkopol" class="btnDismiss" onclick="game.dismissHeroTurkopol()" onmouseover="game.help(this)">X</button>
<button id="btnDismissAllHeroTurkopols" class="btnDismiss" onclick="game.dismissAllHeroTurkopols()" onmouseover="game.help(this)">XX</button>

</td>
<td>
<label class="lblHiringTroops" id="lblTabHiringTroopsKnightsHeroSquad">knights: </label><div id="lblHeroKnights" style="display: inline">0</div>
<button class="btnArrow" id="btnMoveKnightToGarrison" onclick="game.moveKnightsToGarnison()" onmouseover="game.help(this)">↑</button>
<button class="btnArrow" id="btnMoveAllKnightsToGarrison" onclick="game.moveAllKnightsToGarrison()" onmouseover="game.help(this)">⇑</button>

<br>
<button id="btnDismissHeroKnight" class="btnDismiss" onclick="game.dismissHeroKnight()" onmouseover="game.help(this)">X</button>
<button id="btnDismissAllHeroKnights" class="btnDismiss" onclick="game.dismissAllHeroKnights()" onmouseover="game.help(this)">XX</button>

</td>
<td>
<button class="btnArrow" id="btnMoveAllTroopsToGarrison" onclick="game.moveAllTroopsToGarrison()" onmouseover="game.help(this)">⤊</button>
<br>
<button id="btnDismissAllHeroForces" class="btnDismiss" onclick="game.dismissAllHeroForces()" onmouseover="game.help(this)">XXX</button>
</td>
</tr>
Expand Down
41 changes: 21 additions & 20 deletions langs/de-DE.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ localeStrings.push("Move troops to hero's squad");
localeStrings.push("Move all forces to hero's squad");
localeStrings.push("Move troops to garrison");
localeStrings.push("Move all forces to garrison");
localeStrings.push("You cannot afford upkeeping of %arg1 treasury guard(s). They are dismissed.");
localeStrings.push("You cannot afford upkeeping of %arg1 treasury guard(s). They are dismissed.");//335
localeStrings.push("You cannot afford upkeeping of %arg1 sergeant(s). They are dismissed.");
localeStrings.push("You cannot afford upkeeping of %arg1 turkopols(s). They are dismissed.");
localeStrings.push("You cannot afford upkeeping of %arg1 knights(s). They are dismissed.");
Expand All @@ -375,35 +375,36 @@ localeStrings.push("Dismiss all turkopols from the garrison");
localeStrings.push("Dismiss a knight from the garrison");
localeStrings.push("Dismiss all knights from the garrison");
localeStrings.push("Dismiss all forces from the garrison"); //345
localeStrings.push("Dismiss a sergeant from the heroe's squad");
localeStrings.push("Dismiss all sergeants from the heroe's squad");
localeStrings.push("Dismiss a turkopol from the heroe's squad");
localeStrings.push("Dismiss all turkopols from the heroe's squad");
localeStrings.push("Dismiss a knight from the heroe's squad"); //350
localeStrings.push("Dismiss all knights from the heroe's squad");
localeStrings.push("Dismiss all forces from the heroe's squad");
localeStrings.push("Dismiss a sergeant from the hero's squad");
localeStrings.push("Dismiss all sergeants from the hero's squad");
localeStrings.push("Dismiss a turkopol from the hero's squad");
localeStrings.push("Dismiss all turkopols from the hero's squad");
localeStrings.push("Dismiss a knight from the hero's squad"); //350
localeStrings.push("Dismiss all knights from the hero's squad");
localeStrings.push("Dismiss all forces from the hero's squad");
localeStrings.push("You are going to dismiss a sergeant from the garrison. Are you sure?");
localeStrings.push("You are going to dismiss a turkopol from the garrison. Are you sure?");
localeStrings.push("You are going to dismiss a knight from the garrison. Are you sure?"); // 355
localeStrings.push("You are going to dismiss all sergeants from the garrison. Are you sure?");
localeStrings.push("You are going to dismiss all turkopols from the garrison. Are you sure?");
localeStrings.push("You are going to dismiss all knights from the garrison. Are you sure?");
localeStrings.push("You are going to dismiss a sergeant from the heroe's squad. Are you sure?");
localeStrings.push("You are going to dismiss a turkopol from the heroe's squad. Are you sure?"); //360
localeStrings.push("You are going to dismiss a knight from the heroe's squad. Are you sure?");
localeStrings.push("You are going to dismiss all sergeants from the heroe's squad. Are you sure?");
localeStrings.push("You are going to dismiss all turkopols from the heroe's squad. Are you sure?");
localeStrings.push("You are going to dismiss all knights from the heroe's squad. Are you sure?");
localeStrings.push("You are going to dismiss a sergeant from the hero's squad. Are you sure?");
localeStrings.push("You are going to dismiss a turkopol from the hero's squad. Are you sure?"); //360
localeStrings.push("You are going to dismiss a knight from the hero's squad. Are you sure?");
localeStrings.push("You are going to dismiss all sergeants from the hero's squad. Are you sure?");
localeStrings.push("You are going to dismiss all turkopols from the hero's squad. Are you sure?");
localeStrings.push("You are going to dismiss all knights from the hero's squad. Are you sure?");
localeStrings.push("You are going to dismiss all garrison forces: %arg1 %arg2 %arg3. Are you sure?"); //365
localeStrings.push("You are going to dismiss all heroe's squad forces: %arg1 %arg2 %arg3. Are you sure?");
localeStrings.push("You are going to dismiss all hero's squad forces: %arg1 %arg2 %arg3. Are you sure?");
localeStrings.push("You don't have any sergeants at the garrison");
localeStrings.push("You don't have any turkopols at the garrison");
localeStrings.push("You don't have any knights at the garrison");
localeStrings.push("You don't have any sergeants at the heroe's squad"); //370
localeStrings.push("You don't have any turkopols at the heroe's squad");
localeStrings.push("You don't have any knights at the heroe's squad");
localeStrings.push("You don't have any sergeants at the hero's squad"); //370
localeStrings.push("You don't have any turkopols at the hero's squad");
localeStrings.push("You don't have any knights at the hero's squad");
localeStrings.push("You don't have any forces at the garrison");
localeStrings.push("You don't have any forces at the heroe's squad");
localeStrings.push("You don't have any forces at the hero's squad");
localeStrings.push("sergeants(%arg1)"); //375
localeStrings.push("turkopols(%arg1)");
localeStrings.push("knights(%arg1)");
localeStrings.push("knights(%arg1)");

36 changes: 18 additions & 18 deletions langs/en-US.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,35 +375,35 @@ localeStrings.push("Dismiss all turkopols from the garrison");
localeStrings.push("Dismiss a knight from the garrison");
localeStrings.push("Dismiss all knights from the garrison");
localeStrings.push("Dismiss all forces from the garrison"); //345
localeStrings.push("Dismiss a sergeant from the heroe's squad");
localeStrings.push("Dismiss all sergeants from the heroe's squad");
localeStrings.push("Dismiss a turkopol from the heroe's squad");
localeStrings.push("Dismiss all turkopols from the heroe's squad");
localeStrings.push("Dismiss a knight from the heroe's squad"); //350
localeStrings.push("Dismiss all knights from the heroe's squad");
localeStrings.push("Dismiss all forces from the heroe's squad");
localeStrings.push("Dismiss a sergeant from the hero's squad");
localeStrings.push("Dismiss all sergeants from the hero's squad");
localeStrings.push("Dismiss a turkopol from the hero's squad");
localeStrings.push("Dismiss all turkopols from the hero's squad");
localeStrings.push("Dismiss a knight from the hero's squad"); //350
localeStrings.push("Dismiss all knights from the hero's squad");
localeStrings.push("Dismiss all forces from the hero's squad");
localeStrings.push("You are going to dismiss a sergeant from the garrison. Are you sure?");
localeStrings.push("You are going to dismiss a turkopol from the garrison. Are you sure?");
localeStrings.push("You are going to dismiss a knight from the garrison. Are you sure?"); // 355
localeStrings.push("You are going to dismiss all sergeants from the garrison. Are you sure?");
localeStrings.push("You are going to dismiss all turkopols from the garrison. Are you sure?");
localeStrings.push("You are going to dismiss all knights from the garrison. Are you sure?");
localeStrings.push("You are going to dismiss a sergeant from the heroe's squad. Are you sure?");
localeStrings.push("You are going to dismiss a turkopol from the heroe's squad. Are you sure?"); //360
localeStrings.push("You are going to dismiss a knight from the heroe's squad. Are you sure?");
localeStrings.push("You are going to dismiss all sergeants from the heroe's squad. Are you sure?");
localeStrings.push("You are going to dismiss all turkopols from the heroe's squad. Are you sure?");
localeStrings.push("You are going to dismiss all knights from the heroe's squad. Are you sure?");
localeStrings.push("You are going to dismiss a sergeant from the hero's squad. Are you sure?");
localeStrings.push("You are going to dismiss a turkopol from the hero's squad. Are you sure?"); //360
localeStrings.push("You are going to dismiss a knight from the hero's squad. Are you sure?");
localeStrings.push("You are going to dismiss all sergeants from the hero's squad. Are you sure?");
localeStrings.push("You are going to dismiss all turkopols from the hero's squad. Are you sure?");
localeStrings.push("You are going to dismiss all knights from the hero's squad. Are you sure?");
localeStrings.push("You are going to dismiss all garrison forces: %arg1 %arg2 %arg3. Are you sure?"); //365
localeStrings.push("You are going to dismiss all heroe's squad forces: %arg1 %arg2 %arg3. Are you sure?");
localeStrings.push("You are going to dismiss all hero's squad forces: %arg1 %arg2 %arg3. Are you sure?");
localeStrings.push("You don't have any sergeants at the garrison");
localeStrings.push("You don't have any turkopols at the garrison");
localeStrings.push("You don't have any knights at the garrison");
localeStrings.push("You don't have any sergeants at the heroe's squad"); //370
localeStrings.push("You don't have any turkopols at the heroe's squad");
localeStrings.push("You don't have any knights at the heroe's squad");
localeStrings.push("You don't have any sergeants at the hero's squad"); //370
localeStrings.push("You don't have any turkopols at the hero's squad");
localeStrings.push("You don't have any knights at the hero's squad");
localeStrings.push("You don't have any forces at the garrison");
localeStrings.push("You don't have any forces at the heroe's squad");
localeStrings.push("You don't have any forces at the hero's squad");
localeStrings.push("sergeants(%arg1)"); //375
localeStrings.push("turkopols(%arg1)");
localeStrings.push("knights(%arg1)");
Expand Down
Loading

0 comments on commit 7b63a5c

Please sign in to comment.