-
Notifications
You must be signed in to change notification settings - Fork 186
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into rellinks-classes
- Loading branch information
Showing
16 changed files
with
488 additions
and
381 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
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 |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| __version_info__ = (0, 7, 10) | ||
| __version__ = '.'.join(map(str, __version_info__)) | ||
| __version_info__ = (0, 7, 12) | ||
| __version__ = ".".join(map(str, __version_info__)) |
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 |
|---|---|---|
| @@ -1,9 +1,28 @@ | ||
| {% if theme_gratipay_user or theme_gittip_user %} | ||
| <h3>Donate</h3> | ||
| {# TODO: wrap all these in their own divs for easier styling #} | ||
|
|
||
| {% if theme_donate_url or theme_opencollective or theme_tidelift_url %} | ||
| <h3 class="donation">Donate/support</h3> | ||
| {% endif %} | ||
|
|
||
| {% if theme_donate_url %} | ||
| <p> | ||
| <a class="badge" href="{{ theme_donate_url }}"> | ||
| <img src="https://img.shields.io/badge/donate-%E2%9D%A4%C2%A0-ff69b4.svg?style=flat" alt="Donate"> | ||
| </a> | ||
| </p> | ||
| {% endif %} | ||
|
|
||
| {% if theme_opencollective %} | ||
| <p> | ||
| <a class="badge" href="https://opencollective.com/{{ theme_opencollective }}/donate" target="_blank"> | ||
| <img src="https://opencollective.com/{{ theme_opencollective }}/donate/button.png?color={{ theme_opencollective_button_color }}" width=300 /> | ||
| </a> | ||
| </p> | ||
| {% endif %} | ||
|
|
||
| {% if theme_tidelift_url %} | ||
| <p> | ||
| Consider supporting the authors on <a href="https://www.gratipay.com/">Gratipay</a>: | ||
| <script data-gratipay-username="{{ theme_gratipay_user or theme_gittip_user }}" | ||
| data-gratipay-widget="button" | ||
| src="//gttp.co/v1.js"></script> | ||
| Professionally-supported {{ project }} is available with the | ||
| <a href="{{ theme_tidelift_url }}">Tidelift Subscription</a>. | ||
| </p> | ||
| {% endif %} |
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 |
|---|---|---|
| @@ -1,88 +1,91 @@ | ||
| # flake8: noqa | ||
|
|
||
| from pygments.style import Style | ||
| from pygments.token import Keyword, Name, Comment, String, Error, \ | ||
| Number, Operator, Generic, Whitespace, Punctuation, Other, Literal | ||
| from pygments.token import ( | ||
| Keyword, | ||
| Name, | ||
| Comment, | ||
| String, | ||
| Error, | ||
| Number, | ||
| Operator, | ||
| Generic, | ||
| Whitespace, | ||
| Punctuation, | ||
| Other, | ||
| Literal, | ||
| ) | ||
|
|
||
|
|
||
| # Originally based on FlaskyStyle which was based on 'tango'. | ||
| class Alabaster(Style): | ||
| background_color = "#f8f8f8" # doesn't seem to override CSS 'pre' styling? | ||
| background_color = "#f8f8f8" # doesn't seem to override CSS 'pre' styling? | ||
| default_style = "" | ||
|
|
||
| styles = { | ||
| # No corresponding class for the following: | ||
| #Text: "", # class: '' | ||
| Whitespace: "underline #f8f8f8", # class: 'w' | ||
| Error: "#a40000 border:#ef2929", # class: 'err' | ||
| Other: "#000000", # class 'x' | ||
|
|
||
| Comment: "italic #8f5902", # class: 'c' | ||
| Comment.Preproc: "noitalic", # class: 'cp' | ||
|
|
||
| Keyword: "bold #004461", # class: 'k' | ||
| Keyword.Constant: "bold #004461", # class: 'kc' | ||
| Keyword.Declaration: "bold #004461", # class: 'kd' | ||
| Keyword.Namespace: "bold #004461", # class: 'kn' | ||
| Keyword.Pseudo: "bold #004461", # class: 'kp' | ||
| Keyword.Reserved: "bold #004461", # class: 'kr' | ||
| Keyword.Type: "bold #004461", # class: 'kt' | ||
|
|
||
| Operator: "#582800", # class: 'o' | ||
| Operator.Word: "bold #004461", # class: 'ow' - like keywords | ||
|
|
||
| Punctuation: "bold #000000", # class: 'p' | ||
|
|
||
| # Text: "", # class: '' | ||
| Whitespace: "underline #f8f8f8", # class: 'w' | ||
| Error: "#a40000 border:#ef2929", # class: 'err' | ||
| Other: "#000000", # class 'x' | ||
| Comment: "italic #8f5902", # class: 'c' | ||
| Comment.Preproc: "noitalic", # class: 'cp' | ||
| Keyword: "bold #004461", # class: 'k' | ||
| Keyword.Constant: "bold #004461", # class: 'kc' | ||
| Keyword.Declaration: "bold #004461", # class: 'kd' | ||
| Keyword.Namespace: "bold #004461", # class: 'kn' | ||
| Keyword.Pseudo: "bold #004461", # class: 'kp' | ||
| Keyword.Reserved: "bold #004461", # class: 'kr' | ||
| Keyword.Type: "bold #004461", # class: 'kt' | ||
| Operator: "#582800", # class: 'o' | ||
| Operator.Word: "bold #004461", # class: 'ow' - like keywords | ||
| Punctuation: "bold #000000", # class: 'p' | ||
| # because special names such as Name.Class, Name.Function, etc. | ||
| # are not recognized as such later in the parsing, we choose them | ||
| # to look the same as ordinary variables. | ||
| Name: "#000000", # class: 'n' | ||
| Name.Attribute: "#c4a000", # class: 'na' - to be revised | ||
| Name.Builtin: "#004461", # class: 'nb' | ||
| Name.Builtin.Pseudo: "#3465a4", # class: 'bp' | ||
| Name.Class: "#000000", # class: 'nc' - to be revised | ||
| Name.Constant: "#000000", # class: 'no' - to be revised | ||
| Name.Decorator: "#888", # class: 'nd' - to be revised | ||
| Name.Entity: "#ce5c00", # class: 'ni' | ||
| Name.Exception: "bold #cc0000", # class: 'ne' | ||
| Name.Function: "#000000", # class: 'nf' | ||
| Name.Property: "#000000", # class: 'py' | ||
| Name.Label: "#f57900", # class: 'nl' | ||
| Name.Namespace: "#000000", # class: 'nn' - to be revised | ||
| Name.Other: "#000000", # class: 'nx' | ||
| Name.Tag: "bold #004461", # class: 'nt' - like a keyword | ||
| Name.Variable: "#000000", # class: 'nv' - to be revised | ||
| Name.Variable.Class: "#000000", # class: 'vc' - to be revised | ||
| Name.Variable.Global: "#000000", # class: 'vg' - to be revised | ||
| Name.Variable.Instance: "#000000", # class: 'vi' - to be revised | ||
|
|
||
| Number: "#990000", # class: 'm' | ||
|
|
||
| Literal: "#000000", # class: 'l' | ||
| Literal.Date: "#000000", # class: 'ld' | ||
|
|
||
| String: "#4e9a06", # class: 's' | ||
| String.Backtick: "#4e9a06", # class: 'sb' | ||
| String.Char: "#4e9a06", # class: 'sc' | ||
| String.Doc: "italic #8f5902", # class: 'sd' - like a comment | ||
| String.Double: "#4e9a06", # class: 's2' | ||
| String.Escape: "#4e9a06", # class: 'se' | ||
| String.Heredoc: "#4e9a06", # class: 'sh' | ||
| String.Interpol: "#4e9a06", # class: 'si' | ||
| String.Other: "#4e9a06", # class: 'sx' | ||
| String.Regex: "#4e9a06", # class: 'sr' | ||
| String.Single: "#4e9a06", # class: 's1' | ||
| String.Symbol: "#4e9a06", # class: 'ss' | ||
|
|
||
| Generic: "#000000", # class: 'g' | ||
| Generic.Deleted: "#a40000", # class: 'gd' | ||
| Generic.Emph: "italic #000000", # class: 'ge' | ||
| Generic.Error: "#ef2929", # class: 'gr' | ||
| Generic.Heading: "bold #000080", # class: 'gh' | ||
| Generic.Inserted: "#00A000", # class: 'gi' | ||
| Generic.Output: "#888", # class: 'go' | ||
| Generic.Prompt: "#745334", # class: 'gp' | ||
| Generic.Strong: "bold #000000", # class: 'gs' | ||
| Generic.Subheading: "bold #800080", # class: 'gu' | ||
| Generic.Traceback: "bold #a40000", # class: 'gt' | ||
| Name: "#000000", # class: 'n' | ||
| Name.Attribute: "#c4a000", # class: 'na' - to be revised | ||
| Name.Builtin: "#004461", # class: 'nb' | ||
| Name.Builtin.Pseudo: "#3465a4", # class: 'bp' | ||
| Name.Class: "#000000", # class: 'nc' - to be revised | ||
| Name.Constant: "#000000", # class: 'no' - to be revised | ||
| Name.Decorator: "#888", # class: 'nd' - to be revised | ||
| Name.Entity: "#ce5c00", # class: 'ni' | ||
| Name.Exception: "bold #cc0000", # class: 'ne' | ||
| Name.Function: "#000000", # class: 'nf' | ||
| Name.Property: "#000000", # class: 'py' | ||
| Name.Label: "#f57900", # class: 'nl' | ||
| Name.Namespace: "#000000", # class: 'nn' - to be revised | ||
| Name.Other: "#000000", # class: 'nx' | ||
| Name.Tag: "bold #004461", # class: 'nt' - like a keyword | ||
| Name.Variable: "#000000", # class: 'nv' - to be revised | ||
| Name.Variable.Class: "#000000", # class: 'vc' - to be revised | ||
| Name.Variable.Global: "#000000", # class: 'vg' - to be revised | ||
| Name.Variable.Instance: "#000000", # class: 'vi' - to be revised | ||
| Number: "#990000", # class: 'm' | ||
| Literal: "#000000", # class: 'l' | ||
| Literal.Date: "#000000", # class: 'ld' | ||
| String: "#4e9a06", # class: 's' | ||
| String.Backtick: "#4e9a06", # class: 'sb' | ||
| String.Char: "#4e9a06", # class: 'sc' | ||
| String.Doc: "italic #8f5902", # class: 'sd' - like a comment | ||
| String.Double: "#4e9a06", # class: 's2' | ||
| String.Escape: "#4e9a06", # class: 'se' | ||
| String.Heredoc: "#4e9a06", # class: 'sh' | ||
| String.Interpol: "#4e9a06", # class: 'si' | ||
| String.Other: "#4e9a06", # class: 'sx' | ||
| String.Regex: "#4e9a06", # class: 'sr' | ||
| String.Single: "#4e9a06", # class: 's1' | ||
| String.Symbol: "#4e9a06", # class: 'ss' | ||
| Generic: "#000000", # class: 'g' | ||
| Generic.Deleted: "#a40000", # class: 'gd' | ||
| Generic.Emph: "italic #000000", # class: 'ge' | ||
| Generic.Error: "#ef2929", # class: 'gr' | ||
| Generic.Heading: "bold #000080", # class: 'gh' | ||
| Generic.Inserted: "#00A000", # class: 'gi' | ||
| Generic.Output: "#888", # class: 'go' | ||
| Generic.Prompt: "#745334", # class: 'gp' | ||
| Generic.Strong: "bold #000000", # class: 'gs' | ||
| Generic.Subheading: "bold #800080", # class: 'gu' | ||
| Generic.Traceback: "bold #a40000", # class: 'gt' | ||
| } |
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 |
|---|---|---|
| @@ -1,8 +1,12 @@ | ||
| sphinx>=1.3,<1.7 | ||
| invoke>=0.10.1 | ||
| invocations>=0.6.2 | ||
| sphinx>=1.3,<1.8 | ||
| invoke>=1.0.0 | ||
| invocations>=1.2.0 | ||
| semantic_version>=2.4,<2.5 | ||
| wheel==0.24 | ||
| twine==1.11.0 | ||
| releases>=1.2.0,<2.0 | ||
| flake8==2.4.0 | ||
| releases>=1.5.1,<2.0 | ||
| flake8==3.6.0 | ||
|
|
||
| # Install ourselves direct, even when being used on eg RTD. Otherwise we can't | ||
| # dogfood our own changes until release to PyPI. | ||
| -e . |
Oops, something went wrong.