diff --git a/.gitignore b/.gitignore index 9f90f46d9..316ede4c5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ js/ report clover.xml composer.lock +appinfo/info.xsd # just sane ignores .*.sw[po] diff --git a/.travis.yml b/.travis.yml index b62c07d99..296dc131d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,12 +39,6 @@ before_install: - cd apps/$APP_NAME script: - # Check info.xml schema validity - - wget https://apps.nextcloud.com/schema/apps/info.xsd - - xmllint appinfo/info.xml --schema info.xsd --noout - - rm info.xsd - # Check PHP syntax errors - - find . -name \*.php -exec php -l "{}" \; # Check app validity - php ../../occ app:check-code notes # Run PHP unit tests (skipped due to errors) diff --git a/Makefile b/Makefile index 3cc9399d3..6ad60d4cb 100644 --- a/Makefile +++ b/Makefile @@ -91,9 +91,12 @@ test-coverage: npm run test:coverage # Linting -lint: lint-php lint-js lint-css +lint: lint-php lint-js lint-css lint-nextcloud lint-php: + # Check PHP syntax errors + @! find lib/ -name "*.php" | xargs -I{} php -l '{}' | grep -v "No syntax errors detected" + # PHP CodeSniffer vendor/bin/phpcs --standard=phpcs.xml --runtime-set ignore_warnings_on_exit 1 appinfo/ lib/ lint-js: @@ -102,6 +105,11 @@ lint-js: lint-css: npm run stylelint +lint-nextcloud: + # Check info.xml schema validity + wget https://apps.nextcloud.com/schema/apps/info.xsd -P appinfo/ -N --no-verbose || [ -f appinfo/info.xsd ] + xmllint appinfo/info.xml --schema appinfo/info.xsd --noout + # Fix lint lint-fix: lint-php-fix lint-js-fix lint-css-fix diff --git a/src/components/EditorEasyMDE.vue b/src/components/EditorEasyMDE.vue index 70c93d448..f05470d47 100644 --- a/src/components/EditorEasyMDE.vue +++ b/src/components/EditorEasyMDE.vue @@ -158,11 +158,6 @@ export default { font-size: 90%; } -.CodeMirror .cm-comment:only-child { - display: inline-block; - width: calc(100% - 1px); -} - /* Quotes */ .cm-s-easymde .cm-quote { color: inherit; diff --git a/src/components/EditorMarkdownIt.vue b/src/components/EditorMarkdownIt.vue index d10bbb40e..00f56d964 100644 --- a/src/components/EditorMarkdownIt.vue +++ b/src/components/EditorMarkdownIt.vue @@ -112,5 +112,13 @@ export default { padding-left: 2ex; color: var(--color-text-light) } + + & table th { + font-weight: bold; + } + + & table td, & table th { + padding-right: 1.5em; + } }