diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-27 00:22:36 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-27 00:22:36 +0200 |
| commit | dcdf214fd15244fd41cc22cfc068c0b6ee421069 (patch) | |
| tree | d18c8356f7cd0a97d02d31ec6bf6ccf0047d71ab | |
| parent | 3d02ead9246c7112d5a32ee87da774e47927c84e (diff) | |
| download | gitlab-ce-dcdf214fd15244fd41cc22cfc068c0b6ee421069.tar.gz | |
More compact search page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/assets/stylesheets/pages/search.scss | 6 | ||||
| -rw-r--r-- | app/views/search/_category.html.haml | 2 | ||||
| -rw-r--r-- | app/views/search/show.html.haml | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss index bdaa17ac339..eee0e342c31 100644 --- a/app/assets/stylesheets/pages/search.scss +++ b/app/assets/stylesheets/pages/search.scss @@ -1,7 +1,7 @@ .search-results { .search-result-row { - border-bottom: 1px solid #EEE; - padding-bottom: 10px; - margin-bottom: 10px; + border-bottom: 1px solid #DDD; + padding-bottom: 15px; + margin-bottom: 15px; } } diff --git a/app/views/search/_category.html.haml b/app/views/search/_category.html.haml index a75cd7bd809..d637abfa76b 100644 --- a/app/views/search/_category.html.haml +++ b/app/views/search/_category.html.haml @@ -1,4 +1,4 @@ -%ul.nav.nav-pills.search-filter +%ul.nav.nav-tabs.search-filter - if @project %li{class: ("active" if @scope == 'blobs')} = link_to search_filter_path(scope: 'blobs') do diff --git a/app/views/search/show.html.haml b/app/views/search/show.html.haml index 60f9e9ac9de..35b23ceb9d7 100644 --- a/app/views/search/show.html.haml +++ b/app/views/search/show.html.haml @@ -1,7 +1,6 @@ - page_title @search_term = render 'search/form' -%hr +%br - if @search_term = render 'search/category' - %hr = render 'search/results' |