Merge branch 'dev-int' into 'master'

Update life list and dream + css for avatar

See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!27
This commit is contained in:
Leratier Bretonnien 2020-11-21 07:26:54 +00:00
commit 3c15878fed
2 changed files with 40 additions and 18 deletions

View File

@ -64,9 +64,9 @@
}
/* Fonts */
.sheet header.sheet-header h1 input, .window-app .window-header, #actors .directory-list {font-family: "GoudyAcc"}
.sheet header.sheet-header h1 input, .window-app .window-header, #actors .directory-list, #navigation #scene-list .scene.nav-item {font-family: "GoudyAcc"}
.sheet nav.sheet-tabs {font-family: "MedievalSharp";}
.window-app input, .foundryvtt-reve-de-dragon .item-form, .sheet header.sheet-header .flex-group-center.flex-compteurs, .sheet header.sheet-header .flex-group-center.flex-fatigue, select, button, .item-checkbox, #sidebar, #players, #navigation #scene-list .scene.nav-item, #navigation #nav-toggle {
.window-app input, .foundryvtt-reve-de-dragon .item-form, .sheet header.sheet-header .flex-group-center.flex-compteurs, .sheet header.sheet-header .flex-group-center.flex-fatigue, select, button, .item-checkbox, #sidebar, #players, #navigation #nav-toggle {
font-family: "Gothic";
}
@ -222,6 +222,8 @@ table {border: 1px solid #7a7971;}
height: 128px;
width: 128px;
margin-right: 10px;
object-fit: cover;
object-position: 50% 0;
}
.button-img {
@ -371,6 +373,13 @@ table {border: 1px solid #7a7971;}
section.sheet-body{padding: 0.25rem 0.5rem;}
.sheet header.sheet-header .profile-img {
object-fit: cover;
object-position: 50% 0;
margin: 0.5rem 0 0.5rem 0.5rem;
padding: 0;
}
.sheet nav.sheet-tabs {
font-size: 0.75rem;
font-weight: bold;

View File

@ -10,37 +10,50 @@
<div class="flexrow">
<ul class="flex-group-center flex-compteurs">
<li>
<label class="ctn-vie">Vie <a id="vie-plus">+</a>
<label class="ctn-vie">
Vie
<a id="vie-moins">-</a>
<input class="resource-content" type="text" name="data.sante.vie.value" value="{{data.sante.vie.value}}" data-dtype="Number"/>
<span>/ {{data.sante.vie.max}}</span>
<a id="vie-moins">-</a></label>
<a id="vie-plus">+</a>
</label>
</li>
<li>
<label class="ctn-endu">Endurance <a id="endurance-plus">+</a>
<label class="ctn-endu">
Endurance
<a id="endurance-moins">-</a>
<input class="resource-content" type="text" name="data.sante.endurance.value" value="{{data.sante.endurance.value}}" data-dtype="Number"/>
<span>/ {{data.sante.endurance.max}}</span>
<a id="endurance-moins">-</a></label>
<a id="endurance-plus">+</a>
</label>
</li>
<li>
<label class="ctn-fatigue tooltip">Fatigue <a id="fatigue-plus">+</a>
<label class="ctn-fatigue tooltip">
Fatigue
<a id="fatigue-moins">-</a>
<span class="tooltiptext">{{{data.fatigue.html}}}</span>
<input class="resource-content" id="fatigue-value" type="text" name="data.sante.fatigue.value" value="{{data.sante.fatigue.value}}" data-dtype="Number" />
<span>/ {{data.sante.fatigue.max}}</span>
<a id="fatigue-moins">-</a></label>
<a id="fatigue-plus">+</a>
</label>
</li>
<li>
<label class="ctn-sonne">Sonné :
<label class="ctn-sonne">
Sonné :
<input class="resource-content" type="checkbox" name="data.sante.sonne.value" value="{{data.sante.sonne.value}}" {{#if data.sante.sonne.value}}checked{{/if}} />
</label>
</li>
<li>
<label class="ctn-reve"><span class="ptreve-actuel"><a>Rêve</a></span> <a id="ptreve-actuel-plus">+</a>
<label class="ctn-reve">
<span class="ptreve-actuel"><a>Rêve</a></span>
<a id="ptreve-actuel-moins">-</a>
<input class="resource-content" id="pointsreve-value" type="text" name="data.reve.reve.value" value="{{data.reve.reve.value}}" data-dtype="Number" />
<span>/ {{data.reve.seuil.value}}</span>
<a id="ptreve-actuel-moins">-</a></label>
<a id="ptreve-actuel-plus">+</a>
</label>
</li>
<li class="lock-unlock-sheet">
<span><a>{{data.lockUnlockText}}</a></span>
<label><a>{{data.lockUnlockText}}</a></label>
</li>
</ul>
<div class="flex-group-center flex-actions-bar">