Skip to content

Commit 7fcbe8e

Browse files
authored
Merge pull request #7 from coderdojo-japan/add-font
[DCJ2025-144] Rounded mplus p2フォントを使えるようにする
2 parents 9ac76d9 + 944ca7b commit 7fcbe8e

File tree

5 files changed

+41
-12
lines changed

5 files changed

+41
-12
lines changed

_includes/top/sections/contact.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<section id="contact">
22
<div class="d-flex flex-column align-items-center text-center">
3-
<h2 class="header-letter-spacing">お問い合わせ</h2>
4-
<p class="fs-4 fw-bold lh-base mb-4">CONTACT</p>
5-
<p class="fs-6 fw-semibold letter-spacing lh-lg mb-5">DojoCon Japan {{ site.year }} についてのお問い合わせは<br>以下のリンク先(Googleフォーム)よりお願いいたします。</p>
3+
<h2 class="title">お問い合わせ</h2>
4+
<p class="subtitle">CONTACT</p>
5+
<p class="text">DojoCon Japan {{ site.year }}についてのお問い合わせは<br>以下のリンク先(Googleフォーム)よりお願いいたします。</p>
66

77
<a href="{{ site.contact }}" class="btn-lg" target="_blank" rel="noopener">お問い合わせフォーム</a>
88
</div>

_sass/global/base.scss

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,24 @@ html {
66
scroll-behavior: smooth;
77
}
88

9+
@font-face {
10+
font-family: 'rounded-l-mplus-2p';
11+
src: url('/assets/fonts/rounded-l-mplus-2p-bold.ttf') format('truetype');
12+
font-weight: bold;
13+
font-style: normal;
14+
}
15+
16+
@font-face {
17+
font-family: 'rounded-l-mplus-2p';
18+
src: url('/assets/fonts/rounded-l-mplus-2p-regular.ttf') format('truetype');
19+
font-weight: normal;
20+
font-style: normal;
21+
}
22+
23+
924
//全体の設定。文字の設定が主である。
1025
body {
11-
font-family: 'Roboto', 'Noto Sans JP', sans-serif;
26+
font-family: 'rounded-l-mplus-2p';
1227
margin: 0;
1328
color: $text-color;
1429
}
@@ -629,4 +644,4 @@ table thead th {
629644
&-gray200 {
630645
background-color: var(--bs-gray-200);
631646
}
632-
}
647+
}

_sass/pages/index.scss

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,32 @@
11
#contact {
2-
.header-letter-spacing {
3-
letter-spacing: 0.2em;
2+
.title {
3+
font-size: 36px;
4+
letter-spacing: 0.125rem;
5+
margin-bottom: 4px;
46
}
5-
.letter-spacing {
6-
letter-spacing: 0.17em;
7+
.subtitle {
8+
font-size: 24px;
9+
letter-spacing: 0.065rem;
10+
margin-bottom: 18px;
11+
font-weight: bold;
12+
}
13+
14+
.text {
15+
font-size: 18px;
16+
letter-spacing: 0.0625rem;
17+
font-weight: bold;
18+
line-height: 2rem;
719
}
820

921
.btn-lg {
22+
margin: 20px 0;
1023
display: block;
1124
box-sizing: border-box;
12-
width: 50%;
25+
width: 70%;
1326
min-width: fit-content;
14-
padding: 0.8rem 1.5rem;
15-
font-size: 1.5rem;
27+
padding: 16px 0;
28+
font-size: 24px;
29+
letter-spacing: 0.0625rem;
1630
font-weight: bold;
1731
color: #0e0e0e;
1832
background-color: #efefef;
3.43 MB
Binary file not shown.
3.25 MB
Binary file not shown.

0 commit comments

Comments
 (0)