Skip to content

Commit

Permalink
Merge pull request #10673 from FlaminSarge/themes
Browse files Browse the repository at this point in the history
Fix Europa theme godroll indicator color and add godroll/archived to item preview on settings page
  • Loading branch information
bhollis authored Aug 5, 2024
2 parents 4aa92c1 + 83f683e commit c6d4d32
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 4 deletions.
24 changes: 21 additions & 3 deletions src/app/settings/SettingsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ export default function SettingsPage() {
(i) => i.bucket.sort === 'Weapons' && !i.isExotic && i.masterwork && !i.deepsightInfo,
);
const exampleArmor = allItems.find((i) => i.bucket.sort === 'Armor' && !i.isExotic);
const exampleArchivedArmor = allItems.find(
(i) => i !== exampleArmor && i.bucket.sort === 'Armor' && !i.isExotic,
);
const godRoll = {
wishListPerks: new Set<number>(),
notes: undefined,
isUndesirable: false,
};

const onCheckChange = (checked: boolean, name: keyof Settings) => {
if (name.length === 0) {
Expand Down Expand Up @@ -270,23 +278,33 @@ export default function SettingsPage() {
<InventoryItem
item={exampleWeapon}
isNew={settings.showNewItems}
tag="favorite"
tag="keep"
wishlistRoll={godRoll}
autoLockTagged={settings.autoLockTagged}
/>
)}
{exampleWeaponMasterworked && (
<InventoryItem
item={exampleWeaponMasterworked}
isNew={settings.showNewItems}
tag="keep"
tag="favorite"
wishlistRoll={godRoll}
autoLockTagged={settings.autoLockTagged}
/>
)}
{exampleArmor && (
<InventoryItem
item={exampleArmor}
isNew={settings.showNewItems}
tag="keep"
autoLockTagged={settings.autoLockTagged}
/>
)}
{exampleArchivedArmor && (
<InventoryItem
item={exampleArchivedArmor}
isNew={settings.showNewItems}
tag="archive"
searchHidden={true}
autoLockTagged={settings.autoLockTagged}
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/app/themes/_theme-europa.scss
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
--theme-item-polaroid-masterwork-txt: #000;
--theme-item-polaroid-capped: #f2a5ce;
--theme-item-polaroid-capped-txt: #be0a99;
--theme-item-polaroid-godroll: white;
--theme-item-polaroid-godroll: #0b486b;
--theme-item-polaroid-trashroll: #d14334;

// Item popup
Expand Down

0 comments on commit c6d4d32

Please sign in to comment.