diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 03:07:43 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-26 03:07:43 +0000 |
commit | dddde902acfa6acfb11583c61faa67cc7c8d11b6 (patch) | |
tree | 2e9fdf963c84f82995d62d0c55f91168cff3ec47 /doc/development/fe_guide | |
parent | 101c30f4dffc624af3cbe3f12edc2cfee570a5f3 (diff) | |
download | gitlab-ce-dddde902acfa6acfb11583c61faa67cc7c8d11b6.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/fe_guide')
-rw-r--r-- | doc/development/fe_guide/droplab/droplab.md | 6 | ||||
-rw-r--r-- | doc/development/fe_guide/style/vue.md | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/doc/development/fe_guide/droplab/droplab.md b/doc/development/fe_guide/droplab/droplab.md index 1c6d895b3ab..4d7c882dc09 100644 --- a/doc/development/fe_guide/droplab/droplab.md +++ b/doc/development/fe_guide/droplab/droplab.md @@ -185,11 +185,11 @@ DropLab adds some CSS classes to help lower the barrier to integration. For example: -- The `droplab-item-selected` css class is added to items that have been selected +- The `droplab-item-selected` CSS class is added to items that have been selected either by a mouse click or by enter key selection. -- The `droplab-item-active` css class is added to items that have been selected +- The `droplab-item-active` CSS class is added to items that have been selected using arrow key navigation. -- You can add the `droplab-item-ignore` css class to any item that you do not want to be selectable. For example, +- You can add the `droplab-item-ignore` CSS class to any item that you do not want to be selectable. For example, an `<li class="divider"></li>` list divider element that should not be interactive. ## Internal events diff --git a/doc/development/fe_guide/style/vue.md b/doc/development/fe_guide/style/vue.md index b571707edfd..a7d8fc61752 100644 --- a/doc/development/fe_guide/style/vue.md +++ b/doc/development/fe_guide/style/vue.md @@ -75,7 +75,7 @@ Please check this [rules](https://github.com/vuejs/eslint-plugin-vue#bulb-rules) 1. **Props Naming:** Avoid using DOM component prop names. 1. **Props Naming:** Use kebab-case instead of camelCase to provide props in templates. - ```javascript + ```html // bad <component class="btn"> @@ -97,7 +97,7 @@ Please check this [rules](https://github.com/vuejs/eslint-plugin-vue#bulb-rules) 1. With more than one attribute, all attributes should be on a new line: - ```javascript + ```html // bad <component v-if="bar" param="baz" /> @@ -117,7 +117,7 @@ Please check this [rules](https://github.com/vuejs/eslint-plugin-vue#bulb-rules) 1. The tag can be inline if there is only one attribute: - ```javascript + ```html // good <component bar="bar" /> @@ -238,7 +238,7 @@ Please check this [rules](https://github.com/vuejs/eslint-plugin-vue#bulb-rules) 1. Shorthand `@` is preferable over `v-on` - ```javascript + ```html // bad <component v-on:click="eventHandler"/> @@ -248,7 +248,7 @@ Please check this [rules](https://github.com/vuejs/eslint-plugin-vue#bulb-rules) 1. Shorthand `:` is preferable over `v-bind` - ```javascript + ```html // bad <component v-bind:class="btn"/> @@ -258,7 +258,7 @@ Please check this [rules](https://github.com/vuejs/eslint-plugin-vue#bulb-rules) 1. Shorthand `#` is preferable over `v-slot` - ```javascript + ```html // bad <template v-slot:header></template> @@ -270,7 +270,7 @@ Please check this [rules](https://github.com/vuejs/eslint-plugin-vue#bulb-rules) 1. Prefer self-closing component tags - ```javascript + ```html // bad <component></component> @@ -282,7 +282,7 @@ Please check this [rules](https://github.com/vuejs/eslint-plugin-vue#bulb-rules) 1. Prefer a component's kebab-cased name over other styles when using it in a template - ```javascript + ```html // bad <MyComponent /> @@ -372,7 +372,7 @@ Useful links: 1. Tooltips: Do not rely on `has-tooltip` class name for Vue components - ```javascript + ```html // bad <span class="has-tooltip" @@ -392,7 +392,7 @@ Useful links: 1. Don't change `data-original-title`. - ```javascript + ```html // bad <span data-original-title="tooltip text">Foo</span> |