diff --git a/.eslintignore b/.eslintignore index 69d9ce171..70c6bda91 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,5 +1,4 @@ node_modules build .nuxt -cypress/ styleguide/ diff --git a/.eslintrc.js b/.eslintrc.js index 25a4edfe4..fdc9bfb5e 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -19,6 +19,7 @@ module.exports = { // add your custom rules here rules: { 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', - 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' + 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', + 'vue/component-name-in-template-casing': ['error', 'kebab-case'] } } diff --git a/.travis.yml b/.travis.yml index da827f262..bbd211c18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,3 +28,19 @@ after_failure: - wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh - chmod +x send.sh - ./send.sh failure $WEBHOOK_URL + +deploy: + - provider: script + script: scripts/deploy.sh nitro.human-connection.org + on: + branch: master + tags: true + - provider: script + script: scripts/deploy.sh nitro-staging.human-connection.org + on: + branch: master + - provider: script + script: scripts/deploy.sh "nitro-$(git rev-parse --short HEAD).human-connection.org" + on: + tags: true + all_branches: true diff --git a/components/Author.vue b/components/Author.vue index f307bc19b..53379afa8 100644 --- a/components/Author.vue +++ b/components/Author.vue @@ -5,29 +5,36 @@ :open-group="Math.random().toString()" placement="top-start" trigger="manual" - offset="0"> + offset="0" + > + @mouseleave="popoveMouseLeave" + >
+ size="32px" + />
{{ author.name | truncate(trunc, 18) }} + style="vertical-align: middle;" + > + {{ author.name | truncate(trunc, 18) }} + @@ -37,7 +44,8 @@ slot="popover" style="min-width: 250px;" @mouseover="popoverMouseEnter" - @mouseleave="popoveMouseLeave"> + @mouseleave="popoveMouseLeave" + > + :show-author-popover="showAuthorPopover" + /> - + + margin="x-small" + > + color="soft" + > Wer folgt {{ user.name | truncate(15) }}? @@ -136,24 +160,32 @@ + margin="x-small" + > + :trunc="15" + /> + margin="small" + > und {{ user.followedByCount - user.followedBy.length }} weitere + color="softer" + > + und {{ user.followedByCount - user.followedBy.length }} weitere + @@ -171,7 +203,8 @@ + :end-val="user.contributionsCount" + /> @@ -183,7 +216,8 @@ + :end-val="user.commentsCount" + /> @@ -195,7 +229,8 @@ + :end-val="user.shoutedCount" + /> @@ -205,17 +240,20 @@ + > + :show-author-popover="false" + /> + @click="showMoreContributions" + />
diff --git a/pages/settings.vue b/pages/settings.vue index 7b625e742..cf93cbfa4 100644 --- a/pages/settings.vue +++ b/pages/settings.vue @@ -10,7 +10,8 @@ + appear + > diff --git a/scripts/deploy.sh b/scripts/deploy.sh new file mode 100755 index 000000000..b66b63a77 --- /dev/null +++ b/scripts/deploy.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +echo "See me deployed at $1 :)" + diff --git a/styleguide/src/system/components/data-input/Input/Input.vue b/styleguide/src/system/components/data-input/Input/Input.vue index 56f2d33e9..0b99ce98e 100755 --- a/styleguide/src/system/components/data-input/Input/Input.vue +++ b/styleguide/src/system/components/data-input/Input/Input.vue @@ -64,6 +64,13 @@ export default { type: String, default: null }, + /** + * The name of the field for better accessibility + */ + name: { + type: String, + default: null + }, /** * Whether the input should be automatically focused */ diff --git a/styleguide/src/system/components/navigation/Button/Button.vue b/styleguide/src/system/components/navigation/Button/Button.vue index 208e3269d..d806a9d6e 100644 --- a/styleguide/src/system/components/navigation/Button/Button.vue +++ b/styleguide/src/system/components/navigation/Button/Button.vue @@ -13,6 +13,7 @@ fullWidth && `ds-button-full-width`, loading && `ds-button-loading` ]" + :name="name" v-bind="bindings" :is="linkTag">