Skip to content

Commit 57f142e

Browse files
committed
Sync src with origin/master (exclude Korean translations)
1 parent 72a94c8 commit 57f142e

6 files changed

Lines changed: 21 additions & 11 deletions

File tree

src/components/CarbonAds.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ export function CarbonAds({ id }: { id: string }) {
3535
}, [id])
3636

3737
return <div className="carbonAdsContainer" ref={containerRef} />
38-
}
38+
}

src/components/Menu/Menu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function Menu({ pages = [] }: { pages: Pages }) {
7373
</ul>
7474
<div className={styles.ads}>
7575
<CarbonAds id={CARBON_SCRIPT_ID} />
76-
</div>
76+
</div>
7777
</div>
7878
</aside>
7979
)

src/components/Menu/SideMenu.module.css

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
max-width: 230px;
3939
padding: 0;
4040
overflow-y: auto;
41-
height: calc(100vh - 190px);
41+
height: calc(100vh - 600px);
42+
overflow-y: auto;
4243
}
4344

4445
.menu > div > ul > li {
@@ -48,6 +49,10 @@
4849
display: flex;
4950
}
5051

52+
.menu > div > ul > li:last-child {
53+
padding-bottom: 0;
54+
}
55+
5156
.menu > div > ul > li > a {
5257
text-decoration: none;
5358
padding-left: 6px;
@@ -117,6 +122,7 @@
117122
.menu > div > ul {
118123
margin-top: 0;
119124
max-width: 260px;
125+
height: calc(100vh - 450px);
120126
}
121127

122128
.menu > ul {
@@ -203,3 +209,8 @@
203209
.menu ul li a.isActive {
204210
border-bottom: 1px solid var(--color-secondary);
205211
}
212+
213+
.ads {
214+
position: absolute;
215+
height: 500px;
216+
}

src/components/Nav.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ export default function Nav() {
302302
>
303303
{nav.tools.formBuilder}
304304
</Link>
305+
305306
<Link
306307
className={router.pathname == "/dev-tools" ? "active" : ""}
307308
href="/dev-tools"

src/components/layout.css

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -945,11 +945,3 @@ pre[class*="language-"] {
945945
height: auto;
946946
}
947947
}
948-
949-
#carbon-responsive {
950-
margin: 0 auto 50px;
951-
}
952-
953-
#carbon-cover {
954-
margin: 0 auto 50px;
955-
}

src/components/sponsorsList.module.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@
4848
border-radius: 50px;
4949
}
5050

51+
.add {
52+
border: 1px dashed #ccc;
53+
border-radius: 50px;
54+
font-size: 12px;
55+
}
56+
5157
@media (min-width: 768px) {
5258
.logoGroup {
5359
display: grid;

0 commit comments

Comments
 (0)