diff --git a/.github/workflows/LINT_CHECK.yml b/.github/workflows/LINT_CHECK.yml index 7d6aef17..d8c3eaad 100644 --- a/.github/workflows/LINT_CHECK.yml +++ b/.github/workflows/LINT_CHECK.yml @@ -23,11 +23,7 @@ jobs: node-version: 20 registry-url: https://registry.npmjs.org/ - name: Install package - run: | - yarn set version 3.8.0 - yarn - - name: Install dependencies - run: yarn install --immutable --immutable-cache + run: yarn - name: Check lint run: yarn lint - name: TS check diff --git a/src/components/editor/TextEditor/AddImageFile/index.tsx b/src/components/editor/TextEditor/AddImageFile/index.tsx index 16492246..eddd1a5f 100644 --- a/src/components/editor/TextEditor/AddImageFile/index.tsx +++ b/src/components/editor/TextEditor/AddImageFile/index.tsx @@ -2,8 +2,6 @@ import React, { ChangeEvent, useState } from 'react'; import { ReactComponent as Plus } from 'assets/svg/post/picture.svg'; -import styles from './AddImageFile.module.scss'; - function AddImageFile() { const [imageSrc, setImageSrc] = useState(); @@ -28,19 +26,18 @@ function AddImageFile() { return (
); diff --git a/src/layout/DefaultLayout/DefaultLayout.module.scss b/src/layout/DefaultLayout/DefaultLayout.module.scss index 0cbaadcf..03eae385 100644 --- a/src/layout/DefaultLayout/DefaultLayout.module.scss +++ b/src/layout/DefaultLayout/DefaultLayout.module.scss @@ -1,6 +1,13 @@ -.sidebar-space { - width: 100px; - flex-shrink: 0; +@use "src/utils/styles/mediaQuery" as media; + +.main { + width: calc(100% - 90px); + margin-left: 90px; + + @include media.media-breakpoint-down(mobile) { + margin: 0; + width: 100%; + } } .home { diff --git a/src/layout/DefaultLayout/index.tsx b/src/layout/DefaultLayout/index.tsx index 267669f5..05c0be18 100644 --- a/src/layout/DefaultLayout/index.tsx +++ b/src/layout/DefaultLayout/index.tsx @@ -4,12 +4,16 @@ import BottomNavigation from 'components/common/BottomNavigation'; import SideNavigation from 'components/common/SideNavigation'; import useMediaQuery from 'utils/hooks/useMediaQuery'; +import styles from './DefaultLayout.module.scss'; + export default function DefaultLayout(): JSX.Element { const { isMobile } = useMediaQuery(); return ( <> {!isMobile && } - +
+ +
{isMobile && } ); diff --git a/src/pages/Follow/components/FollowProfile.module.scss b/src/pages/Follow/components/FollowProfile.module.scss index a1580f6c..b6a9d91c 100644 --- a/src/pages/Follow/components/FollowProfile.module.scss +++ b/src/pages/Follow/components/FollowProfile.module.scss @@ -1,7 +1,7 @@ @use "src/utils/styles/mediaQuery.scss" as media; .container { - width: calc(100vw - 100px); + width: 100%; height: calc(100vh - 80px); display: flex; justify-content: center; diff --git a/src/pages/Follow/index.module.scss b/src/pages/Follow/index.module.scss index 4866f2a8..79bf52ac 100644 --- a/src/pages/Follow/index.module.scss +++ b/src/pages/Follow/index.module.scss @@ -1,8 +1,8 @@ @use "src/utils/styles/mediaQuery.scss" as media; .template { + width: 100%; height: 100vh; - width: calc(100vw - 100px); margin-left: 100px; padding-top: 60px; box-sizing: border-box; diff --git a/src/pages/Notice/Notice.module.scss b/src/pages/Notice/Notice.module.scss index 7f3928c5..1e63e5d4 100644 --- a/src/pages/Notice/Notice.module.scss +++ b/src/pages/Notice/Notice.module.scss @@ -6,7 +6,7 @@ $back: white; $normal: #666666; .container { - width: 100vw; + width: 100%; height: 100%; display: flex; flex-direction: column; diff --git a/src/pages/Notice/detail/Detail.module.scss b/src/pages/Notice/detail/Detail.module.scss index 2d37bf43..5bce81a3 100644 --- a/src/pages/Notice/detail/Detail.module.scss +++ b/src/pages/Notice/detail/Detail.module.scss @@ -6,7 +6,7 @@ $back: white; $normal: #666666; .container { - width: 100vw; + width: 100%; height: 100vh; display: flex; flex-direction: column; diff --git a/src/pages/SearchDetails/SearchDetails.module.scss b/src/pages/SearchDetails/SearchDetails.module.scss index 25245ca4..438522f9 100644 --- a/src/pages/SearchDetails/SearchDetails.module.scss +++ b/src/pages/SearchDetails/SearchDetails.module.scss @@ -1,12 +1,12 @@ @use "src/utils/styles/mediaQuery.scss" as media; .container { - width: calc(100vw - 100px); + width: 100%; height: 100dvh; + box-sizing: border-box; padding: 16px; @include media.media-breakpoint-down(mobile) { - width: 100%; padding: 0; } } diff --git a/src/pages/Setting/PC/PcSetting.module.scss b/src/pages/Setting/PC/PcSetting.module.scss index 57c9e1e5..641c788b 100644 --- a/src/pages/Setting/PC/PcSetting.module.scss +++ b/src/pages/Setting/PC/PcSetting.module.scss @@ -53,15 +53,16 @@ $title: #ff7f23; display: flex; align-items: center; justify-content: center; - width: calc(100vw - 100px); + width: 100%; height: calc(100vh - 80px); } .setting { - position: relative; - bottom: 17vh; - padding-bottom: 90px; - right: 100px; + width: 246px; + height: 100%; + margin-top: 160px; + display: flex; + flex-direction: column; &__title { font-size: 32px; diff --git a/src/pages/ShopDetail/index.tsx b/src/pages/ShopDetail/index.tsx index f3dbf186..2655f876 100644 --- a/src/pages/ShopDetail/index.tsx +++ b/src/pages/ShopDetail/index.tsx @@ -60,7 +60,12 @@ function ShopDetail() {
{!isMobile ? ( - ) : }