summaryrefslogtreecommitdiff
path: root/doc/development
diff options
context:
space:
mode:
authorAllison Whilden <allison@gitlab.com>2017-01-04 12:28:19 -0800
committerAllison Whilden <allison@gitlab.com>2017-01-04 12:28:19 -0800
commit9c11a4949d5cefefad042cf62c81f9f13db649b6 (patch)
tree60968d0452ba9d8b17fc808dc61d439121776283 /doc/development
parent7c2a4699b8bdd9d8abd193e4256694115b41fc07 (diff)
downloadgitlab-ce-9c11a4949d5cefefad042cf62c81f9f13db649b6.tar.gz
[ci skip] UX Guide: Add new primary and secondary text colorsux-guide-text-color
Diffstat (limited to 'doc/development')
-rw-r--r--doc/development/ux_guide/basics.md7
-rw-r--r--doc/development/ux_guide/img/color-textprimary.pngbin0 -> 2553 bytes
-rw-r--r--doc/development/ux_guide/img/color-textsecondary.pngbin0 -> 2956 bytes
3 files changed, 7 insertions, 0 deletions
diff --git a/doc/development/ux_guide/basics.md b/doc/development/ux_guide/basics.md
index 76ec7fd466b..259b214bd59 100644
--- a/doc/development/ux_guide/basics.md
+++ b/doc/development/ux_guide/basics.md
@@ -58,6 +58,13 @@ GitLab uses Font Awesome icons throughout our interface.
| ![Red](img/color-red.png) | Closed | Delete and other destructive commands |
| ![Grey](img/color-grey.png) | Neutral | Neutral secondary commands |
+### Text colors
+
+|||
+| :---: | :--- |
+| ![Text primary](img/color-textprimary.png) | Used for primary body text, such as issue description and comment |
+| ![Text secondary](img/color-textsecondary.png) | Used for secondary body text, such as username and date |
+
> TODO: Establish a perspective for color in terms of our personality and rationalize with Marketing usage.
---
diff --git a/doc/development/ux_guide/img/color-textprimary.png b/doc/development/ux_guide/img/color-textprimary.png
new file mode 100644
index 00000000000..90f2821f0cf
--- /dev/null
+++ b/doc/development/ux_guide/img/color-textprimary.png
Binary files differ
diff --git a/doc/development/ux_guide/img/color-textsecondary.png b/doc/development/ux_guide/img/color-textsecondary.png
new file mode 100644
index 00000000000..61cb8a13c45
--- /dev/null
+++ b/doc/development/ux_guide/img/color-textsecondary.png
Binary files differ