diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 09:07:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-11 09:07:52 +0300 |
| commit | 7b875aa3fd1645e2e881997256ba94c6cb73ab3d (patch) | |
| tree | 59b1637c36624ee863e12f9e176425627ab3deb5 /doc/development/fe_guide | |
| parent | 9caed104bc903734d996161ba13a579f2be49d7c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/fe_guide')
| -rw-r--r-- | doc/development/fe_guide/frontend_faq.md | 4 | ||||
| -rw-r--r-- | doc/development/fe_guide/style/scss.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/development/fe_guide/frontend_faq.md b/doc/development/fe_guide/frontend_faq.md index aaa2fb0246b..cbe0a78370d 100644 --- a/doc/development/fe_guide/frontend_faq.md +++ b/doc/development/fe_guide/frontend_faq.md @@ -51,10 +51,10 @@ bound on mounting and destroyed when the button is, mitigating the above issue. It also has bindings to a particular container or modal ID available, to work with the focus trap created by our GlModal. -### 3. A gitlab-ui component not conforming to [Pajamas Design System](https://design.gitlab.com/) +### 3. A `gitlab-ui` component not conforming to [Pajamas Design System](https://design.gitlab.com/) Some [Pajamas Design System](https://design.gitlab.com/) components implemented in -gitlab-ui do not conform with the design system specs because they lack some +`gitlab-ui` do not conform with the design system specs because they lack some planned features or are not correctly styled yet. In the Pajamas website, a banner on top of the component examples indicates that: diff --git a/doc/development/fe_guide/style/scss.md b/doc/development/fe_guide/style/scss.md index c6424e39ac2..4ec3c79b0ae 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? |