Skip to content

Commit 6b8cdca

Browse files
authored
Merge branch 'main' into add_reactivity_menu
2 parents 14ed8f1 + 91e00f9 commit 6b8cdca

File tree

131 files changed

+4145
-10058
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+4145
-10058
lines changed

.github/CODEOWNERS

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
# These owners will be the default owners for everything in
2-
# the repo. Unless a later match takes precedence, they will
3-
# be requested for review when someone opens a pull request.
4-
* @creativecommons/engineering @creativecommons/ct-cc-open-source-core-committers @creativecommons/ct-cc-open-source-collaborators
5-
6-
# These users own any files in the specified directory and
7-
# any of its subdirectories.
8-
/webpack/ @creativecommons/frontend-engineers
9-
* @creativecommons/ct-cc-open-source-maintainers
1+
# https://help.github.com/en/articles/about-code-owners
2+
# If you want to match two or more code owners with the same pattern, all the
3+
# code owners must be on the same line. If the code owners are not on the same
4+
# line, the pattern matches only the last mentioned code owner.
5+
* @creativecommons/technology @creativecommons/ct-cc-open-source-core-committers @creativecommons/ct-cc-open-source-maintainers

.github/workflows/lektor-build-deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ jobs:
44
build-and-deploy:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v1
7+
- uses: actions/checkout@v2
88
- name: setup python version
9-
uses: actions/setup-python@v1
9+
uses: actions/setup-python@v3
1010
with:
1111
python-version: 3.9
1212
- name: Install dependencies
@@ -15,6 +15,6 @@ jobs:
1515
pipenv sync
1616
pipenv run lektor build -f webpack
1717
- name: Deploy to production
18-
if: github.ref == 'refs/heads/master'
18+
if: github.ref == 'refs/heads/main'
1919
run: |
2020
pipenv run lektor deploy ghpages --username ${{ secrets.LEKTOR_DEPLOY_USERNAME }} --password ${{ secrets.LEKTOR_DEPLOY_PASSWORD }}

.lektorproject

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ lektor-disqus-comments = 0.4.1
1313
lektor-google-analytics = 0.1.3
1414
lektor-markdown-excerpt = 0.1
1515
lektor-markdown-header-anchors = 0.3.1
16-
lektor-markdown-highlighter = 0.3.1
16+
lektor-markdown-highlighter = 0.3.2
1717
lektor-strip-html-tags = 0.3.1
18-
lektor-webpack-support = 0.5
18+
lektor-webpack-support = 0.6

CODE_OF_CONDUCT.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Contributor Code of Conduct
22

3-
The Creative Commons team is committed to fostering a welcoming community. This project and all other Creative Commons open source projects are governed by our [Code of Conduct](https://creativecommons.github.io/community/code-of-conduct/). Please report unacceptable behavior to [conduct@creativecommons.org](mailto:conduct@creativecommons.org) per our [reporting guidelines](https://creativecommons.github.io/community/code-of-conduct/enforcement/).
3+
The Creative Commons team is committed to fostering a welcoming community. This
4+
project and all other Creative Commons open source projects are governed by our
5+
[Code of Conduct][code_of_conduct]. Please report unacceptable behavior to
6+
[conduct@creativecommons.org](mailto:conduct@creativecommons.org) per our
7+
[reporting guidelines][reporting_guide].
48

5-
For a history of updates, see the [page history here](https://github.com/creativecommons/creativecommons.github.io-source/commits/master/content/community/code-of-conduct/contents.lr).
9+
For a history of updates, see the [page history here][updates].
10+
11+
[code_of_conduct]: https://opensource.creativecommons.org/community/code-of-conduct/
12+
[reporting_guide]: https://opensource.creativecommons.org/community/code-of-conduct/enforcement/
13+
[updates]: https://github.com/creativecommons/creativecommons.github.io-source/commits/main/content/community/code-of-conduct/contents.lr

CONTRIBUTING.md

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,34 @@
11
# Contributing to CC Open Source
22

3-
Thank you for your interest in contributing to CC Open Source! This document is a set of guidelines to help you contribute to this project.
3+
Thank you for your interest in contributing to CC Open Source! This document is
4+
a set of guidelines to help you contribute to this project.
5+
46

57
## Code of Conduct
68

7-
By participating in this project, you are expected to uphold our [Code of Conduct](https://creativecommons.github.io/community/code-of-conduct/).
9+
By participating in this project, you are expected to uphold our [Code of
10+
Conduct][code_of_conduct].
11+
12+
[code_of_conduct]: https://opensource.creativecommons.org/community/code-of-conduct/
13+
814

915
## Project Documentation
1016

11-
The `README` contains details about how to install and build this project and a high-level overview of the code.
17+
The `README` in the root of the repository should contain or link to project
18+
documentation. If you cannot find the documentation you're looking for, please
19+
file a GitHub issue with details of what you'd like to see documented.
1220

13-
## How to Contribute
1421

15-
Please follow the processes in our general [Contributing Code](https://creativecommons.github.io/contributing-code/) guidelines on the Creative Common Open Source website.
22+
## How to Contribute
1623

17-
You do not have to follow the steps under "Check for contribution readiness", this project is accepting contributions.
24+
Please follow the processes in our general [Contributing Code][contributing]
25+
guidelines on the Creative Common Open Source website.
1826

19-
## Style Guide
27+
[contributing]: https://opensource.creativecommons.org/contributing-code/
2028

21-
- Make sure that there are newlines at the end of every file.
22-
- We use 2 spaces as the standard indentation in our HTML files.
2329

2430
## Questions or Thoughts?
2531

26-
Talk to us on [our developer mailing list or Slack community](https://creativecommons.github.io/community/).
32+
Talk to us on [one of our community forums][community].
33+
34+
[community]: https://opensource.creativecommons.org/community/

0 commit comments

Comments
 (0)