diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-26 13:31:14 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-26 13:31:14 +0200 |
commit | fcf55171c4d5a25bc08da37e704f95ca8ca4e06b (patch) | |
tree | 227533d187a2f81a6fedc55dc2bc10b032cb1d96 | |
parent | 7458437ed970b610defc2ab3042ea1494b06e822 (diff) | |
parent | 05de390fd872b8aae48cd0f53b5edd308a18e51d (diff) | |
download | gitlab-ce-fcf55171c4d5a25bc08da37e704f95ca8ca4e06b.tar.gz |
Merge branch 'skv-headless-privacy_label'
-rw-r--r-- | app/assets/stylesheets/sections/dashboard.scss | 12 | ||||
-rw-r--r-- | app/views/dashboard/_project.html.haml | 2 | ||||
-rw-r--r-- | app/views/groups/_projects.html.haml | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss index 6937097fb84..f482a7c4393 100644 --- a/app/assets/stylesheets/sections/dashboard.scss +++ b/app/assets/stylesheets/sections/dashboard.scss @@ -66,7 +66,7 @@ } .project-row, .group-row { - padding: 10px 15px !important; + padding: 10px 12px !important; .namespace-name { color: #666; @@ -122,3 +122,13 @@ color: #BBB; } } + +.dash-project-access-icon { + float: left; + margin-right: 10px; + font-size: 18px; + color: #BBB; + margin-bottom: 10px; + margin-top: 2px; + width: 16px; +} diff --git a/app/views/dashboard/_project.html.haml b/app/views/dashboard/_project.html.haml index 50b833f3d82..5792a015967 100644 --- a/app/views/dashboard/_project.html.haml +++ b/app/views/dashboard/_project.html.haml @@ -1,4 +1,6 @@ = link_to project_path(project), class: dom_class(project) do + .dash-project-access-icon + = visibility_level_icon(project.visibility_level) %span.namespace-name - if project.namespace = project.namespace.human_name diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml index 16a3c60f660..9b155484e60 100644 --- a/app/views/groups/_projects.html.haml +++ b/app/views/groups/_projects.html.haml @@ -12,6 +12,8 @@ - projects.each do |project| %li.project-row = link_to project_path(project), class: dom_class(project) do + .dash-project-access-icon + = visibility_level_icon(project.visibility_level) %span.project-name = truncate(project.name, length: 25) %span.arrow |