Merge branch 'issue_11872' into 'master'

Put project visibility icon next to title

Fixes #11872

See merge request !2885

app/assets/stylesheets/pages/projects.scss

@@ -73,24 +73,19 @@
       font-weight: normal;
     }
 
+    .visibility-icon {
+      display: inline-block;
+      margin-left: 5px;
+      font-size: 18px;
+      color: $gray;
+    }
+
     p {
       padding: 0 $gl-padding;
       color: #5c5d5e;
     }
   }
 
-  .visibility-level-label {
-    @extend .btn;
-    @extend .btn-gray;
-
-    color: $gray;
-    cursor: default;
-
-    i {
-      color: inherit;
-    }
-  }
-
   .project-repo-buttons {
     margin-top: 20px;
     margin-bottom: 0px;

app/views/projects/_home_panel.html.haml

@@ -3,7 +3,12 @@
   .project-identicon-holder
     = project_icon(@project, alt: '', class: 'project-avatar avatar s90')
   .project-home-desc
-    %h1= @project.name
+    %h1
+      = @project.name
+      %span.visibility-icon.has_tooltip{data: { container: 'body' },
+        title: "#{visibility_level_label(@project.visibility_level)} - #{project_visibility_level_description(@project.visibility_level)}"}
+        = visibility_level_icon(@project.visibility_level, fw: false)
+
     - if @project.description.present?
       = markdown(@project.description, pipeline: :description)
 
@@ -12,10 +17,6 @@
         Forked from
         = link_to project_path(forked_from_project) do
           = forked_from_project.namespace.try(:name)
-  .cover-controls.left
-    .visibility-level-label.has_tooltip{title: project_visibility_level_description(@project.visibility_level), data: { container: 'body' } }
-      = visibility_level_icon(@project.visibility_level, fw: false)
-      = visibility_level_label(@project.visibility_level)
 
   .cover-controls
     - if current_user