From 5c74da883b7bd68ebfeb0823cff6ba22b94fb220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Fri, 15 Jan 2021 23:49:41 +0100 Subject: [PATCH 1/4] Make basic properties more responsive (grid draft) --- src/scss/components/_basic_property.scss | 3 ++- src/templates/item/spell-sheet.hbs | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/scss/components/_basic_property.scss b/src/scss/components/_basic_property.scss index 40978da4..e0871f85 100644 --- a/src/scss/components/_basic_property.scss +++ b/src/scss/components/_basic_property.scss @@ -1,6 +1,7 @@ .basic-properties { flex: 0 0 100%; - gap: 2px; + grid-gap: 2px; + grid-template-columns: repeat(auto-fill, minmax(10em, 1fr)); .basic-property { display: grid; align-content: end; diff --git a/src/templates/item/spell-sheet.hbs b/src/templates/item/spell-sheet.hbs index 5f2c7a28..039366f9 100644 --- a/src/templates/item/spell-sheet.hbs +++ b/src/templates/item/spell-sheet.hbs @@ -28,9 +28,9 @@
{{#> systems/ds4/templates/item/partials/sheet-header.hbs}} -
+
- + {{#select data.spellCategory}} {{#each config.spellCategories as |value key|}} From 319c40c4a7c4f513dc839fd0a9fee7352e1f1d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Sat, 16 Jan 2021 00:11:00 +0100 Subject: [PATCH 2/4] Make side properties a bit better readable. --- src/scss/components/_description.scss | 2 +- src/templates/item/spell-sheet.hbs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/scss/components/_description.scss b/src/scss/components/_description.scss index 767fb516..fc299a29 100644 --- a/src/scss/components/_description.scss +++ b/src/scss/components/_description.scss @@ -9,7 +9,7 @@ .side-property { margin: 2px 0; display: grid; - grid-template-columns: 40% auto; + grid-template-columns: minmax(40%, max-content) 1fr; justify-content: left; label { diff --git a/src/templates/item/spell-sheet.hbs b/src/templates/item/spell-sheet.hbs index 039366f9..4e180755 100644 --- a/src/templates/item/spell-sheet.hbs +++ b/src/templates/item/spell-sheet.hbs @@ -31,7 +31,7 @@
- {{#select data.spellType}} {{#each config.spellTypes as |value key|}} @@ -41,7 +41,7 @@
- +
{{/systems/ds4/templates/item/partials/sheet-header.hbs}} @@ -50,7 +50,7 @@ {{#> systems/ds4/templates/item/partials/body.hbs}}
- {{#select data.spellCategory}} {{#each config.spellCategories as |value key|}} @@ -65,7 +65,7 @@
+ name="data.scrollPrice" id="data.scrollPrice" value="{{data.scrollPrice}}" />
{{/systems/ds4/templates/item/partials/body.hbs}} From 25755385c00cc9ecc4b4d20fc4717d83613eb8c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Sat, 16 Jan 2021 15:16:40 +0100 Subject: [PATCH 3/4] Add accessibility. --- src/ds4.scss | 1 + .../components/_character_progression.scss | 2 +- src/scss/global/_accessibility.scss | 3 + src/templates/actor/actor-sheet.hbs | 58 ++++++++++++------- .../actor/partials/character-progression.hbs | 6 +- 5 files changed, 46 insertions(+), 24 deletions(-) create mode 100644 src/scss/global/_accessibility.scss diff --git a/src/ds4.scss b/src/ds4.scss index db46a09a..af018bb7 100644 --- a/src/ds4.scss +++ b/src/ds4.scss @@ -8,6 +8,7 @@ @import "scss/global/window"; @import "scss/global/grid"; @import "scss/global/flex"; +@import "scss/global/accessibility"; /* Styles limited to ds4 sheets */ .ds4 { diff --git a/src/scss/components/_character_progression.scss b/src/scss/components/_character_progression.scss index c2b3fdcd..b13927d9 100644 --- a/src/scss/components/_character_progression.scss +++ b/src/scss/components/_character_progression.scss @@ -11,7 +11,7 @@ font-family: $font-heading; display: block; height: 50px; - padding: 0px; + padding: 0; color: $c-light-grey; border: none; line-height: 50px; diff --git a/src/scss/global/_accessibility.scss b/src/scss/global/_accessibility.scss new file mode 100644 index 00000000..dd0e4211 --- /dev/null +++ b/src/scss/global/_accessibility.scss @@ -0,0 +1,3 @@ +.hidden { + display: none; +} diff --git a/src/templates/actor/actor-sheet.hbs b/src/templates/actor/actor-sheet.hbs index 6763e440..6a14a951 100644 --- a/src/templates/actor/actor-sheet.hbs +++ b/src/templates/actor/actor-sheet.hbs @@ -1,52 +1,68 @@ {{!-- Sheet Header --}}
- + Actor Icon
-

+

+ + +

{{> systems/ds4/templates/actor/partials/character-progression.hbs}}
- +
- +
+ for="data.progression.progressPoints.used">{{config.progression.progressPoints}}
- / - + + / + +
+ for="data.progression.talentPoints.used">{{config.progression.talentPoints}}
/ - + id="data.progression.talentPoints.used" + value="{{data.progression.talentPoints.used}}" data-dtype="Number" /> + / + +
- +
- + for="data.baseInfo.heroClass">{{config.baseInfo.heroClass}} +
@@ -84,4 +100,4 @@ {{editor content=data.biography target="data.biography" button=true owner=owner editable=editable}}
- \ No newline at end of file + diff --git a/src/templates/actor/partials/character-progression.hbs b/src/templates/actor/partials/character-progression.hbs index f22376f0..b5a2115e 100644 --- a/src/templates/actor/partials/character-progression.hbs +++ b/src/templates/actor/partials/character-progression.hbs @@ -2,14 +2,16 @@

- Progression Level +

- Experience Points +
From 66592a92d6cc80c90b3488c875837defca8bd0a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20R=C3=BCmpelein?= Date: Mon, 18 Jan 2021 20:51:08 +0100 Subject: [PATCH 4/4] Shrink header info. --- src/scss/components/_basic_property.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scss/components/_basic_property.scss b/src/scss/components/_basic_property.scss index e0871f85..56668373 100644 --- a/src/scss/components/_basic_property.scss +++ b/src/scss/components/_basic_property.scss @@ -1,7 +1,7 @@ .basic-properties { flex: 0 0 100%; grid-gap: 2px; - grid-template-columns: repeat(auto-fill, minmax(10em, 1fr)); + grid-template-columns: repeat(auto-fill, minmax(9em, 1fr)); .basic-property { display: grid; align-content: end;