diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-04-08 17:39:48 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-04-08 17:39:48 +0900 |
| commit | cc57fc041a4efe429f2c572bd8a34ccefeea9cba (patch) | |
| tree | 3c6576c1912cd52246792f56fb5bf078670f88c7 /packages | |
| parent | disable flaky test (diff) | |
| parent | test: use M PLUS Rounded 1c on Storybook (#10520) (diff) | |
| download | misskey-cc57fc041a4efe429f2c572bd8a34ccefeea9cba.tar.gz misskey-cc57fc041a4efe429f2c572bd8a34ccefeea9cba.tar.bz2 misskey-cc57fc041a4efe429f2c572bd8a34ccefeea9cba.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/backend/test/docker-compose.yml | 2 | ||||
| -rw-r--r-- | packages/frontend/.storybook/preview-head.html | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/packages/backend/test/docker-compose.yml b/packages/backend/test/docker-compose.yml index 5f95bec4c0..da6c01dda1 100644 --- a/packages/backend/test/docker-compose.yml +++ b/packages/backend/test/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: redistest: - image: redis:6 + image: redis:7 ports: - "127.0.0.1:56312:6379" diff --git a/packages/frontend/.storybook/preview-head.html b/packages/frontend/.storybook/preview-head.html index 01912da28b..64e537b931 100644 --- a/packages/frontend/.storybook/preview-head.html +++ b/packages/frontend/.storybook/preview-head.html @@ -1,4 +1,10 @@ <link rel="stylesheet" href="https://unpkg.com/@tabler/icons-webfont@2.12.0/tabler-icons.min.css"> +<link rel="stylesheet" href="https://unpkg.com/@fontsource/m-plus-rounded-1c/index.css"> +<style> + html { + font-family: 'Hiragino Maru Gothic Pro', 'BIZ UDGothic', Roboto, HelveticaNeue, Arial, 'M PLUS Rounded 1c', sans-serif; + } +</style> <script> window.global = window; </script> |