-
Notifications
You must be signed in to change notification settings - Fork 187
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #415 from Pelican-Elegant/fix-docs
Fix docs
- Loading branch information
Showing
54 changed files
with
432 additions
and
474 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,111 +1,3 @@ | ||
# Where do I start? | ||
See our documentation at following link | ||
|
||
Developing Elegant is a community effort, so you are very welcome to help develop it further into the most elegant theme out there. | ||
|
||
The main repository of Elegant is on [GitHub][elegant], which you may fork and then submit pull requests to, in order for them to be merged. | ||
|
||
If you found any issues, or have ideas how to improve the theme, please submit an [issue]. | ||
|
||
Also see issues tagged as [Pull Request Welcome](https://github.com/Pelican-Elegant/elegant/labels/pull%20request%20welcome) – these are issues that are not directly on our roadmap, but if you have time to contribute, we would be very glad to review and accept your pull request. | ||
|
||
If you want to contribute to documentation instead, do so in the [documentation repository][documentation]. Some easy tasks to tackle there are tagged as [Good First Issue](https://github.com/Pelican-Elegant/documentation/labels/good%20first%20issue) | ||
|
||
# Contributing Code | ||
|
||
1. Create a new git branch specific to your changes, instead of making your commits in the master branch. For example, create a branch `fix-issue-119` and add commits to it that fix “issue 119”. | ||
2. Update the [CHANGELOG] | ||
3. Create pull request from your fix branch, say `fix-issue-119`, against `next` branch of Elegant. (We use `master` branch to make new releases. `next` is used for development.) | ||
4. Each pull request should only have a single feature or fix. Do not add multiple features or bug fixes to the same pull request. | ||
5. Squash your commits to reduce noise from commit history. Use your better judgement to decide which commits should stay in the commit history, or consult project maintainers if confused. | ||
6. Have (at least) one other active contributor review your code. | ||
7. Once at least one code reviewer has approved it, it will can be merged. | ||
|
||
## Git Tips for Newcomers | ||
|
||
Here are some tips on how to make your life with Git easier when contributing. | ||
|
||
### How To Set Up Your Git | ||
|
||
1. Create a fork of the [Elegant repository][elegant] by clicking on the “Fork” button. | ||
2. Clone your fork to your computer by clicking on the “Clone or download” button and following the instructions there. | ||
3. When in the Git repository of your fork, run the following command to set the main repository as the upstream: `git remote add upstream https://github.com/Pelican-Elegant/pelican-elegant.git` | ||
|
||
### Updating/Rebasing to Upstream | ||
|
||
Occasionally – often before a pull request is able to be merged – you will need to update your own (fork) repository to the upstream (i.e. [Elegant][elegant]) development (i.e. `next`) branch. This can be done as follows: | ||
|
||
1. `git fetch upstream next` | ||
2. `git rebase upstream/next` | ||
|
||
### Squash Commits & More Complex Rebasing | ||
|
||
When creating a pull request in GitHub, you have the option to squash all commits, but sometimes you need to fix either the mess you made or some clashes that prevent a merge of the two branches. | ||
|
||
In both cases, the following command is your Swiss-army knife: | ||
|
||
`git rebase --interactive upstream/master` | ||
|
||
For more on the interactive rebase command of Git, see [its official documentation][git_rebase]. | ||
|
||
[git_rebase]: https://git-scm.com/docs/user-manual#interactive-rebase | ||
|
||
# New Features and Styles | ||
|
||
If you plan to add new features to the theme, please make sure that: | ||
|
||
- you set sensible defaults so the theme works out of the box, without forcing the user to set any variable | ||
- your changes do not negatively effect readability and reading experience | ||
- your changes do not cause distraction for the reader | ||
- any bigger features should go through the voting process (see below) | ||
|
||
# Code style | ||
|
||
Please make sure to follow the code style of the existing code base. | ||
|
||
Specifically: | ||
|
||
## Code/Template Formatting Rules | ||
|
||
- use single (`''`) rather than double (`""`) quotation marks for Jinja strings | ||
- in Jinja print statements, surround the variable with spaces inside curly braces – for example: `{{ foo.bar }}` | ||
- use double (`""`) quotation marks around HTML attributes | ||
- end files with a newline | ||
|
||
## CSS Formatting Rules | ||
|
||
- font name’s first letter should be capital | ||
- add a space after comma | ||
- declarations should be sorted alphabetically | ||
- use a single space between the last selector and the opening brace that begins the declaration block | ||
- group together related classes and identities | ||
- add a space after colon | ||
- remove leading 0s | ||
- remove unit specification after 0 values | ||
- use three-digit Hex notation for colors wherever possible | ||
- use hyphen `-` instead of underscore `_` in class and identity names | ||
|
||
Refer to [Google's HTML/CSS Style Guide][google_style_guide] for all other formatting rules. | ||
|
||
# Voting Process | ||
|
||
Any new features, bigger changes, decisions on what should constitute the next milestone or wider goals etc. should go through a vote, as follows. | ||
|
||
1. Open a new issue to describe it and to kick-start a discussion. | ||
1. As soon as a suggestion (or several) are set in place, set a deadline, no shorter than 10 days. Also at this stage tag the issue with the “vote” label. | ||
1. People can vote with the :+1: and :-1: emoji on individual suggestions. Anyone may cast votes for as many suggestions as they want. | ||
1. At the end of the deadline, the suggestion with most votes (= № of :+1: - № of :-1:) is taken. | ||
|
||
# Licensing (Inbound=Outbound) | ||
|
||
All contributions will be understood to be made under the same (inbound) license as the main (outbound) license of the repository it is being contributed to – so [MIT License][] for all [code/theme][elegant] contributions, and [CC-BY-SA-3.0][] for all [documentation][] contributions. | ||
|
||
If you are contributing code that is not yours, make sure to indicate where you got the code from (and who the author/copyright holder is) and what license you got it under. | ||
|
||
[cc-by-sa-3.0]: https://spdx.org/licenses/CC-BY-SA-3.0.html | ||
[changelog]: https://github.com/Pelican-Elegant/elegant/blob/master/CHANGELOG.md | ||
[contributing]: ./CONTRIBUTING.md | ||
[documentation]: https://github.com/Pelican-Elegant/documentation | ||
[elegant]: https://github.com/Pelican-Elegant/elegant | ||
[google_style_guide]: https://google.github.io/styleguide/htmlcssguide.html | ||
[issue]: https://github.com/Pelican-Elegant/elegant/issues/ | ||
[mit license]: https://spdx.org/licenses/MIT.html | ||
http://localhost:9000/categories.html#contributing-ref |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
documentation/content/Code Snippets/custome-syntax-theme.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
--- | ||
Title: Change Syntax Highlight Theme | ||
Tags: unique | ||
Date: 2019-07-03 20:18 | ||
Slug: change-syntax-highlight-theme | ||
Category: Code Snippets | ||
authors: Talha Mansoor | ||
--- | ||
|
||
Elegant uses [Solarized theme](http://ethanschoonover.com/solarized) for syntax | ||
highlighting. To replace it, copy contents of your preferred theme's CSS style | ||
sheet into `custom.css`. | ||
|
||
Alternatively, you can replace contents of `pygments.css` with your theme's | ||
style sheet. | ||
|
||
If you feel like experimenting with different themes then [this | ||
repository](https://github.com/uraimo/pygments-vimstyles) has Pygments CSS of | ||
Vim themes. [This one](https://github.com/richleland/pygments-css) has Pygments | ||
CSS of built-in styles. Do not forget to change `.codehilite` CSS class | ||
identifier to `.highlight`. Code blocks in Pelican generated HTML use | ||
`.highlight` class. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
--- | ||
Title: Contributing New Features | ||
Date: 2019-07-03 22:17 | ||
Slug: contributing-new-features | ||
Category: Contributing | ||
authors: Talha Mansoor | ||
--- | ||
|
||
If you plan to add new features to the theme, please make sure that: | ||
|
||
- you set sensible defaults so the theme works out of the box, without forcing the user to set any variable | ||
- your changes do not negatively effect readability and reading experience | ||
- your changes do not cause distraction for the reader |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
--- | ||
Title: Git Tips for Beginners | ||
Date: 2019-07-03 21:57 | ||
Slug: git-tips-for-beginners | ||
Category: Contributing | ||
--- | ||
|
||
Here are some tips on how to make your life with Git easier when contributing. | ||
|
||
## How To Set Up Your Git | ||
|
||
1. Create a fork of the [Elegant repository][elegant] by clicking on the “Fork” button. | ||
2. Clone your fork to your computer by clicking on the “Clone or download” button and following the instructions there. | ||
3. When in the Git repository of your fork, run the following command to set the main repository as the upstream: `git remote add upstream https://github.com/Pelican-Elegant/pelican-elegant.git` | ||
|
||
## Updating/Rebasing to Upstream | ||
|
||
Occasionally – often before a pull request is able to be merged – you will need to update your own (fork) repository to the upstream (i.e. [Elegant][elegant]) development (i.e. `next`) branch. This can be done as follows: | ||
|
||
1. `git fetch upstream next` | ||
2. `git rebase upstream/next` | ||
|
||
## Squash Commits & More Complex Rebasing | ||
|
||
When creating a pull request in GitHub, you have the option to squash all commits, but sometimes you need to fix either the mess you made or some clashes that prevent a merge of the two branches. | ||
|
||
In both cases, the following command is your Swiss-army knife: | ||
|
||
`git rebase --interactive upstream/master` | ||
|
||
For more on the interactive rebase command of Git, see [its official documentation][git_rebase]. | ||
|
||
[git_rebase]: https://git-scm.com/docs/user-manual#interactive-rebase | ||
[elegant]: https://github.com/Pelican-Elegant/elegant |
2 changes: 1 addition & 1 deletion
2
...Announcements/community-driven-project.md → .../Contributing/community-driven-project.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
documentation/content/Contributing/contributing-license.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
--- | ||
Title: Contributions Licesne | ||
Date: 2019-07-03 22:07 | ||
Slug: contribution-license | ||
Category: Contributing | ||
--- | ||
|
||
All contributions will be understood to be made under the same (inbound) license as the main (outbound) license of the repository it is being contributed to – so [MIT License][] for all code/theme contributions, and [CC-BY-SA-3.0][] for all documentation contributions. | ||
|
||
If you are contributing code that is not yours, make sure to indicate where you got the code from (and who the author/copyright holder is) and what license you got it under. | ||
|
||
[cc-by-sa-3.0]: https://spdx.org/licenses/CC-BY-SA-3.0.html | ||
[documentation]: https://github.com/Pelican-Elegant/documentation | ||
[elegant]: https://github.com/Pelican-Elegant/elegant | ||
[mit license]: https://spdx.org/licenses/MIT.html |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
--- | ||
Title: Invitation to participate | ||
Date: 2019-07-03 20:07 | ||
Slug: invitation-to-participate | ||
Category: Contributing | ||
--- | ||
|
||
Our brand new documentation website [elegant.onCrashReboot.com][elegant-home] is a great demo for the theme. | ||
|
||
If you like the theme and would like to contribute to Elegant, you are most welcome to do so. Even though Pelican is written in Python, no coding skills are needed to help out with Elegant, as themes consist mostly of [Jinja][] templates, CSS and HTML. It is honestly very easily to get into. | ||
|
||
If you want to help out, but have no idea where to start, we keep a list of [low-priority features that are just waiting for you to pick up][pr_welcome]. | ||
|
||
Another way to contribute is to help with the [documentation][docs]. We are keeping a list of [good first issues][docs_first] for newbies to get involved – these are easy to tackle, but in no way less helpful. | ||
|
||
And, of course, reporting bugs and filing feature requests to further improve Elegant (and its documentation), is also welcome. | ||
|
||
[jinja]: http://jinja.pocoo.org/ | ||
[pr_welcome]: https://github.com/Pelican-Elegant/elegant/labels/pull%20request%20welcome | ||
[docs]: https://github.com/Pelican-Elegant/elegant/tree/master/documentation | ||
[docs_first]: https://github.com/Pelican-Elegant/elegant/issues?q=is%3Aopen+is%3Aissue+label%3A%22project+documentation%22 | ||
[elegant-home]: https://elegant.oncrashreboot.com |
Oops, something went wrong.