diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 06:07:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 06:07:31 +0300 |
commit | 9caed104bc903734d996161ba13a579f2be49d7c (patch) | |
tree | d7c3e6a534dfa85128f1011c4fb16f7f697d3f80 /doc/development/fe_guide | |
parent | a59c9590f5171f3638a1b2abeff55157aedc577b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/fe_guide')
-rw-r--r-- | doc/development/fe_guide/style/scss.md | 2 | ||||
-rw-r--r-- | doc/development/fe_guide/tooling.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/fe_guide/style/scss.md b/doc/development/fe_guide/style/scss.md index a8755e634be..c6424e39ac2 100644 --- a/doc/development/fe_guide/style/scss.md +++ b/doc/development/fe_guide/style/scss.md @@ -11,7 +11,7 @@ easy to maintain, and performant for the end-user. ### Utility Classes -As part of the effort for [cleaning up our CSS and moving our components into GitLab-UI](https://gitlab.com/groups/gitlab-org/-/epics/950) +As part of the effort for [cleaning up our CSS and moving our components into gitlab-ui](https://gitlab.com/groups/gitlab-org/-/epics/950) led by the [GitLab UI WG](https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/20623) we prefer the use of utility classes over adding new CSS. However, complex CSS can be addressed by adding component classes. #### Where are utility classes defined? diff --git a/doc/development/fe_guide/tooling.md b/doc/development/fe_guide/tooling.md index ec5e094cfa6..066c2575e2d 100644 --- a/doc/development/fe_guide/tooling.md +++ b/doc/development/fe_guide/tooling.md @@ -2,7 +2,7 @@ ## ESLint -We use ESLint to encapsulate and enforce frontend code standards. Our configuration may be found in the [gitlab-eslint-config](https://gitlab.com/gitlab-org/gitlab-eslint-config) project. +We use ESLint to encapsulate and enforce frontend code standards. Our configuration may be found in the [`gitlab-eslint-config`](https://gitlab.com/gitlab-org/gitlab-eslint-config) project. ### Disabling ESLint in new files |