Fix npc tabs and Roll Button display

This commit is contained in:
Mandar
2021-02-16 16:02:49 +01:00
parent 14b47a5381
commit 5ffaa062fc
4 changed files with 37 additions and 11 deletions

File diff suppressed because one or more lines are too long

View File

@@ -429,3 +429,34 @@
display: none; display: none;
} }
} }
.dice-picker-dialog,
.roll-n-keep-dialog {
button {
cursor: default;
color: $white;
background: linear-gradient(
$l5r5e-linear-gradient-third,
$l5r5e-linear-gradient-third-dark,
$l5r5e-linear-gradient-third
);
background-origin: padding-box;
border-image: url("../assets/ui/macro-button.webp") 10 repeat;
border-image-width: 0.5rem;
border-image-outset: 0px;
margin: 0.5rem 0 0;
&:hover {
background: linear-gradient(
$l5r5e-linear-gradient-first-dark,
$l5r5e-linear-gradient-first,
$l5r5e-linear-gradient-first-dark
);
}
&[disabled] {
opacity: 0.25;
&:hover {
box-shadow: none;
}
}
}
}

View File

@@ -133,11 +133,7 @@
} }
} }
article { article {
.weapons-content {
flex: 1;
}
min-height: auto; min-height: auto;
display: flex;
fieldset, fieldset,
.checklist { .checklist {
flex: 0 0 calc(100% - 0.5rem); flex: 0 0 calc(100% - 0.5rem);
@@ -146,6 +142,9 @@
flex: 0 0 calc(100% - 0.5rem); flex: 0 0 calc(100% - 0.5rem);
margin: 1rem 0.25rem 0; margin: 1rem 0.25rem 0;
} }
.weapons-content {
flex: 1;
}
.initiative-wrapper { .initiative-wrapper {
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
} }

View File

@@ -23,7 +23,6 @@
{{!-- Sheet Tab 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.narrative' }}</a>
<a class="item" data-tab="conflict">{{ localize 'l5r5e.conflict.title' }}</a> <a class="item" data-tab="conflict">{{ localize 'l5r5e.conflict.title' }}</a>
<a class="item" data-tab="inventory">{{ localize 'l5r5e.inventory' }}</a> <a class="item" data-tab="inventory">{{ localize 'l5r5e.inventory' }}</a>
</nav> </nav>
@@ -33,11 +32,8 @@
</article> </article>
{{!-- Techniques Tab --}} {{!-- Techniques Tab --}}
<article class="tab skills" data-group="primary" data-tab="skills"> <article class="tab skills" data-group="primary" data-tab="skills">
{{> 'systems/l5r5e/templates/actors/npc/techniques.html' }}
</article>
{{!-- Narrative Tab --}}
<article class="tab narrative" data-group="primary" data-tab="narrative">
{{> 'systems/l5r5e/templates/actors/npc/narrative.html' }} {{> 'systems/l5r5e/templates/actors/npc/narrative.html' }}
{{> 'systems/l5r5e/templates/actors/npc/techniques.html' }}
</article> </article>
{{!-- Conflict Tab --}} {{!-- Conflict Tab --}}
<article class="tab conflict" data-group="primary" data-tab="conflict"> <article class="tab conflict" data-group="primary" data-tab="conflict">
@@ -46,7 +42,7 @@
{{> 'systems/l5r5e/templates/items/armor/armors.html' }} {{> 'systems/l5r5e/templates/items/armor/armors.html' }}
</article> </article>
{{!-- Inventory Tab --}} {{!-- Inventory Tab --}}
<article class="tab inventory" data-group="primary" data-tab="skills"> <article class="tab inventory" data-group="primary" data-tab="inventory">
<fieldset class="items-wrapper"> <fieldset class="items-wrapper">
<legend>{{localize 'l5r5e.equipment' }}</legend> <legend>{{localize 'l5r5e.equipment' }}</legend>
{{> 'systems/l5r5e/templates/items/item/items.html' }} {{> 'systems/l5r5e/templates/items/item/items.html' }}