diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-28 14:37:43 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-28 14:37:43 +0000 |
| commit | cbee5f00fdc045eae3be2d7598e251ef4545df2f (patch) | |
| tree | 2303e14c2c1c64bbbbee0adf7e5f3de88fa63aa0 /doc/development | |
| parent | 8afe8fb463e405f7fd2f1f344d8f2491067e74cc (diff) | |
| parent | 77da936b73947a224d5179bec787dee72266555c (diff) | |
| download | gitlab-ce-cbee5f00fdc045eae3be2d7598e251ef4545df2f.tar.gz | |
Merge branch 'ux-guide-color-update' into 'master'
UX Guide: split state and action guidance for color
See merge request !8204
Diffstat (limited to 'doc/development')
| -rw-r--r-- | doc/development/ux_guide/basics.md | 14 |
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 is used to highlight primary active elements (such as the current tab), as well as other organizational and managing commands.| -|  | Green is for actions that create new objects. | -|  | Orange is used for warnings | -|  | Red is reserved for delete and other destructive commands | -|  | Grey is used for neutral secondary elements. Depending on context, white is sometimes used instead. | +| | State | Action | +| :------: | :------- | :------- | +|  | Primary and active (such as the current tab) | Organizational, managing, and retry commands| +|  | Opened | Create new objects | +|  | Warning | Non destructive action | +|  | Closed | Delete and other destructive commands | +|  | Neutral | Neutral secondary commands | > TODO: Establish a perspective for color in terms of our personality and rationalize with Marketing usage. |