Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: blurry logo on header and settings (#385)

Guilherme Oenning730fd3f1da1e
diff --git a/app/pkg/img/img.go b/app/pkg/img/img.go
index 3e792186a..908d97c28 100644
--- a/app/pkg/img/img.go
+++ b/app/pkg/img/img.go
@@ -54,7 +54,7 @@ func Resize(file []byte, size int) ([]byte, error) {
}
dst := image.NewRGBA(image.Rect(0, 0, size, size))
- draw.BiLinear.Scale(dst, dst.Bounds(), src, srcBounds, draw.Src, nil)
+ draw.CatmullRom.Scale(dst, dst.Bounds(), src, srcBounds, draw.Src, nil)
writer := new(bytes.Buffer)
if format == "png" {
diff --git a/app/pkg/img/testdata/logo1-200x200.png b/app/pkg/img/testdata/logo1-200x200.png
index 3953c6403..385c48aa7 100755
Binary files a/app/pkg/img/testdata/logo1-200x200.png and b/app/pkg/img/testdata/logo1-200x200.png differ
diff --git a/app/pkg/img/testdata/logo4-100x100.png b/app/pkg/img/testdata/logo4-100x100.png
index 60dda66e8..3c593b798 100755
Binary files a/app/pkg/img/testdata/logo4-100x100.png and b/app/pkg/img/testdata/logo4-100x100.png differ
diff --git a/app/pkg/img/testdata/logo6-200x200.jpg b/app/pkg/img/testdata/logo6-200x200.jpg
index 913e91551..449aa2729 100755
Binary files a/app/pkg/img/testdata/logo6-200x200.jpg and b/app/pkg/img/testdata/logo6-200x200.jpg differ
diff --git a/app/pkg/img/testdata/logo7-200x200.gif b/app/pkg/img/testdata/logo7-200x200.gif
index bdcf76bda..2cfce3cbb 100755
Binary files a/app/pkg/img/testdata/logo7-200x200.gif and b/app/pkg/img/testdata/logo7-200x200.gif differ
diff --git a/public/components/common/Header.tsx b/public/components/common/Header.tsx
index fb00bf386..446cf3a76 100644
--- a/public/components/common/Header.tsx
+++ b/public/components/common/Header.tsx
@@ -87,7 +87,7 @@ export class Header extends React.Component<HeaderProps, HeaderState> {
<div className="ui borderless menu">
<div className="ui container">
<a href="/" className="item title">
- <Logo tenant={this.props.tenant} />
+ <Logo size={100} tenant={this.props.tenant} />
<span>{this.props.tenant.name}</span>
</a>
{showRightMenu && (
diff --git a/public/components/common/Logo.tsx b/public/components/common/Logo.tsx
index adc7e8e7c..de5146e7d 100644
--- a/public/components/common/Logo.tsx
+++ b/public/components/common/Logo.tsx
@@ -4,14 +4,18 @@ import { Tenant } from "@fider/models";
interface LogoProps {
url?: string;
tenant?: Tenant;
+ size?: 50 | 100 | 200;
}
export const Logo = (props: LogoProps) => {
if (props.url) {
return <img src={props.url} />;
}
+
+ const size = props.size || 200;
if (props.tenant && props.tenant.logoId > 0) {
- return <img src={`/logo/50/${props.tenant.logoId}`} alt={props.tenant.name} />;
+ return <img src={`/logo/${size}/${props.tenant.logoId}`} alt={props.tenant.name} />;
}
+
return null;
};
diff --git a/public/pages/Administration/pages/GeneralSettings.page.tsx b/public/pages/Administration/pages/GeneralSettings.page.tsx
index c55c34e9c..60c960be0 100644
--- a/public/pages/Administration/pages/GeneralSettings.page.tsx
+++ b/public/pages/Administration/pages/GeneralSettings.page.tsx
@@ -164,7 +164,7 @@ export class GeneralSettingsPage extends AdminBasePage<GeneralSettingsPageProps,
<DisplayError fields={["logo"]} error={this.state.error} />
<div className="field logo">
<label htmlFor="logo">Logo</label>
- {hasFile && <Logo tenant={this.props.tenant} url={previewUrl} />}
+ {hasFile && <Logo size={200} tenant={this.props.tenant} url={previewUrl} />}
<input ref={e => (this.fileSelector = e)} type="file" name="logo" onChange={this.fileChanged} />
<div>
<Button size="mini" onClick={this.selectFile} disabled={!this.props.user.isAdministrator}>
diff --git a/public/pages/SignIn/SignIn.page.tsx b/public/pages/SignIn/SignIn.page.tsx
index f522766a2..e24d1cd71 100644
--- a/public/pages/SignIn/SignIn.page.tsx
+++ b/public/pages/SignIn/SignIn.page.tsx
@@ -27,7 +27,7 @@ export class SignInPage extends React.Component<SignInPageProps, {}> {
return (
<div id="p-signin" className="page ui container">
<div className="message">
- <Logo tenant={this.props.tenant} />
+ <Logo size={100} tenant={this.props.tenant} />
<p className="welcome">
<strong>{this.props.tenant.name}</strong> is a private space and requires an invitation to join it.
</p>