Dont use nav-pills. Instead use nav-lists

Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/assets/stylesheets/framework/tw_bootstrap.scss

@@ -100,16 +100,6 @@
 }
 
 
-.nav-pills > li > a {
-  color: #666;
-}
-
-.nav-pills > .active > a > span > .badge {
-  background-color: #fff;
-  color: $gl-primary;
-}
-
-
 /**
  * fix to keep tooltips position in top navigation bar
  *

app/assets/stylesheets/pages/projects.scss

@@ -458,11 +458,11 @@ table.table.protected-branches-list tr.no-border {
   padding-top: 10px;
   padding-bottom: 4px;
 
-  ul.nav-pills {
+  ul.nav {
     display:inline-block;
   }
 
-  .nav-pills li {
+  .nav li {
     display:inline;
   }
 

app/views/admin/users/index.html.haml

 - page_title "Users"
 = render 'shared/show_aside'
 
-.row
-  %aside.col-md-3
-    .admin-filter
-      %ul.nav.nav-pills.nav-stacked
+.admin-filter
+  %ul.nav-links
     %li{class: "#{'active' unless params[:filter]}"}
       = link_to admin_users_path do
         Active
-            %small.pull-right= number_with_delimiter(User.active.count)
+        %small.badge= number_with_delimiter(User.active.count)
     %li{class: "#{'active' if params[:filter] == "admins"}"}
       = link_to admin_users_path(filter: "admins") do
         Admins
-            %small.pull-right= number_with_delimiter(User.admins.count)
+        %small.badge= number_with_delimiter(User.admins.count)
     %li.filter-two-factor-enabled{class: "#{'active' if params[:filter] == 'two_factor_enabled'}"}
       = link_to admin_users_path(filter: 'two_factor_enabled') do
         2FA Enabled
-            %small.pull-right= number_with_delimiter(User.with_two_factor.count)
+        %small.badge= number_with_delimiter(User.with_two_factor.count)
     %li.filter-two-factor-disabled{class: "#{'active' if params[:filter] == 'two_factor_disabled'}"}
       = link_to admin_users_path(filter: 'two_factor_disabled') do
         2FA Disabled
-            %small.pull-right= number_with_delimiter(User.without_two_factor.count)
+        %small.badge= number_with_delimiter(User.without_two_factor.count)
     %li{class: "#{'active' if params[:filter] == "blocked"}"}
       = link_to admin_users_path(filter: "blocked") do
         Blocked
-            %small.pull-right= number_with_delimiter(User.blocked.count)
+        %small.badge= number_with_delimiter(User.blocked.count)
     %li{class: "#{'active' if params[:filter] == "wop"}"}
       = link_to admin_users_path(filter: "wop") do
         Without projects
-            %small.pull-right= number_with_delimiter(User.without_projects.count)
-      %hr
-      = form_tag admin_users_path, method: :get, class: 'form-inline' do
-        .form-group
-          = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'form-control', spellcheck: false
-          = hidden_field_tag "filter", params[:filter]
-        = button_tag class: 'btn btn-primary' do
-          %i.fa.fa-search
-      %hr
-      = link_to 'Reset', admin_users_path, class: "btn btn-cancel"
+        %small.badge= number_with_delimiter(User.without_projects.count)
 
-  %section.col-md-9
-    .panel.panel-default
-      .panel-heading
-        Users (#{number_with_delimiter(@users.total_count)})
-        .panel-head-actions
+  .gray-content-block.second-block
+    .pull-right
       .dropdown.inline
-            %a.dropdown-toggle.btn.btn-sm{href: '#', "data-toggle" => "dropdown"}
+        %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
           %span.light sort:
           - if @sort.present?
             = sort_options_hash[@sort]
@@ -69,7 +55,16 @@
             = link_to admin_users_path(sort: sort_value_oldest_updated, filter: params[:filter]) do
               = sort_title_oldest_updated
 
-          = link_to 'New User', new_admin_user_path, class: "btn btn-new btn-sm"
+      = link_to 'New User', new_admin_user_path, class: "btn btn-new"
+    = form_tag admin_users_path, method: :get, class: 'form-inline' do
+      .form-group
+        = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'form-control', spellcheck: false
+        = hidden_field_tag "filter", params[:filter]
+      = button_tag class: 'btn btn-primary' do
+        %i.fa.fa-search
+
+
+.panel.panel-default
   %ul.well-list
     - @users.each do |user|
       %li
@@ -98,4 +93,4 @@
               = link_to 'Unlock', unlock_admin_user_path(user), method: :put, class: "btn btn-xs btn-success", data: { confirm: 'Are you sure?' }
             - if user.can_be_removed?
               = link_to 'Destroy', [:admin, user], data: { confirm: "USER #{user.name} WILL BE REMOVED! All issues, merge requests and groups linked to this user will also be removed! Maybe block the user instead? Are you sure?" }, method: :delete, class: "btn btn-xs btn-remove"
-    = paginate @users, theme: "gitlab"
+= paginate @users, theme: "gitlab"

app/views/projects/show.html.haml

@@ -14,7 +14,7 @@
 = render "home_panel"
 
 .project-stats.gray-content-block.second-block
-  %ul.nav.nav-pills
+  %ul.nav
     %li
       = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
         = pluralize(number_with_delimiter(@project.commit_count), 'commit')