From 4cbf0b45fe05a2d2d551c5fc35530ff1deba6208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bodo=20H=C3=BCsemann?= Date: Sat, 8 Jan 2022 13:41:50 +0100 Subject: [PATCH] code cleanup and CSS fixes --- The One Ring 2e/sheet.css | 30 ++- The One Ring 2e/sheet.html | 478 +++++++++++++++++++------------------ 2 files changed, 269 insertions(+), 239 deletions(-) diff --git a/The One Ring 2e/sheet.css b/The One Ring 2e/sheet.css index 76969f8512..456678d51a 100644 --- a/The One Ring 2e/sheet.css +++ b/The One Ring 2e/sheet.css @@ -163,48 +163,52 @@ .charsheet input[type="checkbox"]:checked + span { text-decoration: underline; } -/* - Dots - */ +/* Dots*/ .charsheet .sheet-dots { display: block; float: right; top: 2px; right: 0; - margin-right: 20px; + margin: 3px 15px 0px 0px; } .charsheet .sheet-dots input[type="radio"] { opacity: 0; width: 16px; height: 16px; position: relative; - top: 5px; + top: -4px; left: 6px; margin: -8px -8px -8px -8px; cursor: pointer; z-index: 1; } -.charsheet input[type="radio"] + span::before{ +.charsheet .sheet-dots input[type="radio"] + span:before{ margin-right: 4px; - text-align: center; display: inline-block; - vertical-align: middle; + vertical-align: top; line-height: 10px; width: 10px; height: 10px; content: "•"; opacity:0; } -.charsheet .sheet-dots input[type="radio"]:not([value="0"]) + span { - background: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/The%20One%20Ring/assets/images/square-filled.png") no-repeat; - background-size:100%; -} .charsheet .sheet-dots input[type="radio"]:checked ~ input[type="radio"] + span { background: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/The%20One%20Ring/assets/images/square-empty.png") no-repeat; background-size:100%; } +.charsheet .sheet-dots input[type="radio"][value="0"] + span:before { + content: 'X'; + opacity: 0.2; + border: 0.5px solid rgb(155, 151, 151); + border-radius: 50%; + margin-top: 2px; +} +.charsheet .sheet-dots input[type="radio"]:not([value="0"]) + span { + background: url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/The%20One%20Ring/assets/images/square-filled.png") no-repeat; + background-size:100%; +} /* Remove dot from all radios _after_ selected one */ -.charsheet input[type="radio"]:checked ~ input[type="radio"] + span::before{ +.charsheet .sheet-dots input[type="radio"]:checked ~ input[type="radio"] + span:before{ content: ""; } .charsheet .sheet-hover-info { diff --git a/The One Ring 2e/sheet.html b/The One Ring 2e/sheet.html index 3e0ef9655c..26af217200 100644 --- a/The One Ring 2e/sheet.html +++ b/The One Ring 2e/sheet.html @@ -1,4 +1,4 @@ - +
@@ -110,6 +110,38 @@
+
+

Conditions / Modifiers

+
+ + + + + + +
+ +
+
+
+ +
When enabled the dice rolls will be + parsed and calculated, with output displayed in a rolltemplate. This removes the need for roll + tables.
+ + +   + + + +
+
When enabled the dice rolls will be + using preconfigured rollable tables according to instructions for The One Ring 1st Edition, with + output displayed in a rolltemplate.
+
+
+ +
@@ -142,58 +174,92 @@
-
-

Conditions / Modifiers

-
- - - - - - +
+

Combat

+
+ + + + + +
+
+ + + + + + + +
- -
-
-
- -
When enabled the dice rolls will be parsed and calculated, with output displayed in a rolltemplate. This removes the need for roll tables.
- - -   - - - -
-
When enabled the dice rolls will be using preconfigured rollable tables according to instructions for The One Ring 1st Edition, with output displayed in a rolltemplate.
+ +
+ + + + + +
+
+ + + + + + + +
-
- -
-
-

Protection

-
- - - - - - - - - - - - - + +
+ + + + + +
+
+ + + + + + + +
+
+ +
+ + + + + +
+
+ + + + + + + +
+
+
+

Stance

+ + + + +
+
+
+ + + +
@@ -493,146 +559,37 @@
-
-

Combat

-
- - - - - -
-
- - - - - - - -
-
+
+

Protection

+
+ + + + + + + + -
- - - - - -
-
- - - - - - - -
-
- -
- - - - - -
-
- - - - - - - -
-
- -
- - - - - -
-
- - - - - - - -
-
-
-

Stance

- - - - -
-
-
- - - -
-
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +
- + @@ -640,9 +597,10 @@ - + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

NOTES

@@ -1508,18 +1516,18 @@ }); -
-
{{skill}}
+
+
{{skill}}
{{#rollTotal() favorill 1}} -
stand {{standard}}
+
stand {{standard}}
{{/rollTotal() favorill 1}} {{#rollTotal() favorill 2}} -
fav {{fav}}
+
fav {{fav}}
{{/rollTotal() favorill 2}} {{#rollTotal() favorill 3}} -
ill {{ill}}
+
ill {{ill}}
{{/rollTotal() favorill 3}} -
+
@@ -1529,13 +1537,28 @@
Target Number
-
{{target}}
+
+ {{target}} +
Feat Die
-
Success
Dice
- {{#rollWasCrit() feat}}
{{feat}}
{{/rollWasCrit() feat}} - {{#rollWasFumble() feat}}
{{feat}}
{{/rollWasFumble() feat}} - {{#rollBetween() feat 1 10}}
{{feat}}
{{/rollBetween() feat 1 10}} - {{^feat}}
-
{{/feat}} +
Success
Dice
+ {{#rollWasCrit() feat}} +
+ {{feat}} +
+ {{/rollWasCrit() feat}} + {{#rollWasFumble() feat}} +
+ {{feat}} +
+ {{/rollWasFumble() feat}} + {{#rollBetween() feat 1 10}} +
+ {{feat}} +
+ {{/rollBetween() feat 1 10}}{{^feat}} +
-
+ {{/feat}}
{{r1}}
{{#favoured}}{{favoured}}{{/favoured}} @@ -1549,23 +1572,26 @@
{{#weary}}{{weary}}{{/weary}}
-
{{computed::total}}
+
{{computed::total}} +
Total
{{computed::diff}}
Diff
{{#rollLess() computed::outcome 1}} - {{#rollTotal() computed::outcome -2}}Miserable  {{/rollTotal() computed::outcome -2}} - {{#rollTotal() computed::outcome -1}}Weary  {{/rollTotal() computed::outcome -1}} - Failure! + {{#rollTotal() computed::outcome -2}}Miserable  {{/rollTotal() computed::outcome -2}} + {{#rollTotal() computed::outcome -1}}Weary  {{/rollTotal() computed::outcome -1}} + Failure! {{/rollLess() computed::outcome 1}} {{#rollBetween() computed::outcome 1 3}} - {{#rollTotal() computed::greatness 1}}Great  ({{computed::greatness}}) {{/rollTotal() computed::greatness 1}} - {{#rollGreater() computed::greatness 1}}Extraordinary  ({{computed::greatness}}) {{/rollGreater() computed::greatness 1}} - {{#rollTotal() computed::outcome 2}}Feat  {{/rollTotal() computed::outcome 2}} - {{#rollBetween() computed::outcome 1 2}}Success!{{/rollBetween() computed::outcome 1 2}} - {{#rollTotal() computed::outcome 3}}Piercing  Blow!{{/rollTotal() computed::outcome 3}} + {{#rollTotal() computed::greatness 1}}Great  ({{computed::greatness}})  + {{/rollTotal() computed::greatness 1}} + {{#rollGreater() computed::greatness 1}}Extraordinary  ({{computed::greatness}})  + {{/rollGreater() computed::greatness 1}} + {{#rollTotal() computed::outcome 2}}Feat  {{/rollTotal() computed::outcome 2}} + {{#rollBetween() computed::outcome 1 2}}Success!{{/rollBetween() computed::outcome 1 2}} + {{#rollTotal() computed::outcome 3}}Piercing  Blow!{{/rollTotal() computed::outcome 3}} {{/rollBetween() computed::outcome 1 3}}
@@ -1576,15 +1602,15 @@
{{weaponinfo}}
-
- {{/weaponinfo}} +
+ {{/weaponinfo}} {{#additional}}
{{additional}}
-
- {{/additional}} +
+ {{/additional}}