From 3bce7a16d828a5f4727564b5b1c4b599d6ddfd31 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Wed, 24 Jun 2020 13:01:24 +0200 Subject: [PATCH] .editorconfig: Fixed max_line_length --- .editorconfig | 5 +++++ docker/Dockerfile | 3 ++- resources/assets/themes/theme1.less | 6 ++++-- resources/assets/themes/theme10.less | 6 ++++-- resources/assets/themes/theme11.less | 6 ++++-- resources/assets/themes/theme12.less | 6 ++++-- resources/assets/themes/theme4.less | 6 ++++-- resources/assets/themes/theme6.less | 6 ++++-- resources/assets/themes/theme7.less | 6 ++++-- resources/assets/themes/theme8.less | 6 ++++-- resources/assets/themes/theme9.less | 6 ++++-- resources/lang/de_DE/default.po | 6 ++++-- 12 files changed, 47 insertions(+), 21 deletions(-) diff --git a/.editorconfig b/.editorconfig index c73db4c6..bf222408 100644 --- a/.editorconfig +++ b/.editorconfig @@ -21,6 +21,7 @@ indent_size = 2 [*.{htm,html,twig}] indent_size = 4 +max_line_length = unset [*.{js,css,less,sass,scss}] indent_size = 2 @@ -31,6 +32,7 @@ indent_size = unset [*.md] trim_trailing_whitespace = false indent_size = 2 +max_line_length = unset [*.php] indent_size = 4 @@ -38,6 +40,9 @@ indent_size = 4 [*.sh] indent_size = 2 +[{db/*.sql,includes/**}] +max_line_length = unset + [*.{yml,yaml}] indent_size = 2 diff --git a/docker/Dockerfile b/docker/Dockerfile index 50a638a3..3f057cd2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -38,7 +38,8 @@ RUN chown -R www-data:www-data /var/www/storage/ && \ rm -r /var/www/html ARG VERSION -RUN if [[ ! -f /var/www/storage/app/VERSION ]] && [[ ! -z "${VERSION}" ]]; then echo -n "${VERSION}" > /var/www/storage/app/VERSION; fi +RUN if [[ ! -f /var/www/storage/app/VERSION ]] && [[ ! -z "${VERSION}" ]]; then \ + echo -n "${VERSION}" > /var/www/storage/app/VERSION; fi ENV TRUSTED_PROXIES 10.0.0.0/8,::ffff:10.0.0.0/8,\ 127.0.0.0/8,::ffff:127.0.0.0/8,\ diff --git a/resources/assets/themes/theme1.less b/resources/assets/themes/theme1.less index e1dfd940..58d86be4 100644 --- a/resources/assets/themes/theme1.less +++ b/resources/assets/themes/theme1.less @@ -95,7 +95,8 @@ THE SOFTWARE. //== Iconography // -//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. +//## Specify custom location and filename of the included Glyphicons icon font. +//## Useful for those including Bootstrap via Bower. //** File name for all font files. @icon-font-name: "glyphicons-halflings-regular"; @@ -105,7 +106,8 @@ THE SOFTWARE. //== Components // -//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). +//## Define common padding and border radius sizes and more. +//## Values based on 14px text and 1.428 line-height (~20px to start). @padding-base-vertical: 8px; @padding-base-horizontal: 12px; diff --git a/resources/assets/themes/theme10.less b/resources/assets/themes/theme10.less index 960e7625..6b514d23 100644 --- a/resources/assets/themes/theme10.less +++ b/resources/assets/themes/theme10.less @@ -95,7 +95,8 @@ THE SOFTWARE. //== Iconography // -//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. +//## Specify custom location and filename of the included Glyphicons icon font. +//## Useful for those including Bootstrap via Bower. //** File name for all font files. @icon-font-name: "glyphicons-halflings-regular"; @@ -105,7 +106,8 @@ THE SOFTWARE. //== Components // -//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). +//## Define common padding and border radius sizes and more. +//## Values based on 14px text and 1.428 line-height (~20px to start). @padding-base-vertical: 8px; @padding-base-horizontal: 12px; diff --git a/resources/assets/themes/theme11.less b/resources/assets/themes/theme11.less index 7098beda..ca0ad352 100644 --- a/resources/assets/themes/theme11.less +++ b/resources/assets/themes/theme11.less @@ -95,7 +95,8 @@ THE SOFTWARE. //== Iconography // -//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. +//## Specify custom location and filename of the included Glyphicons icon font. +//## Useful for those including Bootstrap via Bower. //** File name for all font files. @icon-font-name: "glyphicons-halflings-regular"; @@ -105,7 +106,8 @@ THE SOFTWARE. //== Components // -//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). +//## Define common padding and border radius sizes and more. +//## Values based on 14px text and 1.428 line-height (~20px to start). @padding-base-vertical: 8px; @padding-base-horizontal: 12px; diff --git a/resources/assets/themes/theme12.less b/resources/assets/themes/theme12.less index 81d04e56..ec470976 100644 --- a/resources/assets/themes/theme12.less +++ b/resources/assets/themes/theme12.less @@ -96,7 +96,8 @@ THE SOFTWARE. //== Iconography // -//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. +//## Specify custom location and filename of the included Glyphicons icon font. +//## Useful for those including Bootstrap via Bower. //** File name for all font files. @icon-font-name: "glyphicons-halflings-regular"; @@ -106,7 +107,8 @@ THE SOFTWARE. //== Components // -//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). +//## Define common padding and border radius sizes and more. +//## Values based on 14px text and 1.428 line-height (~20px to start). @padding-base-vertical: 8px; @padding-base-horizontal: 12px; diff --git a/resources/assets/themes/theme4.less b/resources/assets/themes/theme4.less index ea69793e..08575b1d 100644 --- a/resources/assets/themes/theme4.less +++ b/resources/assets/themes/theme4.less @@ -95,7 +95,8 @@ THE SOFTWARE. //== Iconography // -//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. +//## Specify custom location and filename of the included Glyphicons icon font. +//## Useful for those including Bootstrap via Bower. //** File name for all font files. @icon-font-name: "glyphicons-halflings-regular"; @@ -105,7 +106,8 @@ THE SOFTWARE. //== Components // -//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). +//## Define common padding and border radius sizes and more. +//## Values based on 14px text and 1.428 line-height (~20px to start). @padding-base-vertical: 8px; @padding-base-horizontal: 12px; diff --git a/resources/assets/themes/theme6.less b/resources/assets/themes/theme6.less index 58fecc7d..118840ac 100644 --- a/resources/assets/themes/theme6.less +++ b/resources/assets/themes/theme6.less @@ -98,7 +98,8 @@ THE SOFTWARE. //== Iconography // -//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. +//## Specify custom location and filename of the included Glyphicons icon font. +//## Useful for those including Bootstrap via Bower. //** File name for all font files. @icon-font-name: "glyphicons-halflings-regular"; @@ -108,7 +109,8 @@ THE SOFTWARE. //== Components // -//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). +//## Define common padding and border radius sizes and more. +//## Values based on 14px text and 1.428 line-height (~20px to start). @padding-base-vertical: 8px; @padding-base-horizontal: 12px; diff --git a/resources/assets/themes/theme7.less b/resources/assets/themes/theme7.less index 313e697b..7e1849f2 100644 --- a/resources/assets/themes/theme7.less +++ b/resources/assets/themes/theme7.less @@ -103,7 +103,8 @@ THE SOFTWARE. //== Iconography // -//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. +//## Specify custom location and filename of the included Glyphicons icon font. +//## Useful for those including Bootstrap via Bower. //** File name for all font files. @icon-font-name: "glyphicons-halflings-regular"; @@ -113,7 +114,8 @@ THE SOFTWARE. //== Components // -//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). +//## Define common padding and border radius sizes and more. +//## Values based on 14px text and 1.428 line-height (~20px to start). @padding-base-vertical: 8px; @padding-base-horizontal: 12px; diff --git a/resources/assets/themes/theme8.less b/resources/assets/themes/theme8.less index f176823f..827f405e 100644 --- a/resources/assets/themes/theme8.less +++ b/resources/assets/themes/theme8.less @@ -95,7 +95,8 @@ THE SOFTWARE. //== Iconography // -//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. +//## Specify custom location and filename of the included Glyphicons icon font. +//## Useful for those including Bootstrap via Bower. //** File name for all font files. @icon-font-name: "glyphicons-halflings-regular"; @@ -105,7 +106,8 @@ THE SOFTWARE. //== Components // -//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). +//## Define common padding and border radius sizes and more. +//## Values based on 14px text and 1.428 line-height (~20px to start). @padding-base-vertical: 8px; @padding-base-horizontal: 12px; diff --git a/resources/assets/themes/theme9.less b/resources/assets/themes/theme9.less index 1cabca87..748d6534 100644 --- a/resources/assets/themes/theme9.less +++ b/resources/assets/themes/theme9.less @@ -95,7 +95,8 @@ THE SOFTWARE. //== Iconography // -//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower. +//## Specify custom location and filename of the included Glyphicons icon font. +//## Useful for those including Bootstrap via Bower. //** File name for all font files. @icon-font-name: "glyphicons-halflings-regular"; @@ -105,7 +106,8 @@ THE SOFTWARE. //== Components // -//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start). +//## Define common padding and border radius sizes and more. +//## Values based on 14px text and 1.428 line-height (~20px to start). @padding-base-vertical: 8px; @padding-base-horizontal: 12px; diff --git a/resources/lang/de_DE/default.po b/resources/lang/de_DE/default.po index d8fbe6b2..ce1fae05 100644 --- a/resources/lang/de_DE/default.po +++ b/resources/lang/de_DE/default.po @@ -334,7 +334,8 @@ msgstr "löschen" msgid "leave" msgstr "verlassen" -# As already mentioned in Issue #312 : I'd suggest "join angel" and the German translation "Engel hinzufügen" for this button. +# As already mentioned in Issue #312 : I'd suggest "join angel" and the German translation +# "Engel hinzufügen" for this button. #: includes/controller/angeltypes_controller.php:317 #: includes/view/AngelTypes_view.php:152 includes/view/AngelTypes_view.php:542 msgid "join" @@ -2775,7 +2776,8 @@ msgid "schedule.import.title" msgstr "Programm importieren" msgid "schedule.import.text" -msgstr "Dieser Import erstellt Räume und erstellt, aktualisiert und löscht Schichten anhand des schedule.xml exportes." +msgstr "" +"Dieser Import erstellt Räume und erstellt, aktualisiert und löscht Schichten anhand des schedule.xml exportes." msgid "schedule.import.load.title" msgstr "Programm importieren: Vorschau"