From 00054214e596617c25c103f8af8594a141463d10 Mon Sep 17 00:00:00 2001 From: Arvin Xu Date: Sun, 27 Feb 2022 18:23:50 +0800 Subject: [PATCH] =?UTF-8?q?:lipstick:=20style:=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/asset-gallery/package.json | 2 +- packages/asset-gallery/src/AssetGallery.less | 18 ++++++ packages/asset-gallery/src/AssetGallery.tsx | 3 +- .../src/components/ActionButton.tsx | 8 ++- .../{style.less => components/AssetCard.less} | 39 ++++-------- .../src/components/AssetCard.tsx | 21 ++++--- .../__snapshots__/AssetCard.test.tsx.snap | 58 +++++++++++------- .../tests/__snapshots__/index.test.tsx.snap | 60 +++++++++---------- 8 files changed, 117 insertions(+), 92 deletions(-) create mode 100644 packages/asset-gallery/src/AssetGallery.less rename packages/asset-gallery/src/{style.less => components/AssetCard.less} (66%) diff --git a/packages/asset-gallery/package.json b/packages/asset-gallery/package.json index 288809cd..d674e1d9 100644 --- a/packages/asset-gallery/package.json +++ b/packages/asset-gallery/package.json @@ -14,7 +14,7 @@ "access": "public" }, "scripts": { - "build": "father-build && yarn webpack", + "build": "father-build && pnpm run webpack", "webpack": "webpack", "test": "jest", "test:update": "jest -u", diff --git a/packages/asset-gallery/src/AssetGallery.less b/packages/asset-gallery/src/AssetGallery.less new file mode 100644 index 00000000..e09316d8 --- /dev/null +++ b/packages/asset-gallery/src/AssetGallery.less @@ -0,0 +1,18 @@ +.avx-asset-gallery { + &-grid { + display: grid; + grid-template-columns: repeat(3, 1fr); + } + &-masonry { + column-count: 4; + column-gap: 0; + + @media (max-width: 400px) { + column-count: 2; + } + + @media (max-width: 1200px) { + column-count: 3; + } + } +} diff --git a/packages/asset-gallery/src/AssetGallery.tsx b/packages/asset-gallery/src/AssetGallery.tsx index 096d3a69..4b8bcdc0 100644 --- a/packages/asset-gallery/src/AssetGallery.tsx +++ b/packages/asset-gallery/src/AssetGallery.tsx @@ -3,13 +3,12 @@ import React from 'react'; import useMergeValue from 'use-merge-value'; import Layout from './components/Layout'; - import AssetCard from './components/AssetCard'; import { YMLToJSON } from './utils/yml'; import type { AssetGalleryProps } from './types'; -import './style.less'; +import './AssetGallery.less'; const AssetGallery: FC = ({ data, diff --git a/packages/asset-gallery/src/components/ActionButton.tsx b/packages/asset-gallery/src/components/ActionButton.tsx index 3bfb7096..eb867509 100644 --- a/packages/asset-gallery/src/components/ActionButton.tsx +++ b/packages/asset-gallery/src/components/ActionButton.tsx @@ -1,5 +1,7 @@ -import React, { FC } from 'react'; -import { Button, ButtonProps, Tooltip } from 'antd'; +import type { FC } from 'react'; +import React from 'react'; +import type { ButtonProps } from 'antd'; +import { Button, Tooltip } from 'antd'; export interface ActionButtonProps { onClick: ButtonProps['onClick']; @@ -18,7 +20,7 @@ const ActionButton: FC = ({ diff --git a/packages/asset-gallery/src/components/__snapshots__/AssetCard.test.tsx.snap b/packages/asset-gallery/src/components/__snapshots__/AssetCard.test.tsx.snap index 53387fa7..2c3c451f 100644 --- a/packages/asset-gallery/src/components/__snapshots__/AssetCard.test.tsx.snap +++ b/packages/asset-gallery/src/components/__snapshots__/AssetCard.test.tsx.snap @@ -3,19 +3,19 @@ exports[`AssetCard Sketch 测试 1`] = `