Skip to content

Commit f30c8c4

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/dev' into stable
2 parents a20d2b6 + dd472b4 commit f30c8c4

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

packages/api-file-manager-s3/src/assetDelivery/s3/SharpTransform.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export class SharpTransform implements AssetTransformationStrategy {
7676
const buffer = await optimizedImage.getContents();
7777
const transformedBuffer = sharp(buffer, { animated: this.isAssetAnimated(asset) })
7878
.withMetadata()
79-
.resize({ width })
79+
.resize({ width, withoutEnlargement: true })
8080
.toBuffer();
8181

8282
/**

packages/app-file-manager/src/components/Grid/File.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ export const FileThumbnail = ({ file, selected, onSelect, children }: FileProps)
7474
</LazyLoad>
7575
</FileBody>
7676
<FileLabel data-testid={"fm-file-wrapper-file-label"}>
77-
<Typography className="type" use={"overline"}>
77+
<Typography className="type" use={"overline"} tag={"span"}>
7878
{file.type}
7979
</Typography>
80-
<Typography className="name" use={"body2"}>
80+
<Typography className="name" use={"body2"} tag={"span"}>
8181
{file.name}
8282
</Typography>
83-
<Typography className="createdOn" use={"caption"}>
83+
<Typography className="createdOn" use={"caption"} tag={"span"}>
8484
<TimeAgo datetime={file.createdOn} />
8585
</Typography>
8686
</FileLabel>

packages/app-file-manager/src/components/UploadStatus/styled.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ const animateShow = keyframes`
1818
export const StatusWrapper = styled.div`
1919
border-radius: 28px;
2020
width: 320px;
21-
transform: translate(-50%, -50%);
2221
position: absolute;
2322
box-shadow: 0 2px 6px rgba(170, 185, 200, 0.4);
2423
color: var(--mdc-theme-on-surface);
2524
background-color: #fff;
26-
left: calc(50vw - 160px);
25+
left: calc(50% - 160px);
2726
bottom: 16px;
2827
display: flex;
2928
align-items: center;

packages/app-file-manager/src/modules/FileManagerRenderer/FileManagerView/FileManagerView.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ const t = i18n.ns("app-admin/file-manager/file-manager-view");
4545
const FileListWrapper = styled("div")({
4646
zIndex: 60,
4747
height: "calc(100vh - 94px)",
48+
position: "relative",
4849
".mdc-data-table": {
4950
display: "inline-table"
5051
}

0 commit comments

Comments
 (0)