diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-18 18:08:11 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-02-18 18:08:11 -0500 |
| commit | 099a29933851e8766d86c1d48e28ee4cdce5a14b (patch) | |
| tree | fe56d19e44714405c667977d3a5464b0f16a1d67 | |
| parent | ea4d2741a2b574407b0bd387ccd6a8202c014fc5 (diff) | |
| download | gitlab-ce-issue_11872.tar.gz | |
Move visibility icon next to project titleissue_11872
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 19 | ||||
| -rw-r--r-- | app/views/projects/_home_panel.html.haml | 11 |
2 files changed, 13 insertions, 17 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 046bae672fc..542ac896f6b 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/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; 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 |