Merge branch 'fix-explore-projects' into 'master'

Improve UI for explore projects page

Move visibility and tags filter inline with navigation links
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @jschatz1 @skyruler 

See merge request !3079

app/assets/stylesheets/framework/nav.scss

@@ -79,6 +79,10 @@
     > .dropdown {
       margin-right: $gl-padding-top;
       display: inline-block;
+
+      &:last-child {
+        margin-right: 0;
+      }
     }
 
     > .btn {

app/views/explore/projects/_filter.html.haml

-.pull-right.hidden-sm.hidden-xs
-  - if current_user
-    .dropdown.inline.append-right-10
+- if current_user
+  .dropdown
     %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
-        %i.fa.fa-globe
+      = icon('globe')
       %span.light Visibility:
       - if params[:visibility_level].present?
         = visibility_level_label(params[:visibility_level].to_i)
@@ -19,10 +18,10 @@
             = visibility_level_icon(level)
             = visibility_level_label(level)
 
-  - if @tags.present?
-    .dropdown.inline.append-right-10
+- if @tags.present?
+  .dropdown
     %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
-        %i.fa.fa-tags
+      = icon('tags')
       %span.light Tags:
       - if params[:tag].present?
         = params[:tag]

app/views/explore/projects/index.html.haml

@@ -9,7 +9,7 @@
 .top-area
   = render 'explore/projects/nav'
 
-.gray-content-block.second-block.clearfix
+  .nav-controls
     = render 'filter'
 
 = render 'projects', projects: @projects