Skip to content

Commit

Permalink
Merge pull request #13593 from morgdalaine/wilderfeast-colors
Browse files Browse the repository at this point in the history
Wilderfeast—STYLE/ASSET update
  • Loading branch information
kfroll20 authored Dec 10, 2024
2 parents 4ff4e80 + bf50d72 commit e22bdf7
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 14 deletions.
14 changes: 4 additions & 10 deletions Wilderfeast/src/pug/wilderfeast.pug
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,6 @@ mixin notes
label.sr-only(data-i18n=`${style}_value`)= `${style} value`
input(name=`attr_${style}` type="number" value="1" min="1" max="5" placeholder="1")

//- .wf__style
button.wf-action(name=`act_${style}` type="action")
span(data-i18n=style)= style
button.wf-action--wild(name=`act_${style}_wild` type="action")
span(data-i18n="go_wild") Go Wild
//- Skills
.wf-container.wf-navy.col-span-4.wf__skills
h3.wf-heading(data-i18n="skills") Skills
Expand All @@ -109,23 +103,23 @@ mixin notes

button.wf-action(name="act_focus_up" type="action")
img(
src="https://raw.githubusercontent.com/morgdalaine/wilderfeast/refs/heads/main/assets/d8.svg"
src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Wilderfeast/assets/d8.svg"
)
span(data-i18n="focus_up") FOCUS UP
img(
src="https://raw.githubusercontent.com/morgdalaine/wilderfeast/refs/heads/main/assets/d8.svg"
src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Wilderfeast/assets/d8.svg"
)

div
span(data-i18n="choose_action_die_focus") Add a d8 Action Die to your dice pool.

button.wf-action--wild(name="act_go_wild" type="action")
img(
src="https://raw.githubusercontent.com/morgdalaine/wilderfeast/refs/heads/main/assets/d20.svg"
src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Wilderfeast/assets/d20.svg"
)
span(data-i18n="go_wild") GO WILD
img(
src="https://raw.githubusercontent.com/morgdalaine/wilderfeast/refs/heads/main/assets/d20.svg"
src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Wilderfeast/assets/d20.svg"
)

div
Expand Down
7 changes: 6 additions & 1 deletion Wilderfeast/src/scss/wilderfeast.scss
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ button {
&--style {
@extend .wf-input;

--container-color: var(--color-green);
--container-color: var(--color-orange);

display: inline-block;
width: 100%;
Expand All @@ -278,6 +278,11 @@ button {
font-family: var(--font-text-header);
font-size: 2em;
white-space: nowrap;

// Orange on White does not meet a11y/WCAG
// but stroke looks... bad.
// -webkit-text-stroke: 4px black;
// paint-order: fill stroke;
}
}
&--valuemax {
Expand Down
2 changes: 1 addition & 1 deletion Wilderfeast/wilderfeast.css
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ button {
grid-template-columns: 1fr 3fr;
}
.wf .wf-input--style {
--container-color: var(--color-green);
--container-color: var(--color-orange);
display: inline-block;
width: 100%;
padding: 0;
Expand Down
4 changes: 2 additions & 2 deletions Wilderfeast/wilderfeast.html
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,9 @@ <h3 class="wf-heading" data-i18n="skills">Skills</h3>
<div class="wf__actions grid">
<div class="empty"></div>
<div><span data-i18n="select_style_skill">Select a STYLE and SKILL.</span></div>
<button class="wf-action" name="act_focus_up" type="action"><img src="https://raw.githubusercontent.com/morgdalaine/wilderfeast/refs/heads/main/assets/d8.svg"/><span data-i18n="focus_up">FOCUS UP</span><img src="https://raw.githubusercontent.com/morgdalaine/wilderfeast/refs/heads/main/assets/d8.svg"/></button>
<button class="wf-action" name="act_focus_up" type="action"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Wilderfeast/assets/d8.svg"/><span data-i18n="focus_up">FOCUS UP</span><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Wilderfeast/assets/d8.svg"/></button>
<div><span data-i18n="choose_action_die_focus">Add a d8 Action Die to your dice pool.</span></div>
<button class="wf-action--wild" name="act_go_wild" type="action"><img src="https://raw.githubusercontent.com/morgdalaine/wilderfeast/refs/heads/main/assets/d20.svg"/><span data-i18n="go_wild">GO WILD</span><img src="https://raw.githubusercontent.com/morgdalaine/wilderfeast/refs/heads/main/assets/d20.svg"/></button>
<button class="wf-action--wild" name="act_go_wild" type="action"><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Wilderfeast/assets/d20.svg"/><span data-i18n="go_wild">GO WILD</span><img src="https://raw.githubusercontent.com/Roll20/roll20-character-sheets/refs/heads/master/Wilderfeast/assets/d20.svg"/></button>
<div><span data-i18n="choose_action_die_wild">Choose one of your TRAITS and describe how it helps you in this situation. Then, remove 1 Style Die and replace it with a d20 Action Die.</span></div>
</div>
</div>
Expand Down

0 comments on commit e22bdf7

Please sign in to comment.