Skip to content

Commit c15ff27

Browse files
Dhruvi16Dhruvi16
committed
Resolve conflicts
2 parents 869936d + d711369 commit c15ff27

File tree

6 files changed

+42
-47
lines changed

6 files changed

+42
-47
lines changed

‎content/contents.lr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ links_product:
3333
<h4 class="heading">Help us build our products</h4>
3434

3535
<div class="list">
36-
<h5 class="link-heading"><a href="https://opensource.creativecommons.org/contributing-code/" class="has-text-forest-green">Contribution Guidelines</a></h5>
36+
<h5 class="link-heading"><a href="/contributing-code/" class="has-text-forest-green">Contribution Guidelines</a></h5>
3737
<p class="link-caption">Learn how to contribute and then get started.</p>
3838

39-
<h5 class="link-heading"><a href="https://opensource.creativecommons.org/community/community-team/" class="has-text-forest-green">Community Team</a></h5>
39+
<h5 class="link-heading"><a href="/community/community-team/" class="has-text-forest-green">Community Team</a></h5>
4040
<p class="link-caption">Become a member of our community volunteer team.</p>
4141

42-
<h5 class="link-heading"><a href="https://opensource.creativecommons.org/contributing-code/projects/" class="has-text-forest-green">All Available Projects</a></h5>
42+
<h5 class="link-heading"><a href="/contributing-code/projects/" class="has-text-forest-green">All Available Projects</a></h5>
4343
<p class="link-caption">See all of our open source projects in one place.</p>
4444
</div>
4545
----

‎content/contributing-code/github-repo-guidelines/contents.lr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ _template: page-with-toc.html
44
---
55
title: GitHub Repo Guidelines
66
---
7+
description: This is a checklist for all public repositories hosted on the [Creative Commons GitHub organization](https://github.com/creativecommons). Not all repositories meet these criteria yet. Please notify us if a project you'd like to work on does not meet this checklist by opening a GitHub issue associated with the repository.
8+
---
79
body:
810

9-
This is a checklist for all public repositories hosted on the [Creative Commons GitHub organization](https://github.com/creativecommons). Not all repositories meet these criteria yet. Please notify us if a project you'd like to work on does not meet this checklist by opening a GitHub issue associated with the repository.
10-
1111
## Required Items
1212
All GitHub repositories should have the following items to be considered fully ready for external contributors.
1313

‎content/contributing-code/pr-guidelines/contents.lr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
_model: page
22
---
3-
_template: page.html
3+
_template: page-with-toc.html
44
---
55
title: Pull Request Guidelines
66
---
7+
description: We ask that contributors to CC projects submit a pull request with your changes. If you're not familiar with pull requests, please read [this GitHub documentation](https://help.github.com/en/articles/about-pull-requests). Here are our expectations for pull requests; following them will expedite the process of merging your code in.
8+
---
79
body:
810

9-
We ask that contributors to CC projects submit a pull request with your changes. If you're not familiar with pull requests, please read [this GitHub documentation](https://help.github.com/en/articles/about-pull-requests). Here are our expectations for pull requests; following them will expedite the process of merging your code in.
10-
1111
Read and follow the contributing guidelines and code of conduct for the project. Here are screenshots of where to find them for [first time contributors](first-time-contributor-resources.png) and [previous contributors](previous-contributor-resources.png).
1212

1313
* **Make A Branch**

‎themes/vocabulary_theme/templates/blog-post.html‎

Lines changed: 1 addition & 1 deletion
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 container">
34+
<div class="single-post-body markdown container">
3535
{{ this.body }}
3636
</div>
3737
<footer class="single-post-footer container">

‎themes/vocabulary_theme/templates/macros/posts.html‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,29 @@
44
<div class="columns is-multiline blog-entries">
55
{% for post in posts %}
66
{% set author = post.parent.parent.children.get('authors').children.get(post.author) %}
7-
<article class="card entry-post horizontal no-border blog-entry column is-one-third">
8-
<header>
9-
<figure class="image blog-image">
10-
{% if author.about %}
11-
{% if author.md5_hashed_email %}
12-
<img class="profile" src="https://secure.gravatar.com/avatar/{{ author.md5_hashed_email }}?size=200" alt="gravatar" />
13-
{% else %}
14-
<img class="profile" src="./blank_profile.svg" alt="gravatar" />
7+
<div class="column is-one-third">
8+
<article class="card entry-post horizontal no-border blog-entry">
9+
<header>
10+
<figure class="image blog-image">
11+
{% if author.about %}
12+
{% if author.md5_hashed_email %}
13+
<img class="profile" src="https://secure.gravatar.com/avatar/{{ author.md5_hashed_email }}?size=200" alt="gravatar" />
14+
{% else %}
15+
<img class="profile" src="./blank_profile.svg" alt="gravatar" />
16+
{% endif %}
1517
{% endif %}
16-
{% endif %}
17-
</figure>
18-
</header>
19-
<div class="blog-content">
20-
<h4 class="b-header"><a class="blog-title" href="{{ post|url }}">{{ post.title }}</a></h4>
21-
<span class="blog-author">by <a href="{{ author|url }}">{{ render_author_name(author) }}</a>
22-
on {{ post.pub_date|dateformat("YYYY-MM-dd") }}</span>
23-
<div class="excerpt">
24-
{{ post.body | excerpt | string | striptags() | truncate(100) }}
18+
</figure>
19+
</header>
20+
<div class="blog-content">
21+
<h4 class="b-header"><a class="blog-title" href="{{ post|url }}">{{ post.title }}</a></h4>
22+
<span class="blog-author">by <a href="{{ author|url }}">{{ render_author_name(author) }}</a>
23+
on {{ post.pub_date|dateformat("YYYY-MM-dd") }}</span>
24+
<div class="excerpt">
25+
{{ post.body | excerpt | string | striptags() | truncate(100) }}
26+
</div>
2527
</div>
26-
</div>
27-
</article>
28+
</article>
29+
</div>
2830
{% endfor %}
2931
</div>
3032
{% endmacro %}

‎webpack/sass/main.scss‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ code {
2828
}
2929

3030
h1,h2,h3,h4,h5,h6 {
31-
@extend .padding-top-large;
32-
@extend .padding-bottom-small;
31+
&:not(:first-of-type) {
32+
@extend .padding-top-large;
33+
@extend .padding-bottom-small;
34+
}
3335
}
3436

3537
ol,ul {
@@ -193,12 +195,16 @@ code {
193195
}
194196

195197
.blog-entries {
198+
.column {
199+
&:not(:nth-last-child(-n+3)) {
200+
border-bottom: 0.1875rem solid $color-light-gray !important;
201+
}
202+
}
203+
196204
.blog-entry {
197205
@extend .padding-vertical-larger;
198206
@extend .padding-horizontal-big;
199207

200-
border-bottom: 0.1875rem solid $color-light-gray !important;
201-
202208
.blog-title {
203209
@extend .has-color-dark-slate-gray;
204210
}
@@ -226,7 +232,7 @@ code {
226232
@extend .padding-top-normal;
227233

228234
.pagination-wrapper {
229-
@extend .padding-top-xl;
235+
@extend .padding-top-normal;
230236
@extend .padding-bottom-xxl;
231237
}
232238
}
@@ -274,22 +280,8 @@ code {
274280
}
275281

276282
.single-post-body {
277-
@extend .body-big;
278283
@extend .padding-top-bigger;
279284

280-
p {
281-
@extend .padding-vertical-small;
282-
}
283-
284-
h1,h2,h3,h4,h5,h6 {
285-
@extend .padding-top-large;
286-
@extend .padding-bottom-small;
287-
}
288-
289-
ol,ul {
290-
@extend .padding-horizontal-big;
291-
}
292-
293285
&:last-of-type::after {
294286
content: '';
295287

@@ -521,6 +513,7 @@ code {
521513

522514
.content {
523515
@extend .padding-bottom-xxl;
516+
@extend .padding-top-larger;
524517
}
525518
}
526519
}

0 commit comments

Comments
 (0)