summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllison Whilden <allison@gitlab.com>2016-12-20 11:15:43 -0800
committerAllison Whilden <allison@gitlab.com>2016-12-22 12:48:28 -0800
commit77da936b73947a224d5179bec787dee72266555c (patch)
tree88c7dcb195074bbd827aaeca917e0acc2163473b
parent7ca181d8e03f58a7be1e901645b26bb0cc8e89fb (diff)
downloadgitlab-ce-ux-guide-color-update.tar.gz
[ci skip] UX Guide: split state and action guidance for colorux-guide-color-update
[ci skip] UX Guide: Add retry to blue
-rw-r--r--doc/development/ux_guide/basics.md14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/development/ux_guide/basics.md b/doc/development/ux_guide/basics.md
index e81729556d8..76ec7fd466b 100644
--- a/doc/development/ux_guide/basics.md
+++ b/doc/development/ux_guide/basics.md
@@ -50,13 +50,13 @@ GitLab uses Font Awesome icons throughout our interface.
## Color
-| | |
-| :------: | :------- |
-| ![Blue](img/color-blue.png) | Blue is used to highlight primary active elements (such as the current tab), as well as other organizational and managing commands.|
-| ![Green](img/color-green.png) | Green is for actions that create new objects. |
-| ![Orange](img/color-orange.png) | Orange is used for warnings |
-| ![Red](img/color-red.png) | Red is reserved for delete and other destructive commands |
-| ![Grey](img/color-grey.png) | Grey is used for neutral secondary elements. Depending on context, white is sometimes used instead. |
+| | State | Action |
+| :------: | :------- | :------- |
+| ![Blue](img/color-blue.png) | Primary and active (such as the current tab) | Organizational, managing, and retry commands|
+| ![Green](img/color-green.png) | Opened | Create new objects |
+| ![Orange](img/color-orange.png) | Warning | Non destructive action |
+| ![Red](img/color-red.png) | Closed | Delete and other destructive commands |
+| ![Grey](img/color-grey.png) | Neutral | Neutral secondary commands |
> TODO: Establish a perspective for color in terms of our personality and rationalize with Marketing usage.