diff --git a/pages/_app.tsx b/pages/_app.tsx index fdde915..c3ec2ff 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -4,12 +4,17 @@ import type { AppProps } from 'next/app'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; import '@/styles/globals.css'; +import Script from 'next/script'; const queryClient = new QueryClient(); export default function App({ Component, pageProps }: AppProps) { return ( <> + diff --git a/pages/school-attack/[groupId].tsx b/pages/school-attack/[groupId].tsx index b5c34d3..157b8a0 100644 --- a/pages/school-attack/[groupId].tsx +++ b/pages/school-attack/[groupId].tsx @@ -19,9 +19,14 @@ import { Collapse } from '@/component/Collapse'; import { Button } from '@/component/Button'; import { pallete } from '@/styles/Color'; -import { MainLayout, SystemLayout } from '../../styles/SchoolAttack.styled'; +import { + MainLayout, + SystemLayout, + moveUpDown, +} from '../../styles/SchoolAttack.styled'; import background_main from '@/public/background_main.svg'; +import main_logo from '@/public/main_logo.svg'; import message_square_svg from '@/component/Icon/asset/message-square.svg'; import add_and_share_svg from '@/component/Icon/asset/add-and-share.svg'; import search_white_svg from '@/component/Icon/asset/search-white.svg'; @@ -96,10 +101,6 @@ export default function SchoolAttack() { return ( <> -
-
-
- background_main -
-
+
+ background_main +
+
+ main_logo +
+
{groupId ? (
@@ -427,7 +450,7 @@ const ListItem = ({ {rank} - {diffRank && diffRank > 0 && ( + {diffRank && diffRank !== 0 && (
0 ? ranking_up_svg : ranking_down_svg} diff --git a/public/background_main.svg b/public/background_main.svg index e521477..295e92e 100644 --- a/public/background_main.svg +++ b/public/background_main.svg @@ -6,38 +6,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -46,14 +14,5 @@ - - - - - - - - - diff --git a/public/main_logo.svg b/public/main_logo.svg new file mode 100644 index 0000000..70f6d61 --- /dev/null +++ b/public/main_logo.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/styles/SchoolAttack.styled.ts b/styles/SchoolAttack.styled.ts index 98ebe34..f03d33f 100644 --- a/styles/SchoolAttack.styled.ts +++ b/styles/SchoolAttack.styled.ts @@ -1,3 +1,4 @@ +import { keyframes } from '@emotion/react'; import emotionStyled from '@emotion/styled'; export const SystemLayout = emotionStyled.div` @@ -13,6 +14,7 @@ export const SystemLayout = emotionStyled.div` `; export const MainLayout = emotionStyled.main<{ maxWidth: number }>` + position: relative; display: flex; flex-direction: column; @@ -20,3 +22,12 @@ export const MainLayout = emotionStyled.main<{ maxWidth: number }>` width: 100vw; min-height: 100vh; `; + +export const moveUpDown = keyframes` + 0%, 100% { + transform: translateY(0); + } + 50% { + transform: translateY(-30px); + } +`;