Skip to content

Commit

Permalink
address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Nutomic committed Mar 1, 2022
1 parent 0ab1777 commit c394ddc
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 12 deletions.
5 changes: 4 additions & 1 deletion src/shared/components/app/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ export class App extends Component<AppProps, any> {
<>
<Provider i18next={i18n}>
<div>
<Theme myUserInfo={siteRes.my_user} site={siteRes.site_view.site} />
<Theme
myUserInfo={siteRes.my_user}
defaultTheme={siteRes.site_view.site.default_theme}
/>
{siteRes &&
siteRes.site_view &&
this.props.siteRes.site_view.site.icon && (
Expand Down
46 changes: 36 additions & 10 deletions src/shared/components/app/theme.tsx
Original file line number Diff line number Diff line change
@@ -1,33 +1,59 @@
import { Component } from "inferno";
import { Helmet } from "inferno-helmet";
import { MyUserInfo, Site } from "lemmy-js-client";
import { MyUserInfo } from "lemmy-js-client";

interface Props {
myUserInfo: MyUserInfo | undefined;
site: Site;
defaultTheme: string;
}

export class Theme extends Component<Props> {
render() {
let user = this.props.myUserInfo;
let hasTheme = user && user.local_user_view.local_user.theme !== "browser";

return (
<Helmet>
{hasTheme ? (
if (hasTheme) {
return (
<Helmet>
<link
rel="stylesheet"
type="text/css"
href={`/static/assets/css/themes/${user.local_user_view.local_user.theme}.min.css`}
/>
) : (
</Helmet>
);
} else if (this.props.defaultTheme != "browser") {
return (
<Helmet>
<link
rel="stylesheet"
type="text/css"
href={`/static/assets/css/themes/${this.props.site.default_theme}.min.css`}
href={`/static/assets/css/themes/${this.props.defaultTheme}.min.css`}
/>
)}
</Helmet>
);
</Helmet>
);
} else {
return (
<Helmet>
[
<link
rel="stylesheet"
type="text/css"
href="/static/assets/css/themes/litely.min.css"
id="default-light"
media="(prefers-color-scheme: light)"
/>
,
<link
rel="stylesheet"
type="text/css"
href="/static/assets/css/themes/darkly.min.css"
id="default-dark"
media="(prefers-color-scheme: no-preference), (prefers-color-scheme: dark)"
/>
];
</Helmet>
);
}
}
}
2 changes: 1 addition & 1 deletion src/shared/components/home/site-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ export class SiteForm extends Component<SiteFormProps, SiteFormState> {
<div class="form-group row">
<div class="col-12">
<label
class="form-check-label"
class="form-check-label mr-2"
htmlFor="create-site-default-theme"
>
{i18n.t("theme")}
Expand Down

0 comments on commit c394ddc

Please sign in to comment.