Skip to content

Commit

Permalink
Deploy af8b96b
Browse files Browse the repository at this point in the history
  • Loading branch information
@anastarawneh
anastarawneh committed Aug 10, 2023
1 parent dc66f67 commit c337c12
Show file tree
Hide file tree
Showing 11 changed files with 714 additions and 505 deletions.
5 changes: 5 additions & 0 deletions css/dark-theme.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,3 +160,8 @@ input.select2-input {
background: url('../js/vendor/select2/select2.png') no-repeat 100% -22px, var(--background);
}

.game.visually-hidden:disabled + .btn {
color: #999999;
background-color: #2c2c2c;
}

28 changes: 27 additions & 1 deletion css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,6 @@ th {
}

.game.visually-hidden:disabled + .btn {
color: #999999;
background-color: #d3d3d3;
}

Expand Down Expand Up @@ -511,3 +510,30 @@ table.field {
.extraSetMoves {
width: 100%;
}





.trainer-poke-list {
display: flex;
flex-wrap: wrap;
}

.trainer-poke-list-opposing {
display: flex;
flex-wrap: wrap;
}

.trainer-poke {
height: 100%;
width: auto;
margin-right: 10px;
cursor: pointer;
box-sizing: border-box;
}

.trainer-poke:hover {
outline: 2px solid;
outline-color: #1abc9c;
}
4 changes: 2 additions & 2 deletions honkalculate.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<link type="text/css" rel="stylesheet" href="https://cdn.datatables.net/1.10.4/css/jquery.dataTables.min.css" />
<link type="text/css" rel="stylesheet" href="https://cdn.datatables.net/colvis/1.1.1/css/dataTables.colVis.css" />
<link type="text/css" rel="stylesheet" href="./js/vendor/select2/select2.css" />
<link type="text/css" rel="stylesheet" href="./css/main.css?f9a86f41" />
<link type="text/css" rel="stylesheet" href="./css/main.css?d9132602" />
<link type="text/css" rel="stylesheet" href="./css/dark-theme.css" id="dark-theme-styles">
<!-- Immediately loads the dark theme in order to reduce FOIT -->
<script>
Expand Down Expand Up @@ -929,7 +929,7 @@
<script type="text/javascript" src="./calc/result.js?9f8881b5"></script>
<script type="text/javascript" src="./calc/adaptable.js?92e49194"></script>
<script type="text/javascript" src="./calc/index.js?0b1745b9"></script>
<script type="text/javascript" src="./js/shared_controls.js?4a47295a"></script>
<script type="text/javascript" src="./js/shared_controls.js?71f12b78"></script>
<script type="text/javascript" src="./js/honkalculate_controls.js?2857a4ec"></script>

<div style="clear:both;padding:20px;text-align:left">Created by Honko, maintained by Austin and Kris
Expand Down
24 changes: 19 additions & 5 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="UTF-8" />
<title>Pok&eacute;mon Damage Calculator</title>
<link type="text/css" rel="stylesheet" href="./js/vendor/select2/select2.css" />
<link type="text/css" rel="stylesheet" href="./css/main.css?f9a86f41" />
<link type="text/css" rel="stylesheet" href="./css/main.css?d9132602" />
<link type="text/css" rel="stylesheet" href="./css/vendor/bootstrap.css" />
<link type="text/css" rel="stylesheet" href="./css/dark-theme.css" id="dark-theme-styles">
<!-- Immediately loads the dark theme in order to reduce FOIT -->
Expand Down Expand Up @@ -148,7 +148,7 @@
<div aria-label="Pok&eacute;mon 1" class="panel" role="region">
<fieldset class="poke-info" id="p1">
<legend align="center">Pok&eacute;mon 1</legend>
<input type="text" class="set-selector calc-trigger" />
<input type="text" class="set-selector calc-trigger player" />
<span id="importedSetsOptions" style="width:auto; display:none">
<input type="checkbox" id="importedSets" /> Only show imported sets <br />
<button id="clearSets">Clear Imported Sets</button>
Expand Down Expand Up @@ -674,6 +674,12 @@
<option value="5">5 times</option>
</select>
</div>
<hr>
<div class="trainer-pokes">
<div class="trainer-poke-list player-pokes">
<img class="trainer-poke-onside" src="https://play.pokemonshowdown.com/sprites/gen5/charizard.png">
</div>
</div>
</fieldset>
</div>

Expand Down Expand Up @@ -1029,7 +1035,7 @@
<div aria-label="Pok&eacute;mon 2" role="region" class="panel">
<fieldset class="poke-info" id="p2">
<legend align="center">Pok&eacute;mon 2</legend>
<input type="text" class="set-selector calc-trigger" />
<input type="text" class="set-selector calc-trigger opposing" />
<span id="importedSetsOptions" style="width:auto; display:none">
<input type="checkbox" id="importedSets" /> Only show imported sets <br />
<button id="clearSets">Clear Imported Sets</button>
Expand Down Expand Up @@ -1553,6 +1559,14 @@
<option value="5">5 times</option>
</select>
</div>
<hr>
<div class="trainer-pokes">
<div class="trainer-poke-list-opposing">
<div class="trainer-poke-container">
<img class="trainer-poke-opposing" src="https://play.pokemonshowdown.com/sprites/gen5/charizard.png" title="Focus Blast 120">
</div>
</div>
</div>
</fieldset>
</div>
<script type="text/javascript">
Expand Down Expand Up @@ -1604,9 +1618,9 @@
<script type="text/javascript" src="./calc/result.js?9f8881b5"></script>
<script type="text/javascript" src="./calc/adaptable.js?92e49194"></script>
<script type="text/javascript" src="./calc/index.js?0b1745b9"></script>
<script type="text/javascript" src="./js/shared_controls.js?4a47295a"></script>
<script type="text/javascript" src="./js/shared_controls.js?71f12b78"></script>
<script type="text/javascript" src="./js/index_randoms_controls.js?87d3bda8"></script>
<script type="text/javascript" src="./js/moveset_import.js?c09c5175"></script>
<script type="text/javascript" src="./js/moveset_import.js?8a4ad895"></script>

<script type="text/javascript" src="./js/game_controls.js"></script>
</div>
Expand Down
18 changes: 16 additions & 2 deletions index.template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<div aria-label="Pok&eacute;mon 1" class="panel" role="region">
<fieldset class="poke-info" id="p1">
<legend align="center">Pok&eacute;mon 1</legend>
<input type="text" class="set-selector calc-trigger" />
<input type="text" class="set-selector calc-trigger player" />
<span id="importedSetsOptions" style="width:auto; display:none">
<input type="checkbox" id="importedSets" /> Only show imported sets <br />
<button id="clearSets">Clear Imported Sets</button>
Expand Down Expand Up @@ -674,6 +674,12 @@
<option value="5">5 times</option>
</select>
</div>
<hr>
<div class="trainer-pokes">
<div class="trainer-poke-list player-pokes">
<img class="trainer-poke-onside" src="https://play.pokemonshowdown.com/sprites/gen5/charizard.png">
</div>
</div>
</fieldset>
</div>

Expand Down Expand Up @@ -1029,7 +1035,7 @@
<div aria-label="Pok&eacute;mon 2" role="region" class="panel">
<fieldset class="poke-info" id="p2">
<legend align="center">Pok&eacute;mon 2</legend>
<input type="text" class="set-selector calc-trigger" />
<input type="text" class="set-selector calc-trigger opposing" />
<span id="importedSetsOptions" style="width:auto; display:none">
<input type="checkbox" id="importedSets" /> Only show imported sets <br />
<button id="clearSets">Clear Imported Sets</button>
Expand Down Expand Up @@ -1553,6 +1559,14 @@
<option value="5">5 times</option>
</select>
</div>
<hr>
<div class="trainer-pokes">
<div class="trainer-poke-list-opposing">
<div class="trainer-poke-container">
<img class="trainer-poke-opposing" src="https://play.pokemonshowdown.com/sprites/gen5/charizard.png" title="Focus Blast 120">
</div>
</div>
</div>
</fieldset>
</div>
<script type="text/javascript">
Expand Down
Loading

0 comments on commit c337c12

Please sign in to comment.