Skip to content

Commit

Permalink
Merge pull request #12193 from lexibrown/master
Browse files Browse the repository at this point in the history 
Emberwind [New Feature/Bugfix] Bugfixes and Improvements
  • Loading branch information
@BronsonHall
BronsonHall authored Sep 27, 2023
2 parents 87b7f53 + f603d36 commit cc2e517
Show file tree
Hide file tree
Showing 3 changed files with 1,209 additions and 302 deletions.
201 changes: 192 additions & 9 deletions Emberwind/emberwind.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,13 +358,16 @@ input.page-control[value="npc"] ~ .block-container.block-npc {

/*----------------- Tabs ------------------*/

.charsheet .tabs-toggle[value="character"] ~ div.tab-character,
.charsheet .tabs-toggle[value="inventory"] ~ div.tab-inventory,
.charsheet .tabs-toggle[value="conditions"] ~ div.tab-conditions,
.charsheet .tabs-toggle[value="guide"] ~ div.tab-guide {
display: flex;
}

.charsheet .tabs-toggle[value="character"] ~ div.tab-character {
display: grid;
}

.charsheet .tab-content {
display: none;
}
Expand Down Expand Up @@ -558,7 +561,7 @@ body.sheet-darkmode .mod-box-yellow {
.main {
display: grid;
grid-gap: 4px;
grid-template-columns: 35% 1fr;
grid-template-columns: 31% 1fr;
grid-template-rows: 1fr;
grid-template-areas: "main-stats main-actions";
}
Expand Down Expand Up @@ -721,6 +724,30 @@ body.sheet-darkmode .npc-condition {
grid-auto-rows: fit-content(100%);
}

.grid-2-col {
display: grid;
width: auto;
height: fit-content;
grid-column-gap: 3px;
grid-template-columns: 1fr 1fr;
}

.grid-3-col {
display: grid;
width: auto;
height: fit-content;
grid-column-gap: 3px;
grid-template-columns: 1fr 1fr;
}

.grid-4-col {
display: grid;
width: auto;
height: fit-content;
grid-column-gap: 3px;
grid-template-columns: 1fr 1fr 1fr 1fr;
}

/*----------------- Quick Guide ------------------*/

.guide-top {
Expand Down Expand Up @@ -1240,6 +1267,88 @@ input.medium {
padding-right: 3px;
}

.aspect-dropdown {
display: inline-block;
position: relative;
}

.aspect-button {
display: inline-block;
border-radius: 4px;
width: 100%;
height: 100%;
padding: 4px 3px;
background-color: #ffffff;
border: 1px solid lightgrey;
cursor: pointer;
white-space: normal;
margin-right: 20px;
}

body.sheet-darkmode .aspect-button {
background-color: inherit;
border: 1px solid lightgrey;
}

.aspect-button > span {
margin-right: 8px;
}

.aspect-button:after {
content: '';
position: absolute;
top: 15px;
right: 10px;
transform: translateY(-50%);
width: 0;
height: 0;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-top: 5px solid black;
}

body.sheet-darkmode .aspect-button:after {
border-top: 5px solid lightgrey;
}

.aspect-button:hover {
background-color: #eeeeee;
}

body.sheet-darkmode .aspect-button:hover {
background-color: dimgray;
}

.aspect-off-switch:checked ~ .aspect-button,
.aspect-def-switch:checked ~ .aspect-button,
.aspect-util-switch:checked ~ .aspect-button {
background-color: lightgrey;
}

body.sheet-darkmode .aspect-off-switch:checked ~ .aspect-button,
body.sheet-darkmode .aspect-def-switch:checked ~ .aspect-button,
body.sheet-darkmode .aspect-util-switch:checked ~ .aspect-button {
background-color: #414042;
}

.charsheet .aspect-off-switch,
.charsheet .aspect-def-switch,
.charsheet .aspect-util-switch {
display: none;
}

.aspect-off-switch ~ .aspect-off,
.aspect-def-switch ~ .aspect-def,
.aspect-util-switch ~ .aspect-util {
display: none;
}

.aspect-off-switch:checked ~ .aspect-off,
.aspect-def-switch:checked ~ .aspect-def,
.aspect-util-switch:checked ~ .aspect-util {
display: block;
}

/*----------------- Headers ------------------*/

div.header {
Expand Down Expand Up @@ -1986,7 +2095,7 @@ body.sheet-darkmode .penetration {
}

.cap-main-col {
width: 27%;
width: 30%;
}

.cap-sep-col {
Expand Down Expand Up @@ -2906,7 +3015,7 @@ input[type=checkbox].hex-button {
border-left: 12px solid transparent;
border-right: 12px solid transparent;
position: absolute;
top: -8px;
top: -7px;
font-size: 1.35em;
}

Expand All @@ -2915,7 +3024,7 @@ input[type=checkbox].hex-button {
border-color: inherit;
border-left: 8px solid transparent;
border-right: 7px solid transparent;
top: -5px;
top: -4.5px;
font-size: 0.9em;
}

Expand All @@ -2924,7 +3033,7 @@ input[type=checkbox].hex-button {
content: "";
width: 0;
position: absolute;
bottom: -8px;
bottom: -7.5px;
border-top: 8px solid;
border-color: inherit;
border-left: 12px solid transparent;
Expand All @@ -2936,7 +3045,7 @@ input[type=checkbox].hex-button {
border-color: inherit;
border-left: 8px solid transparent;
border-right: 8px solid transparent;
bottom: -4px;
bottom: -3px;
}

.hex {
Expand Down Expand Up @@ -3298,7 +3407,7 @@ input[type=checkbox].small-hex-button {
.sheet-rolltemplate-darkmode.sheet-rolltemplate-skill .inlinerollresult,
.sheet-rolltemplate-darkmode.sheet-rolltemplate-basic-action .inlinerollresult,
.sheet-rolltemplate-darkmode.sheet-rolltemplate-action .inlinerollresult {
background-color: gray;
background-color: grey;
border: 3px solid #414042;
}

Expand All @@ -3312,7 +3421,31 @@ input[type=checkbox].small-hex-button {
.sheet-rolltemplate-basic-action .inlinerollresult.fullfail,
.sheet-rolltemplate-action .inlinerollresult.fullfail {
border: 3px solid #B31515;
/*border: 3px solid #EE5F57;*/
}

.sheet-rolltemplate-skill .sheet-crit .inlinerollresult,
.sheet-rolltemplate-basic-action .sheet-crit .inlinerollresult,
.sheet-rolltemplate-action .sheet-crit .inlinerollresult {
border: 3px solid #3FB315;
}

.sheet-rolltemplate-skill .sheet-fail .inlinerollresult,
.sheet-rolltemplate-basic-action .sheet-fail .inlinerollresult,
.sheet-rolltemplate-action .sheet-fail .inlinerollresult {
border: 3px solid #B31515;
}

.sheet-rolltemplate-skill .sheet-pierce .inlinerollresult,
.sheet-rolltemplate-basic-action .sheet-pierce .inlinerollresult,
.sheet-rolltemplate-action .sheet-pierce .inlinerollresult {
border: 3px solid dodgerblue;
background-color: rgba(255,255,255,0.75);
}

.sheet-rolltemplate-darkmode.sheet-rolltemplate-skill .sheet-pierce .inlinerollresult,
.sheet-rolltemplate-darkmode.sheet-rolltemplate-basic-action .sheet-pierce .inlinerollresult,
.sheet-rolltemplate-darkmode.sheet-rolltemplate-action .sheet-pierce .inlinerollresult {
background-color: rgba(50,50,50,0.75);
}

.sheet-rolltemplate-action .sheet-critical,
Expand All @@ -3335,6 +3468,16 @@ input[type=checkbox].small-hex-button {
background-image: url("https://raw.githubusercontent.com/lexibrown/roll20-character-sheets/master/Emberwind/images/step-header-2.png");
}

.sheet-rolltemplate-action .sheet-piercing,
.sheet-rolltemplate-basic-action .sheet-piercing {
padding: 7px;
background-position-y: 0;
background-position-x: 0;
background-size: 100% 100%;
background-repeat: no-repeat;
background-image: url("https://raw.githubusercontent.com/lexibrown/roll20-character-sheets/master/Emberwind/images/step3.png");
}

.sheet-rolltemplate-action .sheet-toughness-img,
.sheet-rolltemplate-basic-action .sheet-toughness-img {
content: url("https://raw.githubusercontent.com/lexibrown/roll20-character-sheets/master/Emberwind/images/values/toughness-b.png");
Expand Down Expand Up @@ -3408,4 +3551,44 @@ input[type=checkbox].small-hex-button {
font-style: italic;
}

.sheet-rolltemplate-action .sheet-footer,
.sheet-rolltemplate-basic-action .sheet-footer {
color: grey;
font-size: 0.8em;
margin-top: -3px;
margin-bottom: -5px;
font-variant: small-caps;
font-weight: bold;
font-style: italic;
padding: 0;
}

.sheet-rolltemplate-darkmode.sheet-rolltemplate-basic-action .sheet-footer,
.sheet-rolltemplate-darkmode.sheet-rolltemplate-action .sheet-footer {
color: whitesmoke;
}

.sheet-rolltemplate-action .sheet-damage .inlinerollresult,
.sheet-rolltemplate-basic-action .sheet-damage .inlinerollresult {
border: none;
background-color: lightgrey;
padding: 0 4px;
}

.sheet-rolltemplate-darkmode.sheet-rolltemplate-action .sheet-damage .inlinerollresult,
.sheet-rolltemplate-darkmode.sheet-rolltemplate-basic-action .sheet-damage .inlinerollresult {
border: none;
background-color: grey;
}

.sheet-rolltemplate-turn .sheet-damage .inlinerollresult {
border: none;
background-color: lightgrey;
padding: 0 7px;
}

.sheet-rolltemplate-darkmode.sheet-rolltemplate-turn .sheet-damage .inlinerollresult {
background-color: grey;
}

/*-------------------------*/
Loading

0 comments on commit cc2e517

Please sign in to comment.