Skip to content

Commit 3fc96fb

Browse files
Dhruvi16Dhruvi16
committed
Resolve conflicts
2 parents 7cbe3d4 + 475df28 commit 3fc96fb

File tree

6 files changed

+87
-43
lines changed

6 files changed

+87
-43
lines changed

‎content/community/contents.lr

+68-18
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,74 @@ Creative Commons has a large Slack community with sub-communities for tech/devel
1919

2020
Once you join, please introduce yourself in the `#cc-developers` channel.
2121

22-
The channels most relevant to CC's developer community are:
23-
24-
| Channel | Purpose |
25-
| -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
26-
| `#cc-dev-browser-extension` | Discussion related to the [Search browser extension](https://github.com/creativecommons/ccsearch-browser-extension) |
27-
| `#cc-dev-catalog` | Discussion related to the [CC Catalog API](https://api.creativecommons.engineering/) and [Catalog](https://github.com/creativecommons/cccatalog) |
28-
| `#cc-dev-cc-catalog-viz` | [CC Catalog visualizations](https://github.com/creativecommons/cccatalog-dataviz) |
29-
| `#cc-dev-legal-database` | [CC Legal Database](https://labs.creativecommons.org/caselaw/) |
30-
| `#cc-dev-license-chooser` | Discussion related to the [new CC license chooser](https://github.com/creativecommons/cc-chooser) |
31-
| `#cc-dev-linkchecker` | Discussion related to the [CC automated link checker](https://github.com/creativecommons/cc-link-checker) |
32-
| `#cc-dev-vocabulary` | Discussion related to [CC Vocabulary](https://github.com/creativecommons/cc-vocabulary) |
33-
| `#cc-dev-wordpress` | Discussion related to the [CC WordPress plugin](https://github.com/creativecommons/wp-plugin-creativecommons) |
34-
| `#cc-developers` | General technical discussion, new tech blog posts. |
35-
| `#cc-gsoc-outreachy` | General Google Summer of Code and Outreachy related discussion. |
36-
| `#cc-outreachy-platform-toolkit` | Discussion related to the [CC Platform Toolkit](https://github.com/creativecommons/mp) Outreachy project. |
37-
| `#cc-search` | Discussion related to [CC Search](https://search.creativecommons.org/) |
38-
| `#cc-usability` | General usability discussions, seeking feedback on new releases of CC products from the community. |
39-
| `#cc-dev-licenses` | Discussion of the [CC license infrastructure overhaul project](https://github.com/creativecommons/cc-licenses) |
22+
The channels most relevant to CC's developer community are:
23+
24+
<div class="table-container">
25+
<table class="table is-bordered is-striped">
26+
<thead>
27+
<tr>
28+
<th>Channel</th>
29+
<th>Purpose</th>
30+
</tr>
31+
</thead>
32+
<tr>
33+
<td><code>#cc-dev-browser-extension</code></td>
34+
<td>Discussion related to the <a href="https://github.com/creativecommons/ccsearch-browser-extension">Search browser extension.</a></td>
35+
</tr>
36+
<tr>
37+
<td><code>#cc-dev-catalog</code></td>
38+
<td>Discussion related to the <a href="https://api.creativecommons.engineering/">CC Catalog API</a> and <a href="https://github.com/creativecommons/cccatalog">Catalog.</a></td>
39+
</tr>
40+
<tr>
41+
<td><code>#cc-dev-cc-catalog-viz</code></td>
42+
<td><a href="https://github.com/creativecommons/cccatalog-dataviz">CC Catalog visualizations.</a></td>
43+
</tr>
44+
<tr>
45+
<td><code>#cc-dev-legal-database</code></td>
46+
<td><a href="https://labs.creativecommons.org/caselaw/">CC Legal Database.</a></td>
47+
</tr>
48+
<tr>
49+
<td><code>#cc-dev-license-chooser</code></td>
50+
<td>Discussion related to the <a href="https://github.com/creativecommons/cc-chooser">new CC license chooser.</a></td>
51+
</tr>
52+
<tr>
53+
<td><code>#cc-dev-linkchecker</code></td>
54+
<td>Discussion related to the <a href="https://github.com/creativecommons/cc-link-checker">CC automated link checker.</a></td>
55+
</tr>
56+
<tr>
57+
<td><code>#cc-dev-vocabulary</code></td>
58+
<td>Discussion related to the <a href="https://github.com/creativecommons/cc-vocabulary">CC Vocabulary.</a></td>
59+
</tr>
60+
<tr>
61+
<td><code>#cc-dev-wordpress</code></td>
62+
<td>Discussion related to the <a href="https://github.com/creativecommons/wp-plugin-creativecommons">CC WordPress plugin.</a></td>
63+
</tr>
64+
<tr>
65+
<td><code>#cc-developers</code></td>
66+
<td>General technical discussion, new tech blog posts.</td>
67+
</tr>
68+
<tr>
69+
<td><code>#cc-gsoc-outreachy</code></td>
70+
<td>General Google Summer of Code and Outreachy related discussion.</td>
71+
</tr>
72+
<tr>
73+
<td><code>#cc-outreachy-platform-toolkit</code></td>
74+
<td>Discussion related to the <a href="https://github.com/creativecommons/mp">CC Platform Toolkit</a> Outreachy project.</td>
75+
</tr>
76+
<tr>
77+
<td><code>#cc-search</code></td>
78+
<td>Discussion related to the <a href="https://search.creativecommons.org/">CC Search.</a></td>
79+
</tr>
80+
<tr>
81+
<td><code>#cc-usability</code></td>
82+
<td>General usability discussions, seeking feedback on new releases of CC products from the community.</td>
83+
</tr>
84+
<tr>
85+
<td><code>#cc-dev-licenses</code></td>
86+
<td>Discussion related to the <a href="https://github.com/creativecommons/cc-licenses">CC license infrastructure overhaul project.</a></td>
87+
</tr>
88+
</table>
89+
</div>
4090

4191
### Slack Tips
4292
- You will automatically join the `#general` and `#cc-announcements` channels when you sign in to Slack for the first time.

‎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/js/main.js

+12
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,18 @@ $(document).ready(function () {
3232
$(".navbar-item.has-dropdown.is-active").removeClass('is-active');
3333
}
3434
});
35+
36+
// Internal Navigation for table of contents component
37+
let hash = window.location.hash;
38+
if (hash.length > 0) {
39+
$('.menu-list').find('a[href=\"' + hash + '\"]').addClass('is-active');
40+
}
41+
42+
$(window).on('hashchange', function() {
43+
let hash = window.location.hash;
44+
$('.menu-list a[href*="#"]').closest('a').removeClass('is-active');
45+
$('.menu-list').find('a[href=\"' + hash + '\"]').addClass('is-active');
46+
});
3547
});
3648

3749
const getFullyQualifiedUrl = (path, version) => {

‎webpack/sass/main.scss

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

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

476455
.content {
456+
@extend .body-big;
477457
@extend .padding-bottom-xxl;
478-
@extend .padding-top-larger;
458+
@extend .padding-top-xl;
459+
460+
line-height: 1.6875;
479461
}
480462
}
481463
}

0 commit comments

Comments
 (0)