diff --git a/public/static/images/main/main_background.png b/public/static/images/main/main_background.png new file mode 100644 index 0000000..95b8322 Binary files /dev/null and b/public/static/images/main/main_background.png differ diff --git a/src/app/canvas/page.jsx b/src/app/canvas/page.jsx index d5f2c9d..708cb17 100644 --- a/src/app/canvas/page.jsx +++ b/src/app/canvas/page.jsx @@ -6,7 +6,7 @@ import OuterLineWall from '@/components/canvas/modal/outerlinesetting/OuterLineW import SettingModal01 from '@/components/canvas/modal/settoing01/SettingModal01' import Header from '@/components/header/Header' import { modalState } from '@/store/modalAtom' -import '@/styles/style.scss' +import '@/styles/contents.scss' import { useRecoilValue } from 'recoil' export default function CanvasPage() { diff --git a/src/app/main/page.jsx b/src/app/main/page.jsx index 46b2919..3df9aff 100644 --- a/src/app/main/page.jsx +++ b/src/app/main/page.jsx @@ -1,4 +1,5 @@ import Header from "@/components/header/Header"; +import '@/styles/style.scss' export default function MainPage() { return( diff --git a/src/styles/_contents.scss b/src/styles/_contents.scss index 1d37812..58ce4b0 100644 --- a/src/styles/_contents.scss +++ b/src/styles/_contents.scss @@ -3,6 +3,7 @@ height: calc(100vh - 47px); display: flex; flex-direction: column; + background-color: #fff; .canvas-content{ flex: 1 1 auto; .canvas-layout{ diff --git a/src/styles/_layout.scss b/src/styles/_layout.scss index e33d75e..fedb694 100644 --- a/src/styles/_layout.scss +++ b/src/styles/_layout.scss @@ -6,8 +6,10 @@ overflow-x: hidden; } .content{ + position: relative; flex: 1 1 auto; padding-top: 46px; + background-color: #F4F4F7; } // header diff --git a/src/styles/_main.scss b/src/styles/_main.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/styles/common.scss b/src/styles/common.scss index 8152784..b9a8741 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -1,2 +1,3 @@ @import 'fonts.scss'; -@import 'reset.scss'; \ No newline at end of file +@import 'reset.scss'; +@import '_layout.scss'; diff --git a/src/styles/contents.scss b/src/styles/contents.scss new file mode 100644 index 0000000..90dfa53 --- /dev/null +++ b/src/styles/contents.scss @@ -0,0 +1,2 @@ +@import '_contents.scss'; +@import '_modal.scss'; \ No newline at end of file diff --git a/src/styles/style.scss b/src/styles/style.scss index 67e1924..1841ebb 100644 --- a/src/styles/style.scss +++ b/src/styles/style.scss @@ -1,3 +1 @@ -@import '_layout.scss'; -@import '_contents.scss'; -@import '_modal.scss'; \ No newline at end of file +@import '_main.scss'; \ No newline at end of file