From 2d3ec822edee013d1eb7fc58196e724ca1e25e99 Mon Sep 17 00:00:00 2001 From: Cassie Date: Wed, 24 Feb 2021 02:09:33 -0600 Subject: [PATCH] finish the sheets, needs js --- Pendragon5thEdition/pendragon.css | 67 +++++- Pendragon5thEdition/pendragon.html | 4 +- Pendragon5thEdition/pendragon.pug | 2 + Pendragon5thEdition/pendragon.scss | 4 + Pendragon5thEdition/src/js/scripts.js | 2 - Pendragon5thEdition/src/pug/pages/manor.pug | 135 ++++++++++++ .../src/pug/pages/manor/income.pug | 0 .../src/pug/pages/manor/land.pug | 0 .../src/pug/pages/manor/treasure.pug | 0 .../src/pug/pages/settings.pug | 2 +- .../src/scss/base/generic.scss | 8 + .../src/scss/base/globals.scss | 203 +++++++++--------- .../src/scss/layout/show_hide.scss | 4 +- Pendragon5thEdition/src/scss/pages/feast.scss | 76 +++---- Pendragon5thEdition/src/scss/pages/manor.scss | 54 +++++ Pendragon5thEdition/translation.json | 47 ++++ 16 files changed, 453 insertions(+), 155 deletions(-) create mode 100644 Pendragon5thEdition/src/pug/pages/manor.pug delete mode 100644 Pendragon5thEdition/src/pug/pages/manor/income.pug delete mode 100644 Pendragon5thEdition/src/pug/pages/manor/land.pug delete mode 100644 Pendragon5thEdition/src/pug/pages/manor/treasure.pug create mode 100644 Pendragon5thEdition/src/scss/pages/manor.scss diff --git a/Pendragon5thEdition/pendragon.css b/Pendragon5thEdition/pendragon.css index 5199e05f98..f1893108bd 100644 --- a/Pendragon5thEdition/pendragon.css +++ b/Pendragon5thEdition/pendragon.css @@ -39,7 +39,7 @@ fieldset { h1 { color: #226aae; text-transform: capitalize; - font-family: 'El Messiri', sans-serif; + font-family: "El Messiri", sans-serif; padding: 1% 2%; font-size: 1.9em; } @@ -55,8 +55,8 @@ h2 { margin-left: 3%; } h3 { - font-size: 1.25em; - line-height: 36px; + font-size: 0.9em; + line-height: 18px; text-transform: capitalize; } input[type="text"], input[type="number"] { @@ -72,7 +72,7 @@ input[type="text"], input[type="number"] { background-color: #fefcea; border: 0.1em dotted #226aae; } -input[type='number'] { +input[type="number"] { text-align: center; width: 100% !important; } @@ -121,7 +121,8 @@ div.sheet-grid { grid-column-gap: 1%; grid-row-gap: 0.5%; } -div.sheet-tabs div.sheet-col, div.sheet-npc div.sheet-row, div.sheet-character div.sheet-row, div.sheet-character div.sheet-col, div.sheet-entourage div.sheet-col, div.sheet-entourage div.sheet-row, div.sheet-holdings div.sheet-row, div.sheet-holdings div.sheet-col, div.sheet-feast-record div.sheet-row, div.sheet-feast-record div.sheet-col, +div.sheet-tabs div.sheet-col, div.sheet-npc div.sheet-row, div.sheet-character div.sheet-row, div.sheet-character div.sheet-col, div.sheet-entourage div.sheet-col, div.sheet-entourage div.sheet-row, div.sheet-holdings div.sheet-row, div.sheet-holdings div.sheet-col, div.sheet-feast-record div.sheet-row, +div.sheet-feast-record div.sheet-col, div.sheet-gamemaster-characters div.sheet-row, div.sheet-gamemaster-characters div.sheet-col { display: inline-grid; @@ -191,6 +192,9 @@ div.sheet-2autocolumn { div.sheet-3autocolumn { grid-template-columns: auto 1fr 10%; } +div.sheet-4autocolumn { + grid-template-columns: auto 1fr auto 1fr; } + div.sheet-col-3 { grid-template-columns: 1fr 3.5em 10%; } @@ -217,6 +221,9 @@ span.sheet-display { div.sheet-repeating-container button { font-variant: none; } +.sheet-mt { + margin-top: 2%; } + /* STYLED CHECKBOXES ============================= */ label.sheet-styled-checkbox { @@ -476,6 +483,48 @@ div.sheet-gamemaster-characters div.sheet-sub-header { div.sheet-gamemaster-characters div.sheet-repeating-row { padding-bottom: 1%; } +/* MANORS + ============================= */ +div.sheet-treasure-record .repitem, +div.sheet-income-worksheet .repitem, +div.sheet-land-record .repitem { + margin-bottom: 2%; } + +div.sheet-treasure-record h2, +div.sheet-income-worksheet h2, +div.sheet-land-record h2 { + justify-content: center; } + +div.sheet-treasure-record input[type="text"], +div.sheet-income-worksheet input[type="text"], +div.sheet-land-record input[type="text"] { + text-align: center; } + +div.sheet-treasure-record div.sheet-sub-header, +div.sheet-treasure-record div.sheet-repeating-container div.sheet-grid { + grid-template-columns: 5em 10em 1fr 10em 5em; + grid-row-gap: 2%; } + +div.sheet-income-worksheet div.sheet-sub-header, +div.sheet-income-worksheet div.sheet-repeating-container div.sheet-grid-rows { + grid-template-columns: 5em 3fr 4fr 2fr 3fr; + grid-row-gap: 2%; } + +div.sheet-income-worksheet div.sheet-group { + border-left: 2px solid black; + padding: 0px 5px; } + +div.sheet-income-worksheet div.sheet-total { + background-color: rgba(77, 77, 77, 0.0784314); + min-height: 25px; + width: 100%; } + +div.sheet-land-record div.sheet-headers { + grid-template-columns: 2fr 3fr 1fr; } + +div.sheet-land-record div.sheet-repeating-container div.sheet-first-row { + grid-template-columns: auto 5em auto 1fr auto 5em auto 5em; } + /* SETTINGS ============================= */ div.sheet-settings h1 { @@ -505,8 +554,10 @@ input[name="attr_settings_toggle"][value="settings"] ~ div.sheet-holdings, input input[name="attr_settings_toggle"][value="settings"] ~ div.sheet-feast-record, input[name="attr_sheet_type"]:not([value="gamemaster characters"]) ~ div.sheet-gamemaster-characters, input[name="attr_settings_toggle"][value="settings"] ~ div.sheet-gamemaster-characters, input[name="attr_sheet_type"]:not([value="npc"]) ~ div.sheet-npc, input[name="attr_settings_toggle"][value="settings"] ~ div.sheet-npc, input[name="attr_sheet_type"]:not([value="entourage"]) ~ div.sheet-entourage, -input[name="attr_settings_toggle"][value="settings"] ~ div.sheet-entourage, input[name="attr_sheet_type"]:not([value="manor"]) ~ div.sheet-manor, -input[name="attr_settings_toggle"][value="settings"] ~ div.sheet-manor, input[name='attr_sheet_type'][value='character'] ~ div.sheet-tabs div.sheet-type label.sheet-feast, input[name='attr_sheet_type'][value='character'] ~ div.sheet-tabs div.sheet-type label.sheet-manor, input[name='attr_sheet_type'][value='holdings'] ~ div.sheet-tabs div.sheet-type label.sheet-feast, input[name='attr_sheet_type'][value='holdings'] ~ div.sheet-tabs div.sheet-type label.sheet-manor, input[name='attr_sheet_type'][value='entourage'] ~ div.sheet-tabs div.sheet-type label.sheet-feast, input[name='attr_sheet_type'][value='entourage'] ~ div.sheet-tabs div.sheet-type label.sheet-manor, input[name='attr_sheet_type'][value='feast record'] ~ div.sheet-tabs div.sheet-type label.sheet-character, input[name='attr_sheet_type'][value='feast record'] ~ div.sheet-tabs div.sheet-type label.sheet-manor, input[name='attr_sheet_type'][value='gamemaster characters'] ~ div.sheet-tabs div.sheet-type label.sheet-character, input[name='attr_sheet_type'][value='gamemaster characters'] ~ div.sheet-tabs div.sheet-type label.sheet-manor, input[name='attr_sheet_type'][value='treasure record'] ~ div.sheet-tabs div.sheet-type label.sheet-character, input[name='attr_sheet_type'][value='treasure record'] ~ div.sheet-tabs div.sheet-type label.sheet-feast, input[name='attr_sheet_type'][value='income worksheet'] ~ div.sheet-tabs div.sheet-type label.sheet-character, input[name='attr_sheet_type'][value='income worksheet'] ~ div.sheet-tabs div.sheet-type label.sheet-feast, input[name='attr_sheet_type'][value='land record'] ~ div.sheet-tabs div.sheet-type label.sheet-character, input[name='attr_sheet_type'][value='land record'] ~ div.sheet-tabs div.sheet-type label.sheet-feast, input[name="attr_sheet_type"][value="feast"] ~ div.sheet-tabs select[name="attr_character_type"], input[name="attr_character_type"]:not([value="knight"]) ~ div.sheet-character div.sheet-col div.sheet-row .sheet-knight, +input[name="attr_settings_toggle"][value="settings"] ~ div.sheet-entourage, input[name="attr_sheet_type"]:not([value="treasure record"]) ~ div.sheet-treasure-record, +input[name="attr_settings_toggle"][value="settings"] ~ div.sheet-treasure-record, input[name="attr_sheet_type"]:not([value="income worksheet"]) ~ div.sheet-income-worksheet, +input[name="attr_settings_toggle"][value="settings"] ~ div.sheet-income-worksheet, input[name="attr_sheet_type"]:not([value="land record"]) ~ div.sheet-land-record, +input[name="attr_settings_toggle"][value="settings"] ~ div.sheet-land-record, input[name='attr_sheet_type'][value='character'] ~ div.sheet-tabs div.sheet-type label.sheet-feast, input[name='attr_sheet_type'][value='character'] ~ div.sheet-tabs div.sheet-type label.sheet-manor, input[name='attr_sheet_type'][value='holdings'] ~ div.sheet-tabs div.sheet-type label.sheet-feast, input[name='attr_sheet_type'][value='holdings'] ~ div.sheet-tabs div.sheet-type label.sheet-manor, input[name='attr_sheet_type'][value='entourage'] ~ div.sheet-tabs div.sheet-type label.sheet-feast, input[name='attr_sheet_type'][value='entourage'] ~ div.sheet-tabs div.sheet-type label.sheet-manor, input[name='attr_sheet_type'][value='feast record'] ~ div.sheet-tabs div.sheet-type label.sheet-character, input[name='attr_sheet_type'][value='feast record'] ~ div.sheet-tabs div.sheet-type label.sheet-manor, input[name='attr_sheet_type'][value='gamemaster characters'] ~ div.sheet-tabs div.sheet-type label.sheet-character, input[name='attr_sheet_type'][value='gamemaster characters'] ~ div.sheet-tabs div.sheet-type label.sheet-manor, input[name='attr_sheet_type'][value='treasure record'] ~ div.sheet-tabs div.sheet-type label.sheet-character, input[name='attr_sheet_type'][value='treasure record'] ~ div.sheet-tabs div.sheet-type label.sheet-feast, input[name='attr_sheet_type'][value='income worksheet'] ~ div.sheet-tabs div.sheet-type label.sheet-character, input[name='attr_sheet_type'][value='income worksheet'] ~ div.sheet-tabs div.sheet-type label.sheet-feast, input[name='attr_sheet_type'][value='land record'] ~ div.sheet-tabs div.sheet-type label.sheet-character, input[name='attr_sheet_type'][value='land record'] ~ div.sheet-tabs div.sheet-type label.sheet-feast, input[name="attr_sheet_type"][value="feast"] ~ div.sheet-tabs select[name="attr_character_type"], input[name="attr_character_type"]:not([value="knight"]) ~ div.sheet-character div.sheet-col div.sheet-row .sheet-knight, input[name="attr_character_type"]:not([value="knight"]) ~ div.sheet-character div.sheet-col div.sheet-personal-data div.sheet-row .sheet-knight, input[name="attr_character_type"]:not([value="knight"]) ~ div.sheet-character div.sheet-col div.sheet-personality-traits .sheet-knight, input[name="attr_character_type"]:not([value="knight"]) ~ div.sheet-character div.sheet-col div.sheet-personality-traits div.sheet-row .sheet-knight, @@ -579,7 +630,7 @@ input[name="attr_character_type"]:not([value="woman"]) ~ div.sheet-entourage div input[name="attr_character_type"]:not([value="woman"]) ~ div.sheet-entourage div.sheet-row div.sheet-col .sheet-woman, input[name="attr_settings_toggle"]:not([value="settings"]) ~ div.sheet-settings { display: none; } -div.sheet-character, div.sheet-holdings, div.sheet-feast-record, div.sheet-gamemaster-characters, div.sheet-npc, div.sheet-entourage, div.sheet-manor, div.sheet-settings { +div.sheet-character, div.sheet-holdings, div.sheet-feast-record, div.sheet-gamemaster-characters, div.sheet-npc, div.sheet-entourage, div.sheet-treasure-record, div.sheet-income-worksheet, div.sheet-land-record, div.sheet-settings { display: inline-grid; } input[name="attr_sheet_type"][value="character"] ~ div.sheet-tabs div.sheet-type { diff --git a/Pendragon5thEdition/pendragon.html b/Pendragon5thEdition/pendragon.html index cf0ea7f20e..bb9cd47ca9 100644 --- a/Pendragon5thEdition/pendragon.html +++ b/Pendragon5thEdition/pendragon.html @@ -1,4 +1,4 @@ -

King Arthur Pendragon Knight's Character SheetKing Arthur Pendragon Woman's Character Sheet

*
/
**
/
/
*
/
*
/
*
/
*
/
**
/
*
/
/
*
/
/
*
/

King Arthur Pendragon Knight's Character SheetKing Arthur Pendragon Woman's Character Sheet

King Arthur Pendragon

King Arthur Pendragon

{{#header}}{{header}}{{/header}}
{{#dice}}
{{dice}} Rolled
{{/dice}} +

King Arthur Pendragon Knight's Character SheetKing Arthur Pendragon Woman's Character Sheet

*
/
**
/
/
*
/
*
/
*
/
*
/
**
/
*
/
/
*
/
/
*
/

King Arthur Pendragon Knight's Character SheetKing Arthur Pendragon Woman's Character Sheet

King Arthur Pendragon

King Arthur Pendragon

King Arthur Pendragon

King Arthur Pendragon

King Arthur Pendragon

{{#header}}{{header}}{{/header}}
{{#dice}}
{{dice}} Rolled
{{/dice}} {{#threshold}}
{{threshold}} Threshold
{{/threshold}} {{#damage}}
{{damage}} Rolled
{{/damage}}
{{#desc}}
{{desc}}
{{/desc}}
{{#rollGreater() threshold 19}} {{#rollGreater() dice 19}}
{{/rollGreater() dice 19}} @@ -26,8 +26,6 @@ const sheetSelect = eventinfo => { const newValue = eventinfo.newValue; let update = {} - console.log(newValue) - update.sheet_type = newValue === 'knight' || newValue === 'woman' ? 'character' : newValue; update.character_type = newValue === 'woman' ? 'woman' : 'knight'; diff --git a/Pendragon5thEdition/pendragon.pug b/Pendragon5thEdition/pendragon.pug index 3683d5dbcf..d9462e7091 100644 --- a/Pendragon5thEdition/pendragon.pug +++ b/Pendragon5thEdition/pendragon.pug @@ -49,6 +49,8 @@ include src/pug/pages/holdings.pug include src/pug/pages/feast.pug +include src/pug/pages/manor.pug + include src/pug/pages/settings.pug //-FOOTER diff --git a/Pendragon5thEdition/pendragon.scss b/Pendragon5thEdition/pendragon.scss index 3ea7def7c6..fa42874ec8 100644 --- a/Pendragon5thEdition/pendragon.scss +++ b/Pendragon5thEdition/pendragon.scss @@ -69,6 +69,10 @@ div.sheet-grid { ============================= */ @import "./src/scss/pages/feast.scss"; +/* MANORS + ============================= */ +@import "./src/scss/pages/manor.scss"; + /* SETTINGS ============================= */ @import "./src/scss/pages/settings"; diff --git a/Pendragon5thEdition/src/js/scripts.js b/Pendragon5thEdition/src/js/scripts.js index 98700df068..7d12352a74 100644 --- a/Pendragon5thEdition/src/js/scripts.js +++ b/Pendragon5thEdition/src/js/scripts.js @@ -11,8 +11,6 @@ const sheetSelect = eventinfo => { const newValue = eventinfo.newValue; let update = {} - console.log(newValue) - update.sheet_type = newValue === 'knight' || newValue === 'woman' ? 'character' : newValue; update.character_type = newValue === 'woman' ? 'woman' : 'knight'; diff --git a/Pendragon5thEdition/src/pug/pages/manor.pug b/Pendragon5thEdition/src/pug/pages/manor.pug new file mode 100644 index 0000000000..8993bf547a --- /dev/null +++ b/Pendragon5thEdition/src/pug/pages/manor.pug @@ -0,0 +1,135 @@ +.treasure-record.grid + .grid.2column + .col + .row + img(alt='King Arthur Pendragon' src='https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Pendragon5thEdition/src/pendragonlogo.jpg') + .row.header + h1.header(data-i18n='treasure record') + .col + each val in ['knight name', 'treasure location', 'security', 'other location', 'best clothing'] + .grid.2autocolumn + h2(data-i18n=val) + +textInput(`${val}`) + .grid.sub-header.bottom-border + each val in ['date', 'source/expense', 'form of treasure', 'amount/worth', 'total'] + h2.eclipse(data-i18n=val) + .repeating-container + fieldset(class=`repeating_treasure-record`) + .grid + each val in ['date', 'source expense', 'form of treasure', 'amount worth', 'total'] + .col + +textInput(val) + +.income-worksheet.grid + .grid.2column + .col + .row + img(alt='King Arthur Pendragon' src='https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Pendragon5thEdition/src/pendragonlogo.jpg') + .col + .row.header + h1.header(data-i18n='manor income worksheet') + .row.sub-header + h2(data-i18n='for the complete landholding system') + .grid.sub-header.bottom-border + .col + h2.eclipse(data-i18n='a.d.') + each val in ['revenue', 'fortune', 'harvest', 'tally'] + .col + h2.eclipse(data-i18n=val) + + .repeating-container + fieldset(class=`repeating_income-worksheet`) + .grid.grid-rows + .col + .row.text-center + h3.eclipse(data-i18n='date') + .row + +textInput('date') + .col.group + .row.text-center + h3.eclipse(data-i18n='anticipated income') + .row.total.text-center + span(name='attr_anticipated_income') + each val in ['normal income', 'investment income'] + .grid.2autocolumn + h3.eclipse(data-i18n=val) + +textInput(val) + .col.group + .row.text-center + h3.eclipse(data-i18n='misfortune') + .row.total.text-center + span(name='attr_misfortune') + .grid.2autocolumn + h3.eclipse(data-i18n='manorial luck') + +textInput('manorial luck') + .grid.4autocolumn + each val in ['fate', 'core'] + h3.eclipse(data-i18n=val) + +textInput(val) + .col.group + .row.text-center + h3.eclipse(data-i18n='manor income') + .row.total.text-center + span(name='attr_manor_income') + .grid + .row + h3.eclipse(data-i18n='harvest result') + .row + select(name="attr_harvest_result") + each val, key in { 'incredible': 2.5, 'excellent': 2, 'good': 1.5, 'regular': 1, 'bad': 0.5, 'very bad': 0.25, 'negligible': 0.17} + option(data-i18n=key value=val) + .col.group + .row.text-center + h3.eclipse(data-i18n='treasury') + .row.total.text-center + span(name='attr_treasury') + each val in ['emergency income', 'expenses'] + .grid.2autocolumn + h3.eclipse(data-i18n=val) + +textInput(val) + +.land-record + .grid.headers + .col + .row + img(alt='King Arthur Pendragon' src='https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/Pendragon5thEdition/src/pendragonlogo.jpg') + .row.header + h1.header(data-i18n='land record') + .col + each val in ['manor name', 'held by', 'liege lord', 'location'] + .grid.2autocolumn + h2(data-i18n=val) + +textInput(`${val}`) + .grid.4autocolumn + each val in ['annual glory', 'fortification (DV)'] + h2(data-i18n=val) + +textInput(`${val}`) + .col + h2.text-uppercase(data-i18n='hate (landlord)') + +numberInput(`hate landlord`) + each val in ['manor description', 'manor summary'] + .grid.2autocolumn + h3(data-i18n=val) + +textInput(`${val}`) + .row.mt + h2(data-i18n='manor improvements') + .repeating-container + fieldset(class=`repeating_land-record`) + .grid.first-row + each val in ['date', 'feature', 'building cost', 'hate (landlord)'] + h3(data-i18n=val) + +textInput(val) + .grid.3column + each val in ['annual income', 'annual maintenance', 'annual glory'] + .grid.2autocolumn + h3(data-i18n=val) + +textInput(val) + .grid.2autocolumn + h3(data-i18n='notes') + +textInput('notes') + + + + + + \ No newline at end of file diff --git a/Pendragon5thEdition/src/pug/pages/manor/income.pug b/Pendragon5thEdition/src/pug/pages/manor/income.pug deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Pendragon5thEdition/src/pug/pages/manor/land.pug b/Pendragon5thEdition/src/pug/pages/manor/land.pug deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Pendragon5thEdition/src/pug/pages/manor/treasure.pug b/Pendragon5thEdition/src/pug/pages/manor/treasure.pug deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Pendragon5thEdition/src/pug/pages/settings.pug b/Pendragon5thEdition/src/pug/pages/settings.pug index 75eabd247e..b1194be061 100644 --- a/Pendragon5thEdition/src/pug/pages/settings.pug +++ b/Pendragon5thEdition/src/pug/pages/settings.pug @@ -5,5 +5,5 @@ option(data-i18n='knight' value='knight' selected) option(data-i18n='woman' value='woman') option(data-i18n='feast' value='feast record') - option(data-i18n='manor' value='treasure record') + option(data-i18n='manor' value='land record') option(data-i18n='npc' value='npc') diff --git a/Pendragon5thEdition/src/scss/base/generic.scss b/Pendragon5thEdition/src/scss/base/generic.scss index 673171b5cf..2bef44775e 100644 --- a/Pendragon5thEdition/src/scss/base/generic.scss +++ b/Pendragon5thEdition/src/scss/base/generic.scss @@ -78,6 +78,10 @@ div.sheet-3autocolumn { grid-template-columns: auto 1fr 10%; } +div.sheet-4autocolumn { + grid-template-columns: auto 1fr auto 1fr; +} + div.sheet-col-3 { grid-template-columns: 1fr 3.5em 10%; } @@ -111,3 +115,7 @@ div.sheet-repeating-container { font-variant: none; } } + +.sheet-mt { + margin-top: 2%; +} diff --git a/Pendragon5thEdition/src/scss/base/globals.scss b/Pendragon5thEdition/src/scss/base/globals.scss index 19ca5c5692..70fd022e4e 100644 --- a/Pendragon5thEdition/src/scss/base/globals.scss +++ b/Pendragon5thEdition/src/scss/base/globals.scss @@ -1,147 +1,146 @@ - * { - box-sizing: border-box; - font-family: sans-serif; + box-sizing: border-box; + font-family: sans-serif; } button { - text-overflow: ellipsis; - font-family: serif; - font-variant: small-caps; + text-overflow: ellipsis; + font-family: serif; + font-variant: small-caps; - &:before { - display: none; - } - &:focus, - &:hover, - &:active { - background: none; - background-color: $primary !important; - color: #fff; - } - &[type="roll"], - &[type="action"] { - background-color: $white; - border: { - bottom : 0.01em solid #666; - bottom-right-radius: 0.01em; - color : hsl(0, 0%, 70%); - radius : 0.25em; - right : 0.02em solid hsl(0, 0%, 20%); - style : outset; - } - margin: 0.2em !important; - padding: 0.1em !important; - box-shadow: $box-shadow; + &:before { + display: none; + } + &:focus, + &:hover, + &:active { + background: none; + background-color: $primary !important; + color: #fff; + } + &[type="roll"], + &[type="action"] { + background-color: $white; + border: { + bottom: 0.01em solid #666; + bottom-right-radius: 0.01em; + color: hsl(0, 0%, 70%); + radius: 0.25em; + right: 0.02em solid hsl(0, 0%, 20%); + style: outset; } + margin: 0.2em !important; + padding: 0.1em !important; + box-shadow: $box-shadow; + } } div { - background-color: transparent; - width: 100%; + background-color: transparent; + width: 100%; } fieldset { - background-color: transparent; + background-color: transparent; } h1 { - color: $primary; - text-transform: capitalize; - font-family: 'El Messiri', sans-serif; - padding: 1% 2%; - font-size: 1.9em; + color: $primary; + text-transform: capitalize; + font-family: "El Messiri", sans-serif; + padding: 1% 2%; + font-size: 1.9em; } h2 { - font-size: 1em; - line-height: 1.4em; - text-transform: capitalize; - display: flex; - align-items: center; + font-size: 1em; + line-height: 1.4em; + text-transform: capitalize; + display: flex; + align-items: center; - &.sheet-label { - border-bottom: 0.15em solid $dark; - text-align: center; - margin-left: 3%; - } + &.sheet-label { + border-bottom: 0.15em solid $dark; + text-align: center; + margin-left: 3%; + } } h3 { - font-size: 1.25em; - line-height: 36px; - text-transform: capitalize; + font-size: 0.9em; + line-height: 18px; + text-transform: capitalize; } input { - &[type="text"], - &[type="number"] { - background-color: transparent; - border-bottom: 0.15em solid $dark; + &[type="text"], + &[type="number"] { + background-color: transparent; + border-bottom: 0.15em solid $dark; - border: { - left : 0em; - radius: 0em; - right : 0em; - top : 0em; - }; - height : 2.1em; - width: 100%; + border: { + left: 0em; + radius: 0em; + right: 0em; + top: 0em; + } + height: 2.1em; + width: 100%; - &::placeholder { - background-color: $light; - border: 0.1em dotted $primary; - } - } - &[type='number'] { - text-align: center; - width: 100% !important; + &::placeholder { + background-color: $light; + border: 0.1em dotted $primary; } + } + &[type="number"] { + text-align: center; + width: 100% !important; + } - &::-webkit-outer-spin-button, - &::-webkit-inner-spin-button { - margin: 0; - } + &::-webkit-outer-spin-button, + &::-webkit-inner-spin-button { + margin: 0; + } } label { - margin-bottom: 0px; - padding-right: 0px; - vertical-align: middle; + margin-bottom: 0px; + padding-right: 0px; + vertical-align: middle; } select { - margin-bottom: 0px; - vertical-align: bottom; - border: 2px solid $primary; - font-weight: bold; - text-transform: capitalize; - width: 100%; + margin-bottom: 0px; + vertical-align: bottom; + border: 2px solid $primary; + font-weight: bold; + text-transform: capitalize; + width: 100%; } span { - word-break: break-word; + word-break: break-word; } textarea { - text-align: left; - border-bottom : 0.2em dotted $light; - font-size : 12px; - font-weight : normal; - min-height : 50px; - line-height : 18px; - overflow : hidden; - overflow-wrap : break-word; - padding : 2px; - resize : vertical; - vertical-align: top; - overflow: scroll; + text-align: left; + border-bottom: 0.2em dotted $light; + font-size: 12px; + font-weight: normal; + min-height: 50px; + line-height: 18px; + overflow: hidden; + overflow-wrap: break-word; + padding: 2px; + resize: vertical; + vertical-align: top; + overflow: scroll; } .charsheet { - width: 800px; + width: 800px; - div.sheet-row { - margin-bottom: 0px; - } -} \ No newline at end of file + div.sheet-row { + margin-bottom: 0px; + } +} diff --git a/Pendragon5thEdition/src/scss/layout/show_hide.scss b/Pendragon5thEdition/src/scss/layout/show_hide.scss index 40ef740df6..60f9352b15 100644 --- a/Pendragon5thEdition/src/scss/layout/show_hide.scss +++ b/Pendragon5thEdition/src/scss/layout/show_hide.scss @@ -12,7 +12,9 @@ $sheets: ( "gamemaster-characters": "gamemaster characters", "npc": "npc", "entourage": "entourage", - "manor": "manor", + "treasure-record": "treasure record", + "income-worksheet": "income worksheet", + "land-record": "land record", ); $characterSheets: "character", "holdings", "entourage"; diff --git a/Pendragon5thEdition/src/scss/pages/feast.scss b/Pendragon5thEdition/src/scss/pages/feast.scss index 6fa2913035..d460e85fa7 100644 --- a/Pendragon5thEdition/src/scss/pages/feast.scss +++ b/Pendragon5thEdition/src/scss/pages/feast.scss @@ -2,58 +2,58 @@ div.sheet-feast-record, div.sheet-gamemaster-characters { min-height: 800px; - div.sheet-row, div.sheet-col { - @extend %gridRowCol + div.sheet-row, + div.sheet-col { + @extend %gridRowCol; } } div.sheet-feast-record { - grid-row-gap: 0; - - div.sheet-sub-header, - div.sheet-repeating-container div.sheet-row { - grid-template-columns: 1fr 5em 5em 60%; - grid-row-gap: 2%; - } + grid-row-gap: 0; - div.sheet-6column { - grid-column-gap: 5%; + div.sheet-sub-header, + div.sheet-repeating-container div.sheet-row { + grid-template-columns: 1fr 5em 5em 60%; + grid-row-gap: 2%; + } - h3 { - font-size: 1em; - } - } + div.sheet-6column { + grid-column-gap: 5%; - div.sheet-sub-header { - div.sheet-table { - grid-column: 1 / 4; - } + h3 { + font-size: 1em; } + } - div.sheet-sub-header:nth-of-type(even) { - background-color: $light; + div.sheet-sub-header { + div.sheet-table { + grid-column: 1 / 4; } + } + + div.sheet-sub-header:nth-of-type(even) { + background-color: $light; + } } div.sheet-gamemaster-characters { - div.sheet-sub-header, - div.sheet-repeating-row { - grid-template-columns: 2fr repeat(8, 1fr); - grid-row-gap: 5%; - } + div.sheet-sub-header, + div.sheet-repeating-row { + grid-template-columns: 2fr repeat(8, 1fr); + grid-row-gap: 5%; + } - div.sheet-bottom-border, - div.sheet-3column, - div.sheet-notes { - margin-top: 2%; - } + div.sheet-bottom-border, + div.sheet-3column, + div.sheet-notes { + margin-top: 2%; + } - div.sheet-sub-header { - margin-top: 1%; - } + div.sheet-sub-header { + margin-top: 1%; + } - div.sheet-repeating-row { - padding-bottom: 1%; - } + div.sheet-repeating-row { + padding-bottom: 1%; + } } - diff --git a/Pendragon5thEdition/src/scss/pages/manor.scss b/Pendragon5thEdition/src/scss/pages/manor.scss new file mode 100644 index 0000000000..a244641807 --- /dev/null +++ b/Pendragon5thEdition/src/scss/pages/manor.scss @@ -0,0 +1,54 @@ +div.sheet-treasure-record, +div.sheet-income-worksheet, +div.sheet-land-record { + .repitem { + margin-bottom: 2%; + } + + h2 { + justify-content: center; + } + + input[type="text"] { + text-align: center; + } +} + +div.sheet-treasure-record { + div.sheet-sub-header, + div.sheet-repeating-container div.sheet-grid { + grid-template-columns: 5em 10em 1fr 10em 5em; + grid-row-gap: 2%; + } +} + +div.sheet-income-worksheet { + div.sheet-sub-header, + div.sheet-repeating-container div.sheet-grid-rows { + grid-template-columns: 5em 3fr 4fr 2fr 3fr; + grid-row-gap: 2%; + } + + div.sheet-group { + border-left: 2px solid black; + padding: 0px 5px; + } + + div.sheet-total { + background-color: $transparentGray; + min-height: 25px; + width: 100%; + } +} + +div.sheet-land-record { + div.sheet-headers { + grid-template-columns: 2fr 3fr 1fr; + } + + div.sheet-repeating-container { + div.sheet-first-row { + grid-template-columns: auto 5em auto 1fr auto 5em auto 5em; + } + } +} diff --git a/Pendragon5thEdition/translation.json b/Pendragon5thEdition/translation.json index 21932c511a..81ea5bc590 100644 --- a/Pendragon5thEdition/translation.json +++ b/Pendragon5thEdition/translation.json @@ -331,4 +331,51 @@ ,"treasure record": "treasure record" ,"income worksheet": "income worksheet" ,"land record": "land record" + ,"knight name":"knight name" + ,"treasure location":"treasure location" + ,"security":"security" + ,"other location":"other location" + ,"best clothing":"best clothing" + ,"source/expense":"source/expense" + ,"form of treasure":"form of treasure" + ,"amount/worth":"amount/worth" + ,"manor income worksheet":"manor income worksheet" + ,"for the complete landholding system":"for the complete landholding system" + ,"a.d.":"a.d." + ,"revenue":"revenue" + ,"fortune":"fortune" + ,"harvest":"harvest" + ,"tally":"tally" + ,"normal income":"normal income" + ,"investment income":"investment income" + ,"anticipated income":"anticipated income £" + ,"manorial luck":"manorial luck" + ,"fate":"fate" + ,"core":"core" + ,"misfortune":"misfortune" + ,"harvest result":"harvest result" + ,"manor income":"manor income £" + ,"emergency income":"emergency income" + ,"expenses":"expenses" + ,"treasury":"treasury £" + ,"incredible":"incredible" + ,"excellent":"excellent" + ,"good":"good" + ,"regular":"regular" + ,"bad":"bad" + ,"very bad":"very bad" + ,"negligible":"negligible" + ,"hate (landlord)":"hate (landlord)" + ,"manor name":"manor name" + ,"held by":"held by" + ,"liege lord":"liege lord" + ,"annual glory":"annual glory" + ,"fortification (DV)":"fortification (DV)" + ,"manor description":"manor description" + ,"manor summary":"manor summary" + ,"manor improvements":"manor improvements" + ,"feature":"feature" + ,"building cost":"building cost" + ,"annual income":"annual income" + ,"annual maintenance": "annual maintenance" } \ No newline at end of file