From 75e79a59039b5ff54eeb4cb5096c845dad0bb22a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 26 Nov 2018 12:42:59 +0100 Subject: [PATCH] Added .editorconfig to control indentation across various files. And replacing .kateconfig with that. --- .editorconfig | 7 +++++++ css/m-components.css | 2 -- css/m-dark.css | 2 -- css/m-debug.css | 10 +++++----- css/m-doxygen.css | 2 -- css/m-grid.css | 2 -- css/m-layout.css | 2 -- css/m-light.css | 2 -- css/m-theme-dark.css | 2 -- css/m-theme-light.css | 2 -- doxygen/templates/.kateconfig | 1 - pelican-theme/templates/.kateconfig | 1 - 12 files changed, 12 insertions(+), 23 deletions(-) create mode 100644 .editorconfig delete mode 100644 doxygen/templates/.kateconfig delete mode 100644 pelican-theme/templates/.kateconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..77198de1 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,7 @@ +[*] +indent_style = space +indent_size = 4 + +[*.{css,html}] +indent_style = space +indent_size = 2 diff --git a/css/m-components.css b/css/m-components.css index 748fdc9b..db09773a 100644 --- a/css/m-components.css +++ b/css/m-components.css @@ -1512,5 +1512,3 @@ li:last-child > div.m-graph:last-child, li:last-child > div.m-graph.m-nopadb, li:last-child > div.m-plot:last-child, li:last-child > div.m-plot.m-nopadb { margin-bottom: 0; } - -/* kate: indent-width 2; */ diff --git a/css/m-dark.css b/css/m-dark.css index 42059152..e967aff8 100644 --- a/css/m-dark.css +++ b/css/m-dark.css @@ -28,5 +28,3 @@ @import url('m-layout.css'); @import url('pygments-dark.css'); @import url('pygments-console.css'); - -/* kate: indent-width 2; */ diff --git a/css/m-debug.css b/css/m-debug.css index 7bd7b832..f3395cf3 100644 --- a/css/m-debug.css +++ b/css/m-debug.css @@ -24,17 +24,17 @@ /* Grid container should always contain rows */ .m-container > * { - background-color: #ff0000; + background-color: #ff0000; } .m-container > .m-row { - background-color: transparent; + background-color: transparent; } /* Grid row should always contain columns or a clearfix */ .m-row > * { - background-color: #ff0000; + background-color: #ff0000; } .m-row > [class*='m-col-'], .m-row > [class*='m-clearfix-'] { - background-color: transparent; + background-color: transparent; } /* Grid container can't contain another container */ @@ -68,4 +68,4 @@ table.m-scroll, table.m-scroll *, /* Links shouldn't contain links */ a a - { background-color: #ff0000; } + { background-color: #ff0000; } diff --git a/css/m-doxygen.css b/css/m-doxygen.css index b007d392..514d38bd 100644 --- a/css/m-doxygen.css +++ b/css/m-doxygen.css @@ -304,5 +304,3 @@ a.m-dox-search-icon:focus svg, a.m-dox-search-icon:hover svg, a.m-dox-search-ico .m-dox-search input[type="search"]::-webkit-search-results-decoration { display: none; } - -/* kate: indent-width 2; */ diff --git a/css/m-grid.css b/css/m-grid.css index df2c4294..67c072e1 100644 --- a/css/m-grid.css +++ b/css/m-grid.css @@ -385,5 +385,3 @@ body { margin: 0; } float: none; } } - -/* kate: indent-width 2; */ diff --git a/css/m-layout.css b/css/m-layout.css index f728341a..0d9d570e 100644 --- a/css/m-layout.css +++ b/css/m-layout.css @@ -776,5 +776,3 @@ article:last-child, article section:last-child { margin-bottom: 0; } .m-container-inflatable section:target .m-note.m-dim { border-color: var(--dim-color); } - -/* kate: indent-width 2; */ diff --git a/css/m-light.css b/css/m-light.css index 395b27f5..ee83720b 100644 --- a/css/m-light.css +++ b/css/m-light.css @@ -28,5 +28,3 @@ @import url('m-layout.css'); /* TODO: pygments-light.css */ @import url('pygments-console.css'); - -/* kate: indent-width 2; */ diff --git a/css/m-theme-dark.css b/css/m-theme-dark.css index ddd67a6d..86ecb51b 100644 --- a/css/m-theme-dark.css +++ b/css/m-theme-dark.css @@ -148,5 +148,3 @@ --dim-filled-link-active-color: #747474; --dim-button-active-color: #acacac; } - -/* kate: indent-width 2; */ diff --git a/css/m-theme-light.css b/css/m-theme-light.css index 88bc043a..67868910 100644 --- a/css/m-theme-light.css +++ b/css/m-theme-light.css @@ -146,5 +146,3 @@ --dim-filled-link-active-color: #949494; --dim-button-active-color: #c0c0c0; } - -/* kate: indent-width 2; */ diff --git a/doxygen/templates/.kateconfig b/doxygen/templates/.kateconfig deleted file mode 100644 index b46a48b0..00000000 --- a/doxygen/templates/.kateconfig +++ /dev/null @@ -1 +0,0 @@ -// kate: indent-width 2; diff --git a/pelican-theme/templates/.kateconfig b/pelican-theme/templates/.kateconfig deleted file mode 100644 index b46a48b0..00000000 --- a/pelican-theme/templates/.kateconfig +++ /dev/null @@ -1 +0,0 @@ -// kate: indent-width 2; -- 2.30.2