diff options
| author | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-04-12 15:14:28 +0300 |
|---|---|---|
| committer | Ezekiel Kigbo <ekigbo@gitlab.com> | 2019-05-06 18:41:47 +0300 |
| commit | aebf22f639073ab4d5c0ff4970d60bf24e8879f0 (patch) | |
| tree | 72f9b9c8f7f33990aab4410d746be2f267ad3f49 /app/views/dashboard | |
| parent | c1f5205d9123d7f497d56235b4330145ef80a652 (diff) | |
Ensure we dont apply changes to admin/projects
The changes introduced for the project filter bar should
not apply to the admin projects screen.
Remove "Owned by me", "Owned by anyone" options
Update the dropdown option Last created -> Created date.
Introduces fixes for spacing and minor styling across breakpoints.
Diffstat (limited to 'app/views/dashboard')
| -rw-r--r-- | app/views/dashboard/_projects_head.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml index f52f4eec36a..e62ec3afd0b 100644 --- a/app/views/dashboard/_projects_head.html.haml +++ b/app/views/dashboard/_projects_head.html.haml @@ -1,6 +1,7 @@ - is_explore = local_assigns.fetch(:is_explore, false) - is_explore_trending = local_assigns.fetch(:is_explore_trending, false) - without_tabs = local_assigns.fetch(:without_tabs, false) +- feature_project_list_filter_bar = Feature.enabled?(:project_list_filter_bar) = content_for :flash_message do = render 'shared/project_limit' @@ -14,7 +15,7 @@ .top-area.scrolling-tabs-container.inner-page-scroll-tabs .fade-left= icon('angle-left') .fade-right= icon('angle-right') - %ul.nav-links.scrolling-tabs.mobile-separator.nav.nav-tabs.border-0 + %ul.nav-links.scrolling-tabs.mobile-separator.nav.nav-tabs{ class: feature_project_list_filter_bar ? "border-0" : "" } = nav_link(page: [dashboard_projects_path, root_path]) do = link_to dashboard_projects_path, class: 'shortcuts-activity', data: {placement: 'right'} do = _("Your projects") @@ -26,10 +27,10 @@ = nav_link(page: [explore_root_path, trending_explore_projects_path, starred_explore_projects_path, explore_projects_path]) do = link_to explore_root_path, data: {placement: 'right'} do = _("Explore projects") - - unless Feature.enabled?(:project_list_filter_bar) + - unless feature_project_list_filter_bar .nav-controls = render 'shared/projects/search_form' = render 'shared/projects/dropdown' -- if Feature.enabled?(:project_list_filter_bar) +- if feature_project_list_filter_bar .project-filters = render 'shared/projects/search_bar', is_explore: is_explore, is_explore_trending: is_explore_trending, without_tabs: without_tabs |