Skip to content

fix: fix that one line #863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rxri merged 2 commits into from
Nov 27, 2024
Merged

fix: fix that one line #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f0af6e
Fix that one line
CharlieS1103 Nov 21, 2024
fa6d6a7
Merge branch 'main' into fix-that-line
rxri Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .husky/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

pnpm lint
2 changes: 1 addition & 1 deletion src/components/Grid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ class Grid extends React.Component<
console.debug("updateColourSchemes", schemes, activeScheme);
this.CONFIG.theme.schemes = schemes;
this.CONFIG.theme.activeScheme = activeScheme;
if (activeScheme) Spicetify.Config.color_scheme = activeScheme;
if (activeScheme) (Spicetify.Config as { [key: string]: unknown }).color_scheme = activeScheme;

if (schemes && activeScheme && schemes[activeScheme]) {
injectColourScheme(this.CONFIG.theme.schemes[activeScheme]);
Expand Down
20 changes: 8 additions & 12 deletions src/components/Modals/Settings/ConfigRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,18 +61,14 @@ const ConfigRow = (props: {
}}
/>
<Spicetify.ReactComponent.TooltipWrapper
label={
<>
{props.description.split("\n").map((line) => {
return (
<span key={line}>
{line}
<br />
</span>
);
})}
</>
}
label={props.description.split("\n").map((line) => {
return (
<span key={line}>
{line}
<br />
</span>
);
})}
renderInline={true}
showDelay={10}
placement="top"
Expand Down
10 changes: 5 additions & 5 deletions src/components/Modals/Settings/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ const SettingsModal = ({ CONFIG, updateAppConfig }: Props) => {
<div className="settings-block">
<h2 className="settings-heading">{t("settings.tabsHeading")}</h2>
<DnDList modalConfig={modalConfig} updateConfig={updateConfig} />
<label className="settings-tabs-description">({t("settings.tabsDescription")})</label>
<p className="settings-tabs-description">({t("settings.tabsDescription")})</p>
</div>

<div className="settings-block">
<h2 className="settings-heading">{t("settings.resetHeading")}</h2>
<div className="settings-row">
<label className="col description">{t("settings.resetDescription")}</label>
<span className="col description">{t("settings.resetDescription")}</span>
<div className="col action">
<Button onClick={() => resetMarketplace()}>{t("settings.resetBtn")}</Button>
</div>
Expand All @@ -104,7 +104,7 @@ const SettingsModal = ({ CONFIG, updateAppConfig }: Props) => {
<div className="settings-block">
<h2 className="settings-heading">{t("settings.backupHeading")}</h2>
<div className="settings-row">
<label className="col description">{t("settings.backupLabel")}</label>
<span className="col description">{t("settings.backupLabel")}</span>
<div className="col action">
<Button onClick={onBackupClick}>{t("settings.backupBtn")}</Button>
</div>
Expand All @@ -113,9 +113,9 @@ const SettingsModal = ({ CONFIG, updateAppConfig }: Props) => {

<div className="settings-block-bottom">
<div className="settings-row">
<label className="col description">
<span className="col description">
{t("grid.spicetifyMarketplace")} {t("settings.versionHeading")} {MARKETPLACE_VERSION}
</label>
</span>
<div className="col action">
<Button onClick={copyVersion} classes={["small"]}>
{versionButtonText}
Expand Down