diff --git a/FreeSpacer/FreeSpacer.css b/FreeSpacer/FreeSpacer.css index 73d9e18ec1..82b7c30546 100644 --- a/FreeSpacer/FreeSpacer.css +++ b/FreeSpacer/FreeSpacer.css @@ -588,7 +588,8 @@ input.sheet-salvoRollButton + span.sheet-salvoRollButton, input.sheet-salvoRollB .sheet-salvoTitle { - grid-area: 1/39/5/50; + grid-row: 1; + grid-column: 39; background-image: url(https://raw.githubusercontent.com/XophRA/FreeSpacerSheet/RollTemplate/FreeSpacer/img/terminal.png); background-repeat: no-repeat; background-position: center; @@ -607,27 +608,44 @@ input.sheet-salvoRollButton + span.sheet-salvoRollButton, input.sheet-salvoRollB .sheet-salvoSkillBox { - grid-area: 5/4/16/24; + grid-row: 5; + grid-column: 4; } .sheet-salvoSpecialtyBox { - grid-area: 5/55/16/75; + grid-row: 5; + grid-column: 55; } .sheet-salvoToolTypeBox { - grid-area: 25/55/36/75; + grid-row: 23; + grid-column: 55; } .sheet-salvoToolBox { - grid-area: 37/28/48/48; + grid-row: 34; + grid-column: 26; } .sheet-salvoChargeBox { - grid-area: 45/4/56/24; + grid-row: 45; + grid-column: 4; +} + +.sheet-salvoAdvantageBox +{ + grid-row: 45; + grid-column: 45; +} + +.sheet-salvoThreatBox +{ + grid-row: 45; + grid-column: 80; } input[type=number].sheet-salvoRating @@ -642,7 +660,34 @@ input[type=number].sheet-salvoRating border: none; } -input[type=text].sheet-salvoAttr +input[type=number].sheet-salvoThreatRating +{ + margin: 2px 10px 0px 10px; + align-self: start; + justify-self: center; + height: 80px; + width: 90px; + font-size: 28px; + color: dimgray; + border: none; +} + + +div.sheet-salvoThreatAttr +{ + margin: 0px 0px 2px 0px; + align-self: end; + justify-self: center; + height: 20px; + width: 110px; + font-size: 16px; + color: dimgray; + text-align: center; + border: none; +} + +input[type=text].sheet-salvoAttr, +div.sheet-salvoAttr { margin: 0px 35px 2px 25px; align-self: end; @@ -655,6 +700,7 @@ input[type=text].sheet-salvoAttr border: none; } + select.sheet-salvoToolType { margin: 42px 30px 2px 30px; @@ -701,6 +747,17 @@ select.sheet-salvoToolType z-index: 16; } +.sheet-offPage +{ + background-image: url(https://raw.githubusercontent.com/XophRA/FreeSpacerSheet/RollTemplate/FreeSpacer/img/offPage.png); + background-repeat: no-repeat; + background-position: center; + background-size: 110px 110px; + width: 110px; + height: 110px; + z-index: 16; +} + /* Salvo Mode Hiding Functionality */ div.sheet-salvo { @@ -728,7 +785,8 @@ button[type=roll].sheet-rollButton position: absolute; width: 12px; height: 10px; - grid-area: 5/24/6/25; + grid-row: 5; + grid-column: 24; } input.sheet-skillDeselect @@ -1005,7 +1063,8 @@ span.sheet-specialtySelector position: absolute; width: 12px; height: 10px; - grid-area: 25/75/26/76; + grid-row: 23; + grid-column: 75; } input.sheet-scaleDeselect @@ -1042,7 +1101,8 @@ input.sheet-scaleDeselect position: absolute; width: 12px; height: 10px; - grid-area: 37/48/38/49; + grid-row: 34; + grid-column: 46; } input.sheet-toolDeselect @@ -1108,37 +1168,44 @@ input.sheet-crewKitSelector:not(:checked) ~ .sheet-crewKitMods /*Crew Kit Tool Locations*/ .sheet-crewKitScanner { - grid-area: 65/22/66/39; + grid-row: 65; + grid-column: 22; } .sheet-crewKitBioChemKit { - grid-area: 65/40/66/57; + grid-row: 65; + grid-column: 40; } .sheet-crewKitAugmentation { - grid-area: 65/58/66/75; + grid-row: 65; + grid-column: 58; } .sheet-crewKitLink { - grid-area: 81/4/82/21; + grid-row: 81; + grid-column: 4; } .sheet-crewKitMultitool { - grid-area: 81/22/82/39; + grid-row: 81; + grid-column: 22; } .sheet-crewKitShield { - grid-area: 81/40/82/57; + grid-row: 81; + grid-column: 40; } .sheet-crewKitAssociations { - grid-area: 97/4/98/21; + grid-row: 97; + grid-column: 4; } /*Crew Kit Tool Selected*/ diff --git a/FreeSpacer/FreeSpacer.html b/FreeSpacer/FreeSpacer.html index 9189c01068..6d6e862c07 100644 --- a/FreeSpacer/FreeSpacer.html +++ b/FreeSpacer/FreeSpacer.html @@ -242,7 +242,17 @@ + +
+ +
Advantage
+
+ +
+ +
Threat
+
Choose a Skill
diff --git a/FreeSpacer/img/offPage.png b/FreeSpacer/img/offPage.png new file mode 100644 index 0000000000..1374a5bb27 Binary files /dev/null and b/FreeSpacer/img/offPage.png differ