summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2017-09-21 13:58:01 +0000
committerMarcia Ramos <virtua.creative@gmail.com>2017-09-21 13:58:01 +0000
commit356658805765d01e52c7bec934173ffa8aaa6ada (patch)
treeb04138a4e7a715b1f07e5dadebce2420175ccf5d
parent42453069fa3ada16342cd0c53788230f0409f791 (diff)
parent0058c315f84d712010e512681e0481bcf34f094a (diff)
downloadgitlab-ce-356658805765d01e52c7bec934173ffa8aaa6ada.tar.gz
Merge branch '32894-update-ux-icon-documentation' into 'master'
Resolve "[Meta] Create Uniquely 'GitLab' Icons" Closes #32894 See merge request gitlab-org/gitlab-ce!14396
-rw-r--r--doc/development/ux_guide/basics.md22
-rw-r--r--doc/development/ux_guide/img/icon-spec.pngbin0 -> 13889 bytes
2 files changed, 10 insertions, 12 deletions
diff --git a/doc/development/ux_guide/basics.md b/doc/development/ux_guide/basics.md
index a436e9b1948..dcd5f677f25 100644
--- a/doc/development/ux_guide/basics.md
+++ b/doc/development/ux_guide/basics.md
@@ -32,19 +32,17 @@ This is the typeface used for code blocks and references to commits, branches, a
---
## Icons
-GitLab uses Font Awesome icons throughout our interface.
-| | |
-| :-----------: | :---- |
-| ![Trash icon](img/icon-trash.png) | The trash icon is used for destructive actions that deletes information. |
-| ![Edit icon](img/icon-edit.png) | The pencil icon is used for editing content such as comments.|
-| ![Notification icon](img/icon-notification.png) | The bell icon is for notifications, such as Todos. |
-| ![Subscribe icon](img/icon-subscribe.png) | The eye icon is for subscribing to updates. For example, you can subscribe to a label and get updated on issues with that label. |
-| ![RSS icon](img/icon-rss.png) | The standard RSS icon is used for linking to RSS/atom feeds. |
-| ![Close icon](img/icon-close.png) | An 'x' is used for closing UI elements such as dropdowns. |
-| ![Add icon](img/icon-add.png) | A plus is used when creating new objects, such as issues, projects, etc. |
-
-> TODO: update this section, add more general guidance to icon usage and personality, etc.
+GitLab has a strong, unique personality. When you look at any screen, you should know immediately know that it is GitLab.
+Iconography is a powerful visual cue to the user and is a great way for us to reflect our particular sense of style.
+
+- **Standard size:** 16px * 16px
+- **Border thickness:** 2px
+- **Border radius:** 3px
+
+![Icon sampler](img/icon-spec.png)
+
+> TODO: List all icons, proper usage, hover, and active states.
---
diff --git a/doc/development/ux_guide/img/icon-spec.png b/doc/development/ux_guide/img/icon-spec.png
new file mode 100644
index 00000000000..56b19610dc1
--- /dev/null
+++ b/doc/development/ux_guide/img/icon-spec.png
Binary files differ