summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-04-02 10:56:33 +0000
committerPhil Hughes <me@iamphill.com>2019-04-02 10:56:33 +0000
commitf21f93f904505a5c5041a2e0f040fdad7107d3df (patch)
tree0b158f92716ec6be3d81e9bdf178ceae0eb49127
parentd4a4f68db5a2c680f6aa174e6abba35ed83a2d89 (diff)
parent5343eb06004217da32260d42e97f57ab438a3278 (diff)
downloadgitlab-ce-f21f93f904505a5c5041a2e0f040fdad7107d3df.tar.gz
Merge branch 'docs-css' into 'master'
Adds documentation about the utility classes See merge request gitlab-org/gitlab-ce!26824
-rw-r--r--doc/development/fe_guide/style_guide_scss.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/development/fe_guide/style_guide_scss.md b/doc/development/fe_guide/style_guide_scss.md
index b09243598d5..6f6b361f423 100644
--- a/doc/development/fe_guide/style_guide_scss.md
+++ b/doc/development/fe_guide/style_guide_scss.md
@@ -5,6 +5,15 @@ easy to maintain, and performant for the end-user.
## Rules
+### 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)
+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.
+
+We have a few internal utility classes in [`common.scss`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/assets/stylesheets/framework/common.scss)
+and we use [Bootstrap's Utility Classes](https://getbootstrap.com/docs/4.3/utilities/)
+
+New utility classes should be added to [`common.scss`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/assets/stylesheets/framework/common.scss).
+
### Naming
Filenames should use `snake_case`.