Skip to content

Commit 74085bc

Browse files
committed
resolve merge conflict
1 parent 0b4fc95 commit 74085bc

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

_layouts/post.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="container">
1212
<div class="post__headline common-headline">
1313
<h5>{{ page.date | date: '%A, %B %-d, %Y' }}</h5>
14-
<h1>{{ page.title | strip_html }}</h1>
14+
<h1>{{ page.title | strip_html }}</h2>
1515
{% if page.author %}
1616
<h6>Posted by {{ page.author }}</h6>
1717
{% endif %}

_sass/modules/_post.scss

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,19 @@
1313
text-align: center;
1414

1515
h1 {
16-
font-size: 55px;
17-
line-height: 52px;
16+
color: $color-red;
17+
font-size: 39px;
18+
@media (max-width: 800px) {
19+
font-size: 32px;
20+
}
21+
@media (max-width: 600px) {
22+
font-size: 28px;
23+
}
24+
font-weight: 700;
25+
letter-spacing: -0.01em;
26+
line-height: 38px;
1827
}
19-
28+
2029
h5 {
2130
margin-bottom: 16px;
2231
}

0 commit comments

Comments
 (0)