Commit 2079253f authored by Phil Hughes's avatar Phil Hughes

Merge branch '32496-admin-tabs' into 'master'

Fix admin tabs

Closes #32496

See merge request !11514
parents a83bef6c e983f03a
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
= render "admin/dashboard/head" = render "admin/dashboard/head"
%div{ class: container_class } %div{ class: container_class }
.top-area
.prepend-top-default .prepend-top-default
= form_tag admin_users_path, method: :get do = form_tag admin_users_path, method: :get do
- if params[:filter].present? - if params[:filter].present?
...@@ -35,9 +34,12 @@ ...@@ -35,9 +34,12 @@
= sort_title_oldest_updated = sort_title_oldest_updated
= link_to 'New user', new_admin_user_path, class: 'btn btn-new btn-search' = link_to 'New user', new_admin_user_path, class: 'btn btn-new btn-search'
.nav-block .top-area.scrolling-tabs-container.inner-page-scroll-tabs
%ul.nav-links.wide.scrolling-tabs.white.scrolling-tabs
.fade-left .fade-left
= icon('angle-left')
.fade-right
= icon('angle-right')
%ul.nav-links.scrolling-tabs
= nav_link(html_options: { class: active_when(params[:filter].nil?) }) do = nav_link(html_options: { class: active_when(params[:filter].nil?) }) do
= link_to admin_users_path do = link_to admin_users_path do
Active Active
...@@ -66,7 +68,6 @@ ...@@ -66,7 +68,6 @@
= link_to admin_users_path(filter: "wop") do = link_to admin_users_path(filter: "wop") do
Without projects Without projects
%small.badge= number_with_delimiter(User.without_projects.count) %small.badge= number_with_delimiter(User.without_projects.count)
.fade-right
%ul.flex-list.content-list %ul.flex-list.content-list
- if @users.empty? - if @users.empty?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment