From bd55d8c298afb990134f8046d04c6882eb82626a Mon Sep 17 00:00:00 2001 From: medmunds Date: Fri, 8 Feb 2019 12:05:57 -0800 Subject: [PATCH] Rework editorconfig * Most file types prefer 2-space indents, so now default to that and list the exceptions * Add max_line_length=120 for .py files (Django convention) * Bat files require CRLF --- .editorconfig | 21 ++++++++------- docs/_static/anymail-theme.css | 48 +++++++++++++++++----------------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/.editorconfig b/.editorconfig index 6757d2b..93c5188 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,24 +1,25 @@ -# http://editorconfig.org +# https://editorconfig.org root = true -# Follow Django conventions for most files [*] charset = utf-8 end_of_line = lf -indent_size = 4 +indent_size = 2 indent_style = space insert_final_newline = true trim_trailing_whitespace = true -# Use 2 spaces for js and text(-like) files -[*.{html,js,json,md,rst,txt,yml}] -indent_size = 2 +[*.py] +indent_size = 4 +max_line_length = 120 -# Makefiles always use tabs for indentation -[Makefile] +[*.{ini,lock}] +indent_size = 4 + +[{Makefile,*.bat}] indent_style = tab +indent_size = 4 -# Batch files use tabs for indentation [*.bat] -indent_style = tab +end_of_line = crlf diff --git a/docs/_static/anymail-theme.css b/docs/_static/anymail-theme.css index 3c4b035..40c27d6 100644 --- a/docs/_static/anymail-theme.css +++ b/docs/_static/anymail-theme.css @@ -4,41 +4,41 @@ /* Regression: https://github.com/rtfd/sphinx_rtd_theme/issues/705 */ .rst-content .section ol li p:last-child, .rst-content .section ul li p:last-child { - margin-bottom: 24px; + margin-bottom: 24px; } /* Pygments shell/console prompt: */ .highlight .gp { - /* The RTD theme shows prompts the same color as other code. - We want to distinguish them (like most Pygments themes do). */ - color: #d14; + /* The RTD theme shows prompts the same color as other code. + We want to distinguish them (like most Pygments themes do). */ + color: #d14; - /* Exclude prompt characters when copying from highlighted code. */ - user-select: none; - -moz-user-select: none; - -webkit-user-select: none; - -ms-user-select: none; + /* Exclude prompt characters when copying from highlighted code. */ + user-select: none; + -moz-user-select: none; + -webkit-user-select: none; + -ms-user-select: none; } /* Sticky table first column (used for ESP feature matrix) */ table.sticky-left td:first-of-type, table.sticky-left th:first-of-type { - position: -webkit-sticky; /* Safari */ - position: sticky; - left: 0; - background-color: #fcfcfc; /* override transparent from .wy-table td */ + position: -webkit-sticky; /* Safari */ + position: sticky; + left: 0; + background-color: #fcfcfc; /* override transparent from .wy-table td */ } table.sticky-left td:first-of-type[colspan] > p, table.sticky-left th:first-of-type[colspan] > p { - /* Hack: the full-width section headers can't stick left; - since those always wrap a rubric

(in the specific table that uses this), - just make the

sticky within the . */ - display: inline-block; - position: -webkit-sticky; /* Safari */ - position: sticky; - left: 17px; /* (.wy-table $table-padding-size) + (docutils border="1" in html) */ + /* Hack: the full-width section headers can't stick left; + since those always wrap a rubric

(in the specific table that uses this), + just make the

sticky within the . */ + display: inline-block; + position: -webkit-sticky; /* Safari */ + position: sticky; + left: 17px; /* (.wy-table $table-padding-size) + (docutils border="1" in html) */ } @@ -57,12 +57,12 @@ table.sticky-left th:first-of-type[colspan] > p { https://github.com/rtfd/sphinx_rtd_theme/issues/92 */ .rst-content a code.xref { - color: #2980B9; - font-weight: inherit; + color: #2980B9; + font-weight: inherit; } .rst-content a:hover code.xref { - color: #3091d1; + color: #3091d1; } .rst-content a:visited code.xref { - color: #9B59B6; + color: #9B59B6; }