diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-01-05 11:29:23 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-01-05 11:29:23 +0000 |
commit | 0a1d1fbd292ee4dac8066973027b084eab437fe7 (patch) | |
tree | 81bc6972918f27c3fd4c13145634cbdb1f171e06 /doc/development | |
parent | 583667087506709fbfe3e72e64c86dacda4eb296 (diff) | |
parent | 728229439441512e1685e5bdd3bdf87de105e4e3 (diff) | |
download | gitlab-ce-0a1d1fbd292ee4dac8066973027b084eab437fe7.tar.gz |
Merge branch 'ux-guide-search-box' into 'master'
UX Guide: add section on search box
See merge request !8429
Diffstat (limited to 'doc/development')
-rw-r--r-- | doc/development/ux_guide/components.md | 13 | ||||
-rw-r--r-- | doc/development/ux_guide/img/components-searchbox.png | bin | 0 -> 5292 bytes | |||
-rw-r--r-- | doc/development/ux_guide/img/components-searchboxscoped.png | bin | 0 -> 9668 bytes |
3 files changed, 13 insertions, 0 deletions
diff --git a/doc/development/ux_guide/components.md b/doc/development/ux_guide/components.md index 28383ad7dfc..706bb180912 100644 --- a/doc/development/ux_guide/components.md +++ b/doc/development/ux_guide/components.md @@ -12,6 +12,7 @@ * [Panels](#panels) * [Alerts](#alerts) * [Forms](#forms) +* [Search box](#search-box) * [File holders](#file-holders) * [Data formats](#data-formats) @@ -215,6 +216,18 @@ Horizontal form (`form.horizontal-form`) with label rendered inline with input. --- +## Search box + +Search boxes across GitLab have a consistent rest, active and text entered state. When text isn't entered in the box, there should be a magnifying glass right aligned with the input field. When text is entered, the magnifying glass should become a x, allowing users to clear their text. + +![Search box](img/components-searchbox.png) + +If needed, we indicate the scope of the search in the search box. + +![Scoped Search box](img/components-searchboxscoped.png) + +--- + ## File holders A file holder (`.file-holder`) is used to show the contents of a file inline on a page of GitLab. diff --git a/doc/development/ux_guide/img/components-searchbox.png b/doc/development/ux_guide/img/components-searchbox.png Binary files differnew file mode 100644 index 00000000000..a25189296ba --- /dev/null +++ b/doc/development/ux_guide/img/components-searchbox.png diff --git a/doc/development/ux_guide/img/components-searchboxscoped.png b/doc/development/ux_guide/img/components-searchboxscoped.png Binary files differnew file mode 100644 index 00000000000..b116d714848 --- /dev/null +++ b/doc/development/ux_guide/img/components-searchboxscoped.png |