uberwald/l5rx-chiaroscuro
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-character-sheet-header' into 'dev'

Browse Source 
Fix character sheet header

See merge request teaml5r/l5r5e!27
This commit is contained in:
Vlyan
2023-05-04 14:02:04 +00:00
parent 723e7cd934 69e08b6a33
commit 503e4e365f
4 changed files with 55 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/styles/l5r5e.css
View File

File diff suppressed because one or more lines are too long

21
system/styles/scss/sheets.scss
View File

@@ -23,7 +23,6 @@
} }
&.actor { &.actor {
.sheet-header { .sheet-header {
height: 26rem;
h1 { h1 {
flex: auto; flex: auto;
margin: 0 0 0.25rem 0.5rem; margin: 0 0 0.25rem 0.5rem;
@@ -158,13 +157,9 @@
} }
} }
.header-fields { .header-fields {
position: relative;
flex: 0 0 100%;
h2 { h2 {
font-family: $font-secondary; font-family: $font-secondary;
font-size: 1rem; font-size: 1rem;
float: left;
width: 30%;
padding: 0.25rem 0.25rem 0; padding: 0.25rem 0.25rem 0;
margin: 1rem 20% 0 0; margin: 1rem 20% 0 0;
text-align: center; text-align: center;
@@ -265,18 +260,22 @@
} }
} }
} }
.rings { .mid-wrapper {
float: left; display: flex;
}
.side-col {
width: 30%;
}
.central-col {
width: 40%; width: 40%;
}
.rings {
padding: 0; padding: 0;
position: relative; margin-top: 1rem;
top: -1.5rem;
} }
.social-content, .social-content,
.attributes-wrapper { .attributes-wrapper {
flex: none; flex: none;
float: left;
width: 30%;
flex-wrap: wrap; flex-wrap: wrap;
display: flex; display: flex;
padding: 0.5rem 0 0 0.25rem; padding: 0.5rem 0 0 0.25rem;

33
system/templates/actors/character-sheet.html
View File

@@ -7,27 +7,32 @@
</div> </div>
{{!-- Sheet Header --}} {{!-- Sheet Header --}}
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img dragndrop-actor-uuid pointer" src="{{data.img}}" {{#if data.editable_not_soft_locked}}data-edit="img"{{/if}} data-actor-uuid="{{actor.uuid}}" draggable="true" title="{{data.name}}" /> <img class="profile-img dragndrop-actor-uuid pointer" src="{{data.img}}" {{#if
data.editable_not_soft_locked}}data-edit="img" {{/if}} data-actor-uuid="{{actor.uuid}}" draggable="true"
title="{{data.name}}" />
<div class="header-fields identity-wrapper"> <div class="header-fields identity-wrapper">
<h1 class="charname"> <h1 class="charname">
<input name="name" type="text" value="{{data.name}}" placeholder="Name" {{^if data.editable_not_soft_locked}}disabled{{/if}}/> <input name="name" type="text" value="{{data.name}}" placeholder="Name" {{^if
data.editable_not_soft_locked}}disabled{{/if}} />
</h1> </h1>
{{> 'systems/l5r5e/templates/actors/character/identity.html'}} {{> 'systems/l5r5e/templates/actors/character/identity.html'}}
</div> </div>
<div class="header-fields"> <div class="header-fields mid-wrapper">
<h2>{{localize 'l5r5e.social.title'}}</h2> <div class="side-col">
<h2 class="right">{{localize 'l5r5e.attributes.title'}}</h2> <h2>{{localize 'l5r5e.social.title'}}</h2>
{{> 'systems/l5r5e/templates/actors/character/social.html'}} {{> 'systems/l5r5e/templates/actors/character/social.html'}}
{{> 'systems/l5r5e/templates/actors/character/rings.html'}} </div>
{{> 'systems/l5r5e/templates/actors/character/attributes.html'}} <div class="central-col">{{> 'systems/l5r5e/templates/actors/character/rings.html'}}</div>
<div class="side-col">
<h2 class="right">{{localize 'l5r5e.attributes.title'}}</h2>
{{> 'systems/l5r5e/templates/actors/character/attributes.html'}}
</div>
</div> </div>
</header> </header>
{{!-- Sheet Body --}} {{!-- Sheet Body --}}
<section class="sheet-body"> <section class="sheet-body">
{{!-- Active effects --}} {{!-- Active effects --}} {{> 'systems/l5r5e/templates/actors/character/effects.html'}} {{!-- Sheet Tab
{{> 'systems/l5r5e/templates/actors/character/effects.html'}} Navigation --}}
{{!-- Sheet Tab Navigation --}}
<nav class="sheet-tabs tabs" data-group="primary"> <nav class="sheet-tabs tabs" data-group="primary">
<a class="item" data-tab="skills">{{localize 'l5r5e.skills.title'}}</a> <a class="item" data-tab="skills">{{localize 'l5r5e.skills.title'}}</a>
<a class="item" data-tab="narrative">{{localize 'l5r5e.sheets.narrative'}}</a> <a class="item" data-tab="narrative">{{localize 'l5r5e.sheets.narrative'}}</a>
@@ -39,8 +44,8 @@
{{!-- Skills Tab --}} {{!-- Skills Tab --}}
<article class="tab skills" data-group="primary" data-tab="skills"> <article class="tab skills" data-group="primary" data-tab="skills">
<ul class="skills-wrapper"> <ul class="skills-wrapper">
{{#each data.system.skills as |category id|}} {{#each data.system.skills as |category id|}} {{>
{{> 'systems/l5r5e/templates/actors/character/category.html' category=category categoryId=id data=../data}} 'systems/l5r5e/templates/actors/character/category.html' category=category categoryId=id data=../data}}
{{/each}} {{/each}}
</ul> </ul>
{{> 'systems/l5r5e/templates/actors/character/techniques.html'}} {{> 'systems/l5r5e/templates/actors/character/techniques.html'}}

44
system/templates/actors/npc-sheet.html
View File

@@ -1,34 +1,38 @@
<form class="{{cssClass}}" data-lang="{{localize 'I18N.Language'}}" autocomplete="off"> <form class="{{cssClass}}" data-lang="{{localize 'I18N.Language'}}" autocomplete="off">
{{!-- L5R Button bar --}} {{!-- L5R Button bar --}}
<div class="l5r-buttons-bar"> <div class="l5r-buttons-bar">
{{#each l5rHeaderButtons}} {{#each l5rHeaderButtons}}
<a class="l5r-header-button {{this.class}}"><i class="{{this.icon}}"></i>{{localize this.label}}</a> <a class="l5r-header-button {{this.class}}"><i class="{{this.icon}}"></i>{{localize this.label}}</a>
{{/each}} {{/each}}
</div> </div>
{{!-- Sheet Header --}} {{!-- Sheet Header --}}
<header class="sheet-header"> <header class="sheet-header">
<div class="header-fields identity-wrapper"> <div class="header-fields identity-wrapper">
<img class="profile-img dragndrop-actor-uuid pointer" src="{{data.img}}" {{#if data.editable_not_soft_locked}}data-edit="img"{{/if}} data-actor-uuid="{{actor.uuid}}" draggable="true" title="{{data.name}}"/> <img class="profile-img dragndrop-actor-uuid pointer" src="{{data.img}}" {{#if
<h1 class="charname"><input name="name" type="text" value="{{data.name}}" placeholder="Name" {{^if data.editable_not_soft_locked}}disabled{{/if}}/></h1> data.editable_not_soft_locked}}data-edit="img" {{/if}} data-actor-uuid="{{actor.uuid}}" draggable="true"
title="{{data.name}}" />
<h1 class="charname">
<input name="name" type="text" value="{{data.name}}" placeholder="Name" {{^if
data.editable_not_soft_locked}}disabled{{/if}} />
</h1>
{{> 'systems/l5r5e/templates/actors/npc/identity.html'}} {{> 'systems/l5r5e/templates/actors/npc/identity.html'}}
</div> </div>
<div class="header-fields"> <div class="header-fields mid-wrapper">
<h2>{{localize 'l5r5e.social.title'}}</h2> <div class="side-col">
<h2 class="right">{{localize 'l5r5e.attributes.title'}}</h2> <h2>{{localize 'l5r5e.social.title'}}</h2>
{{> 'systems/l5r5e/templates/actors/npc/social.html'}} {{> 'systems/l5r5e/templates/actors/npc/social.html'}}
{{> 'systems/l5r5e/templates/actors/npc/rings.html'}} </div>
{{> 'systems/l5r5e/templates/actors/npc/attributes.html'}} <div class="central-col">{{> 'systems/l5r5e/templates/actors/npc/rings.html'}}</div>
<div class="side-col">
<h2 class="right">{{localize 'l5r5e.attributes.title'}}</h2>
{{> 'systems/l5r5e/templates/actors/npc/attributes.html'}}
</div>
</div> </div>
</header> </header>
{{!-- Sheet Body --}} {{!-- Sheet Body --}}
<section class="sheet-body"> <section class="sheet-body">
{{!-- Active effects --}} {{!-- Active effects --}} {{> 'systems/l5r5e/templates/actors/npc/effects.html'}} {{!-- Skills No Tab --}} {{>
{{> 'systems/l5r5e/templates/actors/npc/effects.html'}} 'systems/l5r5e/templates/actors/npc/skill.html'}} {{!-- Sheet Tab Navigation --}}
{{!-- Skills No Tab --}}
{{> 'systems/l5r5e/templates/actors/npc/skill.html'}}
{{!-- Sheet Tab Navigation --}}
<nav class="sheet-tabs tabs" data-group="primary"> <nav class="sheet-tabs tabs" data-group="primary">
<a class="item" data-tab="skills">{{localize 'l5r5e.skills.title'}}</a> <a class="item" data-tab="skills">{{localize 'l5r5e.skills.title'}}</a>
<a class="item" data-tab="narrative">{{localize 'l5r5e.sheets.narrative'}}</a> <a class="item" data-tab="narrative">{{localize 'l5r5e.sheets.narrative'}}</a>
@@ -48,9 +52,9 @@
{{!-- Conflict Tab --}} {{!-- Conflict Tab --}}
<article class="tab conflict" data-group="primary" data-tab="conflict"> <article class="tab conflict" data-group="primary" data-tab="conflict">
{{> 'systems/l5r5e/templates/actors/npc/conflict.html'}} {{> 'systems/l5r5e/templates/actors/npc/conflict.html'}} {{>
{{> 'systems/l5r5e/templates/items/weapon/weapons.html'}} 'systems/l5r5e/templates/items/weapon/weapons.html'}} {{>
{{> 'systems/l5r5e/templates/items/armor/armors.html'}} 'systems/l5r5e/templates/items/armor/armors.html'}}
</article> </article>
{{!-- Inventory Tab --}} {{!-- Inventory Tab --}}