Skip to content

Commit

Permalink
Merge pull request #10679 from FlaminSarge/cant-roll
Browse files Browse the repository at this point in the history
  • Loading branch information
FlaminSarge authored Aug 11, 2024
2 parents a07c0c5 + 0c6c02e commit ca6da4c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
12 changes: 3 additions & 9 deletions src/app/item-popup/Plug.m.scss
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,9 @@
}

.cannotRoll {
fill: #ba594880;

&.plugged {
fill: #ba5948b8;
}

&.selected {
fill: #ba5948;
}
stroke-dasharray: 12 6;
stroke-width: 3;
stroke-dashoffset: -4;
}

.disabled {
Expand Down
5 changes: 3 additions & 2 deletions src/app/item-popup/Plug.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ function PerkCircle({
clsx({
[styles.plugged]: plugged,
[styles.selected]: selected,
[styles.cannotRoll]: cannotRoll || unreliablePerkOption,
[styles.notSelected]: notSelected,
}) || styles.none;
return (
Expand Down Expand Up @@ -217,7 +216,9 @@ function PerkCircle({
stroke="white"
fill="transparent"
strokeWidth="2"
className={styles.perkOutline}
className={clsx(styles.perkOutline, {
[styles.cannotRoll]: cannotRoll || unreliablePerkOption,
})}
/>
{enhanced && <path d="M5,50 l0,-24 l-6,0 l9,-16 l9,16 l-6,0 l0,24 z" fill="#eade8b" />}
</svg>
Expand Down
9 changes: 9 additions & 0 deletions src/app/item-popup/PlugTooltip.m.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,15 @@
}
.cannotRollSection {
@include tooltip-section-color($red);
p::before {
content: '';
display: inline-block;
padding: 6px;
margin-bottom: -3px;
margin-right: 3px;
border: 1px dashed white;
border-radius: 50%;
}
}
.automaticallyPickedSection {
@include tooltip-section-color($dim-brand);
Expand Down

0 comments on commit ca6da4c

Please sign in to comment.