diff --git a/css/custom.css b/css/custom.css index 3180fd4..d3b701f 100644 --- a/css/custom.css +++ b/css/custom.css @@ -5,6 +5,18 @@ display: table-row; } + + +header.navbar { + background-image: url("../img/horizon.png"); +} + +span.navbar-brand { + position: absolute; + right: 110px; + text-shadow: 2px 0 0 #fff, -2px 0 0 #fff, 0 2px 0 #fff, 0 -2px 0 #fff, 1px 1px #fff, -1px -1px 0 #fff, 1px -1px 0 #fff, -1px 1px 0 #fff; +} + input:invalid { border: 2px solid red; } @@ -63,7 +75,3 @@ input:invalid { .damage-monitor button.active { filter: brightness(91%); } - -/*$light: steelblue; -@import "bootstrap"; -*/ diff --git a/img/act.png b/img/act.png new file mode 100644 index 0000000..08a77dd Binary files /dev/null and b/img/act.png differ diff --git a/img/add.png b/img/add.png index a2c013b..e0d29b6 100644 Binary files a/img/add.png and b/img/add.png differ diff --git a/img/check.png b/img/check.png deleted file mode 100644 index 3ed7a18..0000000 Binary files a/img/check.png and /dev/null differ diff --git a/img/damage.png b/img/damage.png new file mode 100644 index 0000000..7d09d73 Binary files /dev/null and b/img/damage.png differ diff --git a/img/explosion.png b/img/explosion.png deleted file mode 100644 index ad6862a..0000000 Binary files a/img/explosion.png and /dev/null differ diff --git a/img/horizon.png b/img/horizon.png new file mode 100644 index 0000000..7182542 Binary files /dev/null and b/img/horizon.png differ diff --git a/img/newround.png b/img/newround.png new file mode 100644 index 0000000..7c6abf4 Binary files /dev/null and b/img/newround.png differ diff --git a/img/refresh.png b/img/refresh.png deleted file mode 100644 index 2795584..0000000 Binary files a/img/refresh.png and /dev/null differ diff --git a/index.html b/index.html index 660bba3..da95cd0 100644 --- a/index.html +++ b/index.html @@ -24,14 +24,13 @@
-
+
SR2 Initiative Tracker
-
diff --git a/js/sr2ini.js b/js/sr2ini.js index 0b8d73c..3fdc49d 100644 --- a/js/sr2ini.js +++ b/js/sr2ini.js @@ -9,9 +9,9 @@ const COMBATANT_TABLE_ROW = [ '\n', @@ -398,27 +398,7 @@ function addCombatant (e) { $tr.find(".combatantDice").text($("#combatantModalDice").val().trim()); $tr.find(".combatantRea").text($("#combatantModalRea").val().trim()); - //TODO: retrieve initial damage levels - - // construct jQuery object for table row -/* let $tr = $($.parseHTML( [ -'\n', //TODO: add data-damage-* attributes with initial damage levels - '\n', - '\n', - '\n', - '\n', -''].join("") - ));*/ - +//TODO: retrieve initial damage levels //TODO: mark initial damage levels with active class -> what? don't know what this means // add handler to table cells (click to edit) @@ -525,17 +505,17 @@ function startNewRound (e) { // add test combatant for testing purposes (duh) function addTestCombatant() { + // Eclipse $("#addCombatantButton").click(); - $("#combatantModalName").val("Goon1"); - $("#combatantModalDice").val(2); + $("#combatantModalName").val("Eclipse"); + $("#combatantModalDice").val(3); $("#combatantModalRea").val(6); - $("#combatantModalIni").val(12); +// $("#combatantModalIni").val(12); setTimeout(function(){ $("#combatantModalAddOkButton").click(); },500); } - /* * Initialize document */ @@ -570,5 +550,4 @@ $(document).ready(function(){ }); addTestCombatant(); - });
\n', '
\n', '\n', - '\n', + '\n', '
\n', - '\n', + '\n', '
\n', '
\n', '
', name, '', effectiveIni, '', dice, 'D+', rea, '\n', - '
\n', - '\n', - '\n', - '
\n', - '\n', - DAMAGE_MONITOR_HTML + "\n", - '
\n', - '
\n', - '