Skip to content

Commit ba4a370

Browse files
authored
Merge pull request creativecommons#359 from creativecommons/fix_content
Replace markdown with content
2 parents 72b92a7 + fe0640a commit ba4a370

File tree

4 files changed

+7
-25
lines changed

4 files changed

+7
-25
lines changed

themes/vocabulary_theme/templates/blog-post.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ <h2 class="title">{{ this.title }}</h2>
3131
{% endif %}
3232
</div>
3333
</header>
34-
<div class="single-post-body markdown container">
34+
<div class="single-post-body content container">
3535
{{ this.body }}
3636
</div>
3737
<footer class="single-post-footer container">

themes/vocabulary_theme/templates/cc-search-guide.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h4 class="step-header">Steps</h4>
2424
</ul>
2525
</div>
2626
</div>
27-
<div class="column markdown content">
27+
<div class="column content">
2828
{{ this.body }}
2929
</div>
3030
</div>

themes/vocabulary_theme/templates/page-with-toc.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ <h4 class="b-header">On this page</h4>
105105
</aside>
106106
</div>
107107
</div>
108-
<div class="column markdown content">
108+
<div class="column content">
109109
{{ this.body }}
110110
</div>
111111
</div>

webpack/sass/main.scss

+4-22
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,6 @@ code {
1313
border-radius: 0.25rem;
1414
}
1515

16-
.markdown {
17-
@extend .body-big;
18-
19-
line-height: 1.6875;
20-
21-
p {
22-
@extend .padding-vertical-small;
23-
}
24-
25-
h1,h2,h3,h4,h5,h6 {
26-
&:not(:first-of-type) {
27-
@extend .padding-top-large;
28-
@extend .padding-bottom-small;
29-
}
30-
}
31-
32-
ol,ul {
33-
@extend .padding-horizontal-big;
34-
}
35-
}
36-
3716
.navbar-item {
3817
&.has-dropdown {
3918
.navbar-dropdown {
@@ -505,8 +484,11 @@ code {
505484
}
506485

507486
.content {
487+
@extend .body-big;
508488
@extend .padding-bottom-xxl;
509-
@extend .padding-top-larger;
489+
@extend .padding-top-xl;
490+
491+
line-height: 1.6875;
510492
}
511493
}
512494
}

0 commit comments

Comments
 (0)