From 6da2045afb2b60fa3630a3e3cc1e20cf670fa4d2 Mon Sep 17 00:00:00 2001 From: CassieLevett Date: Sat, 27 Jan 2024 16:23:32 +0000 Subject: [PATCH] add brawling attacks --- Pendragon6thEdition/pendragon.css | 8 +++-- Pendragon6thEdition/pendragon.html | 2 +- .../pages/components/_characteristics.scss | 5 ++++ .../src/pages/components/characteristics.pug | 30 +++++++++++-------- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/Pendragon6thEdition/pendragon.css b/Pendragon6thEdition/pendragon.css index c1692bf758..a5953beff0 100644 --- a/Pendragon6thEdition/pendragon.css +++ b/Pendragon6thEdition/pendragon.css @@ -463,8 +463,12 @@ div.sheet-character div.sheet-characteristics div.sheet-attacks div.sheet-table div.sheet-character div.sheet-characteristics div.sheet-attacks div.sheet-table div.sheet-header div.sheet-damage { grid-column: 4/6; } -div.sheet-character div.sheet-characteristics div.sheet-attacks div.sheet-brawling div.sheet-row { - grid-template-columns: 2fr 1fr 3em 5em 2.5em; } +div.sheet-character div.sheet-characteristics div.sheet-attacks div.sheet-brawling { + background-color: #e5dbd4; } + div.sheet-character div.sheet-characteristics div.sheet-attacks div.sheet-brawling div:nth-of-type(even) { + background-color: #baa595; } + div.sheet-character div.sheet-characteristics div.sheet-attacks div.sheet-brawling div.sheet-row { + grid-template-columns: 2fr 1fr 3em 5em 2.5em; } div.sheet-character div.sheet-characteristics div.sheet-attacks div.sheet-repeating-container div.sheet-row { grid-template-columns: 2fr 1fr 3em 5em 2.5em; } diff --git a/Pendragon6thEdition/pendragon.html b/Pendragon6thEdition/pendragon.html index 2ddb12463a..3110b105d8 100644 --- a/Pendragon6thEdition/pendragon.html +++ b/Pendragon6thEdition/pendragon.html @@ -1,4 +1,4 @@ -

()

/
/
/
/
/
/
/
/
/
/
/
/
/






p

p

p

{{#header}}{{header}}{{/header}}
{{#luck}}
{{luck}}
{{#calamity}}
{{calamity}}
{{/calamity}}
{{/luck}} +

()

/
/
/
/
/
/
/
/
/
/
/
/
/






p

p

p

{{#header}}{{header}}{{/header}}
{{#luck}}
{{luck}}
{{#calamity}}
{{calamity}}
{{/calamity}}
{{/luck}} {{#dice}}
{{dice}}
{{/dice}} {{#threshold}}
{{threshold}}
{{/threshold}} {{#dice}}
{{#rollGreater() threshold 19}} diff --git a/Pendragon6thEdition/src/pages/components/_characteristics.scss b/Pendragon6thEdition/src/pages/components/_characteristics.scss index 10561a29b7..0df7934e9b 100644 --- a/Pendragon6thEdition/src/pages/components/_characteristics.scss +++ b/Pendragon6thEdition/src/pages/components/_characteristics.scss @@ -35,6 +35,11 @@ div.sheet-characteristics { } div.sheet-brawling { + background-color: $even; + div:nth-of-type(even) { + background-color: $odd; + } + div.sheet-row { grid-template-columns: $attack-row; } diff --git a/Pendragon6thEdition/src/pages/components/characteristics.pug b/Pendragon6thEdition/src/pages/components/characteristics.pug index e137dc7908..19e471b541 100644 --- a/Pendragon6thEdition/src/pages/components/characteristics.pug +++ b/Pendragon6thEdition/src/pages/components/characteristics.pug @@ -22,23 +22,27 @@ .grid.header h3.small-caps.text-left(data-i18n='weapon') each value in ['skill', 'value', 'damage'] - .flex-center(class=value) - h3.small-caps(data-i18n=value) - .grid.brawling + if value === 'skill' + .row + h3.small-caps.text-left(data-i18n=value) + else + .flex-center(class=value) + h3.small-caps(data-i18n=value) + .grid.brawling.mb .row.align-center - h3.text-left.ml.bottom-border(data-i18n='brawling') - span.capitalize.bottom-border(data-i18n='brawling') - span.bottom-border(name="attr_brawling") - span.display.bottom-border(name=`attr_brawling_damage`) + h3.text-left.ml(data-i18n='brawling') + span.capitalize(data-i18n='brawling') + span.text-center(name="attr_brawling") + span.display.text-center(name=`attr_brawling_damage`) +brawlDamageRollButton('brawling damage', 'brawling') .row.align-center - h3.text-left.ml.bottom-border(data-i18n='brawling (open hand)') - span.capitalize.bottom-border(data-i18n='brawling') - span.bottom-border(name="attr_brawling") - span.display.bottom-border(name=`attr_brawling_damage_open`) + h3.text-left.ml(data-i18n='brawling (open hand)') + span.capitalize(data-i18n='brawling') + span.text-center(name="attr_brawling") + span.display.text-center(name=`attr_brawling_damage_open`) +brawlDamageRollButton('brawling damage open', 'brawling') - - + .row.subheader.mt.flex-center + +accentSubheader('other') .repeating-container fieldset(class='repeating_attacks') .row.grid