Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 最小限のトップページを作成 #56

Merged
merged 39 commits into from
Mar 28, 2024
Merged
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
10d2902
hero画像の追加
batora9 Mar 21, 2024
d0cd698
スタイリングがまだ
batora9 Mar 21, 2024
7c6c90a
色を付けたりする
batora9 Mar 21, 2024
e429357
heroImageなど
batora9 Mar 21, 2024
e957f63
max-widthを1080pxにして中央寄せ
batora9 Mar 21, 2024
4b90705
z-indexを100にする
batora9 Mar 21, 2024
1cebd50
主にボタンの位置修正
batora9 Mar 21, 2024
d5a5c49
仮画像をカードの裏に表示
batora9 Mar 23, 2024
759ce3f
等間隔に並べた
batora9 Mar 23, 2024
f0cc8b7
余白を入れた
batora9 Mar 23, 2024
c5cd5ae
otherの配置修正
batora9 Mar 23, 2024
261fd35
半角かっこを使う
batora9 Mar 23, 2024
f7563b4
モバイル版のフォントと画像の位置
batora9 Mar 23, 2024
d0bc0fc
改行するように変更
batora9 Mar 23, 2024
c9c0c6a
クラス名変更
batora9 Mar 23, 2024
f54eebf
headerをすべてのページに適応
batora9 Mar 24, 2024
44a7804
1200px以下でスタイルを変える
batora9 Mar 24, 2024
08fa487
メディアクエリ
batora9 Mar 24, 2024
2543d98
不要なコードの削除
batora9 Mar 24, 2024
22568f2
ホバーした時に色を付ける
batora9 Mar 24, 2024
1ef576c
使ってないコンポーネントを削除
batora9 Mar 24, 2024
9193199
spanとfontsizeの修正
batora9 Mar 24, 2024
eb5a0c2
改行はない方がいいということで
batora9 Mar 24, 2024
98a4ce7
余白と改行の修正
batora9 Mar 24, 2024
6295476
変数でまとめる+不要なコードの削除+boxの縦幅修正
batora9 Mar 24, 2024
3c66e43
整列する
batora9 Mar 24, 2024
c815b9b
clsxを使う
batora9 Mar 25, 2024
d9cd215
format
batora9 Mar 25, 2024
b1c3379
format
batora9 Mar 25, 2024
df4320f
ハイライト前後に空白を入れる
batora9 Mar 26, 2024
6b1bb4a
クラスの削除
batora9 Mar 26, 2024
d263765
共通部分の削除
batora9 Mar 26, 2024
17ebb89
空白の追加
batora9 Mar 26, 2024
90cf3c9
共通部分の削除
batora9 Mar 27, 2024
04217c3
title contentの共通部分の削除
batora9 Mar 27, 2024
2a9bc23
Merge branch 'main' of https://github.com/saitamau-maximum/public-web…
batora9 Mar 28, 2024
2aff0fd
ボタンのレスポンシブ対応
batora9 Mar 28, 2024
0299afd
ボタンのレスポンシブ対応2
batora9 Mar 28, 2024
ecf4f81
スペースが抜けていた
batora9 Mar 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added public/images/hero.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/hero2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 0 additions & 5 deletions src/app/achievements/[slug]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ export async function generateStaticParams() {
return params;
}

interface ResolvingMetadata {
title: string;
description: string;
}

export async function generateMetadata({ params }: Props): Promise<Metadata> {
const { slug } = params;
const filePath = path.join(
Expand Down
6 changes: 5 additions & 1 deletion src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { Metadata } from 'next';
import { Inter } from 'next/font/google';
import './global.css';
import { Header } from '../components/Header/Header';

const inter = Inter({ subsets: ['latin'] });

Expand All @@ -19,7 +20,10 @@ export default function RootLayout({
}>) {
return (
<html lang='ja'>
<body className={inter.className}>{children}</body>
<body className={inter.className}>
<Header />
{children}
</body>
</html>
);
}
366 changes: 366 additions & 0 deletions src/app/page.module.scss
batora9 marked this conversation as resolved.
Show resolved Hide resolved
batora9 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,366 @@
$hovering-color: #7FCC8F;
$span-color: #47B660;
$heroImage-change-width: 1280px;
$header-change-width: 1200px;
$tablet-width: 768px;
$background-color: #F1F1F1;

/* heroImageとヘッダーのpadding調整 */
@media (min-width: $heroImage-change-width) {
.heroImage {
width: 100%;
height: 60vh;
object-fit: cover;
}
}

@media (max-width: $heroImage-change-width) {
.heroImage {
width: 100%;
height: 100%;
object-fit: cover;
}
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved

@media (max-width: $header-change-width) and (min-width: $tablet-width) {
.main {
padding-top: 64px;
flex-direction: column;
background-color: $background-color;
}
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved

@media (min-width: $header-change-width) {
.main {
padding-top: 72px;
flex-direction: column;
background-color: $background-color;
}
}

/* 画面幅が768px以下の場合のスタイル */
@media (max-width: $tablet-width) {
.main {
padding-top: 64px;
flex-direction: column;
background-color: $background-color;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved

.hero {
align-items: center;
justify-content: center;
display: flex;
flex-direction: column;
background-color: $background-color;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved

.heroImage {
width: 100%;
height: 100%;
object-fit: cover;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved

.breadcrumb {
width: 100%;
height: 28px;
background-color: black;
display: flex;
align-items: center;
justify-content: center;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved

.breadcrumbLink {
color: white;
font-size: 0.75rem; // 12px
text-decoration: none;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved

.contents {
width: 100%;
margin: auto;
/* imgBox1のright 0にしたときにはみ出さないようにする */
position: relative;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved

.contentTitle {
margin: 20px;
font-size: 1.25rem; // 20px
font-weight: normal;
border-bottom: 1px solid black;
width: 4em;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved

.aboutText {
margin: 24px;
font-size: 1rem; // 16px
align-items: center;
justify-content: center;
flex-direction: row;
text-align: center;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved

.activityCP {
background-color: white;
flex-direction: column;
width: 80%;
padding: 16px 16px 20% 16px;
box-sizing: border-box;
position: relative;
z-index: 1;
margin: 180px 0px 96px 0px;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved
.activityCPtitle p {
font-size: 0.75rem; // 12px
margin: 0px;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved
.activityCPtitle h2 {
margin-bottom: 0px;
font-size: 1.25rem; // 20px
border-bottom: 1px solid black;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved
.activityCPcontent {
font-size: 1rem; // 16px
margin: 16px 0px;
}
.activityLeftButtonContainer {
position: absolute;
bottom: 0;
transform: translateY(50%);
left: 64px;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved

.activityWeb {
background-color: white;
flex-direction: column;
width: 80%;
padding: 16px 16px 20% 16px;
box-sizing: border-box;
position: relative;
z-index: 1;
margin: 252px 0 128px auto;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved
.activityWebtitle p {
font-size: 0.75rem; // 12px
margin: 0px;
}
.activityWebtitle h2 {
margin-bottom: 0px;
font-size: 1.25rem; // 20px
border-bottom: 1px solid black;
}
.activityWebcontent {
font-size: 1rem; // 16px
margin: 16px 0px;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved
.activityRightButtonContainer {
position: absolute;
bottom: 0;
transform: translateY(50%);
right: 64px;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved

.activityOther {
margin: 44px;
align-items: center;
justify-content: center;
flex-direction: column;
text-align: center;
font-size: 1.25rem; // 20px
position: relative;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved

.activityOtherButtonContainer {
margin: 12px;
}

.txtOther {
position: absolute;
top: -64px;
left: -24px;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved

.imgBox1 {
width: 80%;
aspect-ratio: 300 / 220;
z-index: 0;
background-color: gray;
position: absolute;
right: 0;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved

.imgBox2 {
width: 80%;
aspect-ratio: 300 / 220;
z-index: 0;
background-color: gray;
position: absolute;
}
batora9 marked this conversation as resolved.
Show resolved Hide resolved
}

/* 画面幅が768px以上の場合のスタイル */
@media (min-width:768px) {
batora9 marked this conversation as resolved.
Show resolved Hide resolved
.hero {
align-items: center;
justify-content: center;
display: flex;
flex-direction: column;
background-color: $background-color;
}

.breadcrumb {
width: 100%;
height: 64px;
background-color: black;
display: flex;
align-items: center;
justify-content: center;
}

.breadcrumbLink {
color: white;
font-size: 1.5rem; // 24px
text-decoration: none;
}

.contents {
width: 100%;
max-width: 1080px;
margin: auto;
/* imgBox1のright 0にしたときにはみ出さないようにする */
position: relative;
}

.contentTitle {
margin: 32px;
font-size: 2rem; // 32px
font-weight: normal;
border-bottom: 1px solid black;
width: 4em;
}

.aboutText {
margin: 48px;
font-size: 2rem; // 32px
align-items: center;
justify-content: center;
flex-direction: row;
text-align: center;
}

.activityCP {
background-color: white;
flex-direction: column;
width: 55%;
height: 400px;
padding: 32px;
box-sizing: border-box;
position: relative;
z-index: 1;
margin: 80px 0px 96px 0px;
}
.activityCPtitle p {
font-size: 1.25rem; // 20px
margin: 0px;
}
.activityCPtitle h2 {
margin-bottom: 0px;
font-size: 2rem; // 32px
border-bottom: 1px solid black;
}
.activityCPcontent {
font-size: 1.25rem; // 20px
}
.activityLeftButtonContainer {
position: absolute;
bottom: 0;
transform: translateY(50%);
left: 64px;
}

.activityWeb {
background-color: white;
flex-direction: column;
width: 55%;
height: 400px;
padding: 32px;
box-sizing: border-box;
position: relative;
z-index: 1;
margin: 128px 0 128px auto;
}
.activityWebtitle p {
font-size: 1.25rem; // 20px
margin: 0px;
}
.activityWebtitle h2 {
margin-bottom: 0px;
font-size: 2rem; // 32px
border-bottom: 1px solid black;
}
.activityWebcontent {
font-size: 1.25rem; // 20px
}
.activityRightButtonContainer {
position: absolute;
bottom: 0;
transform: translateY(50%);
right: 64px;
}

.activityOther {
margin: 128px;
align-items: center;
justify-content: center;
flex-direction: column;
text-align: center;
font-size: 1.5rem; // 24px
position: relative;
}

.activityOtherButtonContainer {
margin: 48px;
}

.txtOther {
position: absolute;
top: -64px;
left: -48px;
}

.imgBox1 {
width: 55%;
height: 464px;
z-index: 0;
background-color: gray;
position: absolute;
right: 0;
}

.imgBox2 {
width: 55%;
height: 464px;
z-index: 0;
background-color: gray;
position: absolute;
}
}

/* 共通 */
.container {
display: flex;
flex-direction: column;
height: 100vh;
background-color: $background-color;
}

.breadcrumbLink:hover {
color: $hovering-color;
}

.bold {
font-weight: bold;
}

.span {
color: $span-color;
}
Loading