Fix for release 0.8.x

Limited profil img
Bond type
Html table fix
Social tab grid
This commit is contained in:
Mandar
2021-06-01 19:29:42 +02:00
parent fd672d7bad
commit 8c961f856d
9 changed files with 61 additions and 29 deletions

File diff suppressed because one or more lines are too long

View File

@@ -246,7 +246,6 @@ input[type="number"] {
} }
table { table {
text-align: center;
background: transparent; background: transparent;
border: 1px solid $l5r5e-title; border: 1px solid $l5r5e-title;
thead { thead {

View File

@@ -212,6 +212,13 @@
} }
} }
} }
.bonds-types {
flex: 100%;
input {
width: 75%;
float: right;
}
}
} }
&.infos { &.infos {
display: flex; display: flex;

View File

@@ -551,15 +551,32 @@
} }
} }
} }
.narrative-content, .narrative-content {
.narrative-description { flex: 100%;
flex: 0 0 calc(50% - 0.25rem); display: flex;
fieldset { fieldset {
display: block; flex: 0 0 calc(50% - 0.75rem);
label { label {
width: 100%; width: 100%;
} }
} }
.narrative-description {
max-height: 13rem;
font-size: 0.85rem;
flex: 1;
}
}
.narrative-list {
flex: 0 0 calc(50% - 0.25rem);
fieldset {
flex: 0 0 calc(50% - 0.25rem);
label {
width: 100%;
}
}
.narrative-note {
font-size: 0.85rem;
}
} }
.techniques-wrapper { .techniques-wrapper {
padding-left: 0.25rem; padding-left: 0.25rem;
@@ -676,17 +693,22 @@
table { table {
font-size: 0.85rem; font-size: 0.85rem;
color: $black-light; color: $black-light;
text-align: left;
thead { thead {
font-family: $font-tertiary; font-family: $font-secondary;
font-weight: normal;
th { th {
padding-left: 0.5rem;
padding-right: 0.5rem;
font-size: 1rem;
&:first-child { &:first-child {
flex: 0 0 2rem;
}
&:nth-child(2) {
flex: calc(100% - 16rem); flex: calc(100% - 16rem);
padding-left: 0.5rem; padding-left: 0.5rem;
text-align: left; text-align: left;
} }
&:nth-child(2) {
flex: 0 0 2rem;
}
&:nth-child(3), &:nth-child(3),
&:nth-child(4) { &:nth-child(4) {
flex: 0 0 4rem; flex: 0 0 4rem;
@@ -721,11 +743,11 @@
} }
} }
.tfoot { .tfoot {
padding: 0.25 0.5rem;
background: rgba(186, 187, 177, 0.5); background: rgba(186, 187, 177, 0.5);
color: #5a6e5a;
text-shadow: none; text-shadow: none;
border-top: rgba(186, 187, 177, 0.5); border-top: rgba(186, 187, 177, 0.5);
font-family: $font-tertiary; text-align: center;
} }
img { img {
width: 16px; width: 16px;
@@ -796,6 +818,7 @@
.sheet-header { .sheet-header {
flex: none; flex: none;
height: auto; height: auto;
width: 100%;
} }
ul { ul {
display: flex; display: flex;

View File

@@ -84,6 +84,7 @@
} }
table { table {
width: 100%; width: 100%;
text-align: center;
tr { tr {
th { th {
color: $l5r5e-label; color: $l5r5e-label;

View File

@@ -1,6 +1,6 @@
<tr class="flexrow row advancement"> <tr class="flexrow row advancement">
{{#if show_curriculum_toggle}}<td class="curriculum" name="curriculum">{{#if advancement.data.in_curriculum}}<i class="fas fa-graduation-cap"></i> {{/if}}</td>{{/if}}
<td class="name" name="advancement.name"><img src="{{advancement.img}}" title="{{advancement.name}}"> {{advancement.name}}{{#if advancement.data.bond_type}} ({{advancement.data.bond_type}}){{/if}}</td> <td class="name" name="advancement.name"><img src="{{advancement.img}}" title="{{advancement.name}}"> {{advancement.name}}{{#if advancement.data.bond_type}} ({{advancement.data.bond_type}}){{/if}}</td>
{{#if show_curriculum_toggle}}<td class="curriculum" name="curriculum">{{#if advancement.data.in_curriculum}}<i class="fas fa-graduation-cap"></i> {{/if}}</td>{{/if}}
<td class="xp" name="advancement.xp">{{#if advancement.data.xp_used_total}}{{advancement.data.xp_used_total}}{{else}}{{advancement.data.xp_used}}{{/if}}</td> <td class="xp" name="advancement.xp">{{#if advancement.data.xp_used_total}}{{advancement.data.xp_used_total}}{{else}}{{advancement.data.xp_used}}{{/if}}</td>
<td class="rank" name="advancement.rank">{{advancement.data.rank}}</td> <td class="rank" name="advancement.rank">{{advancement.data.rank}}</td>
{{#if editable}} {{#if editable}}

View File

@@ -1,6 +1,6 @@
<tr data-group="advancements" data-tab="advancement_rank_{{rank}}" class="flexrow row advancement tab"> <tr data-group="advancements" data-tab="advancement_rank_{{rank}}" class="flexrow row advancement tab">
<td class="curriculum" name="curriculum">{{#if advancement.data.in_curriculum}}<i class="fas fa-graduation-cap"></i> {{/if}}</td>
<td class="name" name="advancement.name"><img src="{{advancement.img}}" title="{{advancement.name}}"> {{advancement.name}}</td> <td class="name" name="advancement.name"><img src="{{advancement.img}}" title="{{advancement.name}}"> {{advancement.name}}</td>
<td class="curriculum" name="curriculum">{{#if advancement.data.in_curriculum}}<i class="fas fa-graduation-cap"></i> {{/if}}</td>
<td class="xp" name="advancement.xp">{{advancement.data.xp_used}}</td> <td class="xp" name="advancement.xp">{{advancement.data.xp_used}}</td>
<td class="rank" name="advancement.rank">{{advancement.data.rank}}</td> <td class="rank" name="advancement.rank">{{advancement.data.rank}}</td>
{{#if editable}} {{#if editable}}

View File

@@ -27,8 +27,8 @@
<table> <table>
<thead class="flex"> <thead class="flex">
<tr class="flexrow row"> <tr class="flexrow row">
<th class="curriculum"></th>
<th class="name">{{localize 'l5r5e.name'}}</th> <th class="name">{{localize 'l5r5e.name'}}</th>
<th class="curriculum"><i class="fas fa-graduation-cap"></i></th>
<th class="xp">{{localize 'l5r5e.advancements.spent'}}</th> <th class="xp">{{localize 'l5r5e.advancements.spent'}}</th>
<th class="rank">{{localize 'l5r5e.rank'}}</th> <th class="rank">{{localize 'l5r5e.rank'}}</th>
{{#if editable}} {{#if editable}}
@@ -42,13 +42,13 @@
{{> 'systems/l5r5e/templates/actors/character/advancement-school.html' advancement=advancement rank=rankObject.rank editable=../../options.editable}} {{> 'systems/l5r5e/templates/actors/character/advancement-school.html' advancement=advancement rank=rankObject.rank editable=../../options.editable}}
{{/each}} {{/each}}
{{#ifCond rankObject.rank '>' 0}} {{#ifCond rankObject.rank '>' 0}}
<tr data-group="advancements" data-tab="advancement_rank_{{rankObject.rank}}" class="flexrow row tab"> <tr class="tfoot flexrow row" data-group="advancements" data-tab="advancement_rank_{{rankObject.rank}}" class="flexrow row tab">
<th>{{localize 'l5r5e.advancements.total_xp_curriculum'}} : {{rankObject.spent.curriculum}}{{#if rankObject.goal}} / {{rankObject.goal}}{{/if}}</th> <th>{{localize 'l5r5e.advancements.total_xp_curriculum'}} : {{rankObject.spent.curriculum}}{{#if rankObject.goal}} / {{rankObject.goal}}{{/if}}</th>
<th>{{localize 'l5r5e.advancements.total_xp_spent'}} : {{rankObject.spent.total}}</th> <th>{{localize 'l5r5e.advancements.total_xp_spent'}} : {{rankObject.spent.total}}</th>
</tr> </tr>
{{#ifCond ../data.data.identity.school_rank '<' 6}} {{#ifCond ../data.data.identity.school_rank '<' 6}}
{{#ifCond (ifCond ../data.data.identity.school_rank '==' rankObject.rank) '&&' (ifCond rankObject.spent.curriculum '>=' rankObject.goal)}} {{#ifCond (ifCond ../data.data.identity.school_rank '==' rankObject.rank) '&&' (ifCond rankObject.spent.curriculum '>=' rankObject.goal)}}
<tr data-group="advancements" data-tab="advancement_rank_{{rankObject.rank}}" class="flexrow row tab"> <tr class="tfoot flexrow row" data-group="advancements" data-tab="advancement_rank_{{rankObject.rank}}" class="flexrow row tab">
<th> <th>
<button type="button" name="validate-curriculum"> <button type="button" name="validate-curriculum">
<i class='fas fa-check-square'></i> {{ localize 'l5r5e.advancements.curriculum_validate'}} <i class='fas fa-check-square'></i> {{ localize 'l5r5e.advancements.curriculum_validate'}}
@@ -82,11 +82,11 @@
{{/each}} {{/each}}
</tbody> </tbody>
<tfoot class="flex"> <tfoot class="flex">
<tr> <tr class="tfoot flexrow">
<th> <th>
{{localize 'l5r5e.advancements.total_xp_spent'}} : {{data.advancementsOthersTotalXp}} {{localize 'l5r5e.advancements.total_xp_spent'}} : {{data.advancementsOthersTotalXp}}
</th> </th>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
</fieldset> </fieldset>

View File

@@ -8,6 +8,15 @@
<textarea type="text" name="data.social.giri">{{data.data.social.giri}}</textarea> <textarea type="text" name="data.social.giri">{{data.data.social.giri}}</textarea>
</label> </label>
</fieldset> </fieldset>
{{!-- Description (npc have it on header) --}}
{{#ifCond data.type '==' "character"}}
<fieldset class="narrative-description">
<legend class="text-block-header">{{localize 'l5r5e.description' }}</legend>
{{editor content=data.data.description target="data.description" button=true editable=options.editable}}
</fieldset>
{{/ifCond}}
</div>
<div class="narrative-list">
<fieldset> <fieldset>
<legend class="text-block-header"> <legend class="text-block-header">
{{localize 'l5r5e.social.advantages'}} {{localize 'l5r5e.social.advantages'}}
@@ -55,13 +64,6 @@
</ul> </ul>
</fieldset> </fieldset>
</div> </div>
{{!-- Description (npc have it on header) --}}
{{#ifCond data.type '==' "character"}}
<fieldset class="narrative-description">
<legend class="text-block-header">{{localize 'l5r5e.description' }}</legend>
{{editor content=data.data.description target="data.description" button=true editable=options.editable}}
</fieldset>
{{/ifCond}}
{{!-- Notes (private) --}} {{!-- Notes (private) --}}
<fieldset class="narrative-note"> <fieldset class="narrative-note">
<legend class="text-block-header">{{localize 'l5r5e.notes' }}</legend> <legend class="text-block-header">{{localize 'l5r5e.notes' }}</legend>