Skip to content

Commit fe8a9f4

Browse files
authored
Merge pull request #2650 from codecrafters-io/pk-branch-1
refactor: improve layout and styling of concept page
2 parents 72502d5 + a33e57b commit fe8a9f4

File tree

2 files changed

+40
-46
lines changed

2 files changed

+40
-46
lines changed

app/components/concept-page/content.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<div class="container mx-auto lg:max-w-screen-lg px-3 md:px-6">
2121
<div class="flex flex-col-reverse items-stretch md:flex-row">
22-
<div class="md:pr-8 pt-10 pb-[75vh] min-w-0 flex-grow">
22+
<div class="md:pr-8 pt-6 md:pt-10 pb-[75vh] min-w-0 flex-grow">
2323
<Concept @concept={{@concept}} @latestConceptEngagement={{@latestConceptEngagement}} />
2424

2525
{{#animated-if this.hasCompletedConcept}}
+39-45
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,45 @@
1-
{{! @glint-nocheck: not typesafe yet }}
2-
<div class="py-10 md:py-20 border-b code-walkthrough-header-background">
1+
<div class="py-5 md:py-10 border-b code-walkthrough-header-background">
32
<div class="container mx-auto lg:max-w-screen-lg px-3 md:px-6">
4-
<div class="flex items-center justify-between">
5-
<div>
6-
<div class="text-gray-400 uppercase text-xs font-bold tracking-wider mb-2">
7-
CONCEPT
8-
</div>
9-
<h1 class="text-gray-800 text-2xl md:text-5xl font-bold mb-4">
10-
{{@concept.title}}
11-
</h1>
12-
<div class="text-gray-600 max-w-xl leading-relaxed mb-4">
13-
{{markdown-to-html @concept.descriptionMarkdown}}
14-
</div>
15-
<a
16-
href={{or @concept.author.githubProfileUrl "https://github.com/rohitpaulk"}}
17-
class="inline-flex gap-x-2 items-center"
18-
target="_blank"
19-
rel="noopener noreferrer"
20-
>
21-
<img
22-
alt="avatar"
23-
src={{or @concept.author.avatarUrl "https://github.com/rohitpaulk.png"}}
24-
class="w-12 h-12 filter drop-shadow-sm ring-1 ring-white rounded-full shadow brightness-110"
25-
/>
26-
<div>
27-
<div class="text-gray-700 text-xs font-bold mb-0.5">
28-
{{or @concept.author.username "Paul Kuruvilla"}}
29-
</div>
30-
<div class="text-gray-500 text-xs">
31-
{{#if @concept.author}}
32-
Concept Author
33-
{{else}}
34-
CTO, CodeCrafters
35-
{{/if}}
36-
</div>
37-
</div>
38-
</a>
3+
<div class="flex flex-col items-start">
4+
<div class="text-gray-400 uppercase text-xs font-bold tracking-wider mb-1 md:mb-1.5">
5+
CONCEPT
396
</div>
40-
<div class="self-start">
41-
<div class="w-40 ml-4 hidden md:block">
42-
{{!-- <img alt="Walkthrough" src={{@codeWalkthrough.logoURL}} /> --}}
43-
</div>
7+
<h1 class="text-gray-800 text-xl md:text-4xl font-bold mb-1 md:mb-2">
8+
{{@concept.title}}
9+
</h1>
10+
<div class="text-gray-600 max-w-xl leading-relaxed text-sm md:text-base mb-2 md:mb-4">
11+
{{markdown-to-html @concept.descriptionMarkdown}}
4412
</div>
45-
</div>
13+
<a
14+
href={{or @concept.author.githubProfileUrl "https://github.com/rohitpaulk"}}
15+
class="inline-flex gap-x-2 items-center"
16+
target="_blank"
17+
rel="noopener noreferrer"
18+
>
19+
<img
20+
alt="avatar"
21+
src={{or @concept.author.avatarUrl "https://github.com/rohitpaulk.png"}}
22+
class="w-12 h-12 filter drop-shadow-sm ring-1 ring-white rounded-full shadow brightness-110"
23+
/>
24+
<div>
25+
<div class="text-gray-700 text-xs font-bold mb-0.5">
26+
{{or @concept.author.username "Paul Kuruvilla"}}
27+
</div>
28+
<div class="text-gray-500 text-xs">
29+
{{#if @concept.author}}
30+
Concept Author
31+
{{else}}
32+
CTO, CodeCrafters
33+
{{/if}}
34+
</div>
35+
</div>
36+
</a>
4637

47-
{{#if (or (current-user-is-concept-author @concept) (current-user-is-staff))}}
48-
<TertiaryLinkButton @size="small" @route="concept-admin" class="mt-4" target="_blank">Edit Concept</TertiaryLinkButton>
49-
{{/if}}
38+
{{#if (or (current-user-is-concept-author @concept) (current-user-is-staff))}}
39+
<div class="mt-4">
40+
<TertiaryLinkButton @size="small" @route="concept-admin" target="_blank">Edit Concept</TertiaryLinkButton>
41+
</div>
42+
{{/if}}
43+
</div>
5044
</div>
5145
</div>

0 commit comments

Comments
 (0)