diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-02-19 15:26:59 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-02-19 15:26:59 +0300 |
| commit | c21c8825d812d0fecd887090fbb4377cc7ee2f97 (patch) | |
| tree | 1b6c98b1d85feb3f7634763bf56bc9444c43c8f5 /app/views | |
| parent | e586858eb58cc628f700c4f0d6ae7b574def3be9 (diff) | |
| parent | 099a29933851e8766d86c1d48e28ee4cdce5a14b (diff) | |
Merge branch 'issue_11872' into 'master'
Put project visibility icon next to title
Fixes #11872
See merge request !2885
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/_home_panel.html.haml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index 298c6664997..b45df44f270 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/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 |