Skip to content

Commit 99d3260

Browse files
authored
Merge pull request #299 from topcoder-platform/TCA-413_learn-homepage-header
TCA-458 learn homepage header
2 parents 8d89e85 + 0675ff5 commit 99d3260

File tree

5 files changed

+46
-11
lines changed

5 files changed

+46
-11
lines changed

src-ts/tools/learn/learn-lib/wave-hero/WaveHero.module.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020
}
2121
}
22-
22+
2323
&-inner {
2424
padding: calc($space-xxxxl + $space-sm) 0 $space-lg;
2525
@include contentWidth;
@@ -47,13 +47,13 @@
4747
flex-direction: column;
4848
}
4949
}
50-
50+
5151
&-card-col {
5252
flex: 0 0 auto;
5353
}
54-
54+
5555
&-text {
5656
@extend .body-medium-normal;
57-
margin-top: $space-xxl;
57+
margin-top: $space-sm;
5858
}
5959
}

src-ts/tools/learn/learn-lib/wave-hero/WaveHero.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ interface WaveHeroProps {
77
children?: ReactNode
88
text: string
99
theme?: 'light'
10-
title: string
10+
title: ReactNode
1111
}
1212

1313
const WaveHero: FC<WaveHeroProps> = (props: WaveHeroProps) => {

src-ts/tools/learn/welcome/WelcomePage.module.scss

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
@import '../../../lib/styles/includes';
22

33
.hero-wrap {
4+
svg:global(.tca-logo) {
5+
margin-bottom: $space-xxl;
6+
max-width: calc(100% - 70px);
7+
}
8+
49
:global(.hero-card-col) {
510
width: 43.5%;
611
max-width: 600px;
7-
12+
813
@include ltemd {
914
width: 100%;
1015
max-width: none;
@@ -15,7 +20,7 @@
1520
.courses-section {
1621
padding: $space-xxxxl 0;
1722
position: relative;
18-
23+
1924
@include ltemd {
2025
padding-top: $space-xxl;
2126
}
@@ -38,12 +43,12 @@
3843
@include ltelg {
3944
grid-template-columns: repeat(2, 1fr);
4045
}
41-
46+
4247
@media (max-width: 576px) {
4348
grid-template-columns: repeat(1, 1fr);
4449
}
45-
50+
4651
@include ltemd {
4752
margin-top: $space-xxl;
4853
}
49-
}
54+
}

src-ts/tools/learn/welcome/WelcomePage.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313

1414
import { CoursesCard } from './courses-card'
1515
import { ProgressBlock } from './progress-block'
16+
import { ReactComponent as TcAcademyFullLogoSvg } from './tca-full-logo.svg'
1617
import styles from './WelcomePage.module.scss'
1718

1819
const WelcomePage: FC<{}> = () => {
@@ -30,7 +31,12 @@ const WelcomePage: FC<{}> = () => {
3031
<Portal portalId='page-subheader-portal-el'>
3132
<div className={styles['hero-wrap']}>
3233
<WaveHero
33-
title='Welcome to Topcoder ACADEMY'
34+
title={(
35+
<>
36+
<TcAcademyFullLogoSvg className='tca-logo' />
37+
Welcome!
38+
</>
39+
)}
3440
text={`
3541
The Topcoder Academy will provide you with learning opportunities
3642
in the form of guided learning paths.
Lines changed: 24 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)