Skip to content

Commit

Permalink
Merge pull request #13327 from LilLiteralist/master
Browse files Browse the repository at this point in the history 
[Star Wars Saga Edition] Added bonuses and penalties section
  • Loading branch information
@NorWhal
NorWhal authored Sep 19, 2024
2 parents fa7aa2d + 1619c87 commit d212964
Show file tree
Hide file tree
Showing 4 changed files with 595 additions and 38 deletions.
173 changes: 147 additions & 26 deletions Star Wars Saga Edition/StarWarsSagaEdition.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ input.tab::before,
--input-disabled-bg:#e3e3e3;
--input-disabled-border:#444;
--input-disabled-border-top:#999;
--input-darker-text: #333;
--checkbox-accent: #606060; /* This is now unused on the sheet because of visible-checkbox */
--checkbox-bg:#eee;
--checkbox-checked-bg:#ddd;
Expand All @@ -29,6 +30,9 @@ input.tab::before,
--checkbox-check:#222;
--checkbox-disabled-bg:#cecece;
--checkbox-disabled-check:#606060;
--toggle-bar: #eeeefb;
--toggle-bar-checked: #cacad5;
--toggle-shadow: #4441;
--header-bg: #000;
--header-bg-highlight: #333;
--col1-bg:#a7a8aa;
Expand Down Expand Up @@ -56,6 +60,18 @@ input.tab::before,
--button-gradient2: #e6e6e6;
--button-shadow1: #ffffff33;
--button-shadow2: #0000000d;
--bonuses-bg: #7794;
--bonuses-skills-bg: #0000000c;
--bonuses-skills-border: #8a8aa844;
--bonuses-toggle-shadow: #4444;
--scrollbar1-thumb: #a7a7ae;
--scrollbar1-shaft: #d3d3dc;
--scrollbar2-thumb: #9090ae;
--scrollbar2-shaft: #d9d9e6;
}

.ui-dialog {
scrollbar-color: var(--scrollbar1-thumb) var(--scrollbar1-shaft);
}

.center {
Expand Down Expand Up @@ -183,30 +199,99 @@ input[type="number"]:hover {
margin-top:4px;
}

.repcontrol {
margin-bottom: 15px;
}

/* Bonuses and Penalties Grid */
.repcontainer[data-groupname="repeating_bonuses"] > .repitem {
display:inline-block;
width:33.33%;
}

.repcontainer[data-groupname="repeating_bonuses"] {
display:flex;
flex-wrap:wrap;
}

.bonuses-grid {
display:grid;
grid-template-columns: 1fr 1fr 3fr 2fr 5fr;
column-gap: 4px;
row-gap: 3px;
grid-template-columns: 3fr 2fr;
gap:4px;
margin:4px;
border: 1px solid var(--rule-borders);
border-radius:5px;
padding: 5px;
box-sizing: content-box;
}

.bonuses-header-grid {
grid-column-start: span 8;
display:flex;
grid-template-columns: 1fr 9fr 2fr;
column-gap: 4px;
row-gap: 3px;
.bonuses-header {
grid-column: 1/3;
display: flex;
gap: 4px;
}

.bonuses-name {
grid-column:2/6;
.bonuses-header input[type="text"] {
width: calc(100% - 65px);
color: var(--input-darker-text);
}

.bonus-categories-grid {
margin: 6px 2px 4px 4px;
display:grid;
grid-template-columns: 1fr 3fr 2fr;
row-gap: 2px;
}

.bonuses-grid .bonus-categories-grid label,
.bonuses-grid .bonus-categories-grid h4 {
font-size:13px;
}

.bonuses-grid select {
width: auto;
}

.bonuses-defenses > div {
display:inline-flex;
margin-left: -5px;
margin-right: -5px;
width: 100%;
}

.bonuses-defenses div div {
flex-basis: 50px;
flex-grow: 1;
text-align: center;
}

.bonuses-skills {
grid-column-start: span 2;
height: 200px;
overflow: scroll;
border-style: inset;
border-width: 2px;
padding: 5px;
background-color: var(--bonuses-skills-bg);
border-radius: 5px;
border-color: var(--bonuses-skills-border);
}

/* If the bonus is active */
.bonuses-grid:has(.bonuses-header .visible-checkbox:checked) {
background-color: var(--bonuses-bg);
outline: 1px solid var(--rule-borders);
scrollbar-color: var(--scrollbar2-thumb) var(--scrollbar2-shaft);
}

.bonuses-header .visible-checkbox:checked ~ input[type="text"] {
font-weight:bold;
}

.bonuses-header .visible-checkbox:checked ~ label.toggle-bar {
box-shadow: 0px 0px 6px 1px var(--bonuses-toggle-shadow) inset;
}

/* Vitals Grid (HP, Threshold, Condition Track, Second Wind) */
.vitals-grid {
display: grid;
Expand Down Expand Up @@ -297,7 +382,7 @@ input[type="number"]:hover {

.attacks-grid-weapon-name {
grid-column:2/9;
color:#333;
color: var(--input-darker-text);
font-weight:bold;
width:100%;
}
Expand Down Expand Up @@ -931,15 +1016,15 @@ label.toggle-bar {
height: 17px;
margin-bottom:-3px;
box-sizing: border-box;
background-color: #eeeefb;
background-color: var(--toggle-bar);
border-radius: 30px;
cursor: pointer;
transition: background-color .25s;
box-shadow: 0px 0px 6px 1px #4441 inset
box-shadow: 0px 0px 6px 1px var(--toggle-shadow) inset
}

.toggle-bar:has(input:checked) {
background-color: #cacad5;
background-color: var(--toggle-bar-checked);
}

label.toggle-bar input {
Expand Down Expand Up @@ -1060,6 +1145,7 @@ input:checked + .toggle-knob::after {

/* ******** Hiding sections and show/hide toggle ******** */
.forceShow:not(:checked) ~ .forceBody,
.forceShow:not(:checked) ~ div.repcontainer .forceBody,
.organizationShow:not(:checked) ~ .organizationBody,
.SRShow:not(:checked) ~ .SRBody,
.DRShow:not(:checked) ~ .DRBody,
Expand All @@ -1085,7 +1171,9 @@ input:checked + .toggle-knob::after {

/* Section for showing/hiding specific skills */
.athleticsShow:not(:checked) ~ .athleticsBody,
.athleticsShow:checked ~ .noathleticsBody {
.athleticsShow:not(:checked) ~ div.repcontainer .athleticsBody,
.athleticsShow:checked ~ .noathleticsBody,
.athleticsShow:checked ~ div.repcontainer .noathleticsBody {
display:none!important;
}

Expand Down Expand Up @@ -1316,6 +1404,7 @@ input:not(:checked) + label.clickable.textHead2Col {
--dm-scrollbar1-shaft: #2e2e40;
--dm-scrollbar2-thumb: #1e1e44;
--dm-scrollbar2-shaft: #60608c;
--dm-scrollbar3-shaft: #232331;
--dm-col1: #55555a;
--dm-col1-highlight: #727275;
--dm-input-border: #707099;
Expand All @@ -1336,7 +1425,7 @@ input:not(:checked) + label.clickable.textHead2Col {
--dm-header-bg-highlight: #44a;
--dm-header-text: #f5f5f5;
--dm-clickable-hover:#eee;
--dm-clickable-highlight:#fff4;
--dm-clickable-highlight:#fff6;
--dm-button-bg: #747492;
--dm-button-gradient1:#d9d9e3;
--dm-button-gradient2: #b8b8cc;
Expand All @@ -1349,10 +1438,15 @@ input:not(:checked) + label.clickable.textHead2Col {
--dm-tab-inactive-gradient2: #292929;
--dm-toggle-bar: #446;
--dm-toggle-bar-checked: #3c3cbc;
--dm-toggle-shadow: #0008;
--dm-toggle-knob:#bbbbd7;
--dm-toggle-knob-border:#6c6c8f;
--dm-toggle-knob-active:#d1d1ec;
--dm-toggle-knob-active-border:#9d9dcc;
--dm-bonuses-outline: #556;
--dm-bonuses-outline-active: #8a8aa8;
--dm-bonuses-toggle-shadow: #000a;
--dm-bonuses-toggle-outline: #0006;
/* Colors below are for the CT buttons */
--dm-ct-bg: #747492;
--dm-ct-border: #000f;
Expand Down Expand Up @@ -1420,6 +1514,7 @@ input:not(:checked) + label.clickable.textHead2Col {
color: var(--dark-primarytext);
}

/* Begin sectio for checkboxes */
.sheet-darkmode .charsheet input[type=radio],
.sheet-darkmode .charsheet input[type=checkbox] {
accent-color: var(--dm-checkbox-accent);
Expand All @@ -1442,6 +1537,16 @@ input:not(:checked) + label.clickable.textHead2Col {
transition: 60ms all linear;
}

.sheet-darkmode .charsheet .visible-checkbox:hover {
filter: brightness(125%);
}

.sheet-darkmode .charsheet .visible-checkbox:hover::before {
filter:none; /* This gets rid of the contrast filter from light mode. */
}
/* End section for checkboxes */

/* Start section for crew */
.sheet-darkmode .skills-grid .skills-grid-name label {
color:var(--dark-primarytext);
}
Expand All @@ -1466,14 +1571,7 @@ input:not(:checked) + label.clickable.textHead2Col {
.sheet-darkmode .charsheet .defaultCrew:not(:checked) ~ .defaultCrewLock[type="checkbox"]::before {
box-shadow: inset 1em 1em var(--dm-checkbox-disabled-check); /*The dimensions don't actually make a difference, as long as they are larger than the width and height. */
}

.sheet-darkmode .charsheet .visible-checkbox:hover {
filter: brightness(125%);
}

.sheet-darkmode .charsheet .visible-checkbox:hover::before {
filter:none; /* This gets rid of the contrast filter from light mode. */
}
/* End section for crew */

.sheet-darkmode .charsheet div.textHead2Col,
.sheet-darkmode .charsheet div.textHead,
Expand Down Expand Up @@ -1538,7 +1636,7 @@ input:not(:checked) + label.clickable.textHead2Col {
/* Start section for toggle switches */
.sheet-darkmode label.toggle-bar {
background-color: var(--dm-toggle-bar);
box-shadow: 0px 0px 6px 1px #0008 inset
box-shadow: 0px 0px 6px 1px var(--dm-toggle-shadow) inset
}

.sheet-darkmode .toggle-bar:has(input:checked) {
Expand All @@ -1558,6 +1656,29 @@ input:not(:checked) + label.clickable.textHead2Col {
}
/* End section for toggle switches */

/* Start section for Bonuses and Penalties */
.sheet-darkmode .charsheet .bonuses-grid {
border: 1px solid var(--dm-bonuses-outline);
}

.sheet-darkmode .charsheet .bonuses-skills {
background-color: #0002;
border-color: #8a8aa888;
}

.sheet-darkmode .charsheet .bonuses-grid:has(.bonuses-header .visible-checkbox:checked) {
/* If the bonus is active */
border-color: var(--dm-bonuses-outline-active);
outline: 1px solid var(--dm-bonuses-outline-active);
scrollbar-color: var(--dm-scrollbar1-thumb) var(--dm-scrollbar3-shaft);
}

.sheet-darkmode .charsheet .bonuses-header .visible-checkbox:checked ~ label.toggle-bar {
box-shadow: 0px 0px 6px 1px var(--dm-bonuses-toggle-shadow) inset;
outline: 1px solid var(--dm-bonuses-toggle-outline);
}
/* End section for Bonuses and Penalties */

/* Start section for condition track buttons and heavy load warning */
.sheet-darkmode .charsheet input.ct-label + label,
.sheet-darkmode .charsheet input.encumbrance-load ~ label {
Expand Down
Loading

0 comments on commit d212964

Please sign in to comment.