Skip to content

Commit 104ad96

Browse files
committed
Finish
1 parent f695a3e commit 104ad96

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

config/i18n.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,6 +1292,8 @@
12921292
"Theme": "Theme",
12931293
"Troubleshooting": "Troubleshooting",
12941294
"VaultGroupingNone": "None",
1295+
"VaultUnder": "Show vaulted items under equipped items",
1296+
"RestoreVaultSide": "Show vaulted items in their own column",
12951297
"WeaponFrame": "Weapon Frame",
12961298
"WishlistRefreshNotificationBody": "If you do not see any updates, be sure the source (such as GitHub) reflects them!",
12971299
"WishlistRefreshNotificationTitle": "Wishlists Reloaded"

src/app/inventory-page/DesktopStores.m.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
.vaultUnderButton {
4343
composes: singleCharacterButton;
4444

45-
font-size: 20px;
45+
font-size: 18px;
4646

4747
&.under > span {
4848
transform: rotate(90deg);

src/app/inventory-page/DesktopStores.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,7 @@ export default function DesktopStores({ stores, buckets, singleCharacter }: Prop
9999
type="button"
100100
className={clsx(styles.vaultUnderButton, { [styles.under]: !vaultUnder })}
101101
onClick={toggleVaultUnder}
102-
title={
103-
singleCharacter
104-
? t('Settings.ExpandSingleCharacter')
105-
: `${t('Settings.SingleCharacter')}: ${t('Settings.SingleCharacterExplanation')}`
106-
}
102+
title={!vaultUnder ? t('Settings.VaultUnder') : t('Settings.RestoreVaultSide')}
107103
>
108104
<AppIcon icon={vaultUnder ? levellingIcon : levelDownIcon} />
109105
</button>

src/app/item-feed/ItemFeedSidebar.m.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
right: 100%;
3131
color: var(--theme-text);
3232
padding: 4px 8px;
33-
top: calc(-1 * var(--header-height));
33+
top: 0;
3434
transform-origin: bottom right;
3535
white-space: nowrap;
3636
font-size: 16px;

src/app/settings/SettingsPage.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,15 @@ export default function SettingsPage() {
375375
/>
376376
</div>
377377

378+
<div className={styles.setting}>
379+
<Checkbox
380+
label={t('Settings.VaultUnder')}
381+
name="vaultUnder"
382+
value={settings.vaultUnder}
383+
onChange={onCheckChange}
384+
/>
385+
</div>
386+
378387
<div className={styles.setting}>
379388
<label htmlFor="itemSort">{t('Settings.SetSort')}</label>
380389

src/locale/en.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,6 +1242,7 @@
12421242
"MaxParallelCores": "Maximum cores for parallel tasks",
12431243
"MaxParallelCoresExplanation": "Controls how many CPU cores DIM can use for intensive tasks like Loadout Optimizer and Loadout Analyzer. Higher values may improve performance but use more system resources.",
12441244
"ResetToDefault": "Reset",
1245+
"RestoreVaultSide": "Show vaulted items in their own column",
12451246
"ReverseSort": "Toggle forward/reverse sort",
12461247
"SetSort": "Sort items by:",
12471248
"SetVaultWeaponGrouping": "Group vault weapons by:",
@@ -1273,6 +1274,7 @@
12731274
"Troubleshooting": "Troubleshooting",
12741275
"VaultArmorGroupingStyle": "Separate armor on different lines by class",
12751276
"VaultGroupingNone": "None",
1277+
"VaultUnder": "Show vaulted items under equipped items",
12761278
"VaultWeaponGroupingStyle": "Separate weapon groups on different lines",
12771279
"WeaponFrame": "Weapon Frame",
12781280
"WishlistRefreshNotificationBody": "If you do not see any updates, be sure the source (such as GitHub) reflects them!",

0 commit comments

Comments
 (0)