diff options
author | Robert Schilling <rschilling@student.tugraz.at> | 2014-08-20 02:38:52 +0200 |
---|---|---|
committer | Robert Schilling <rschilling@student.tugraz.at> | 2014-08-20 02:38:52 +0200 |
commit | 5e7f5ee8b8f29c9a21c6eac89c71cd71485519e1 (patch) | |
tree | cd4301d530c99f8250e68d399b6c2c2cb7025acd | |
parent | 0b3ebb6440420de714fe5066aba19ca77e8b1b8f (diff) | |
download | gitlab-ce-5e7f5ee8b8f29c9a21c6eac89c71cd71485519e1.tar.gz |
Restyle explore projects to fix #7548
-rw-r--r-- | app/assets/stylesheets/sections/dashboard.scss | 4 | ||||
-rw-r--r-- | app/views/explore/projects/_project.html.haml | 41 |
2 files changed, 25 insertions, 20 deletions
diff --git a/app/assets/stylesheets/sections/dashboard.scss b/app/assets/stylesheets/sections/dashboard.scss index 6487e0acd91..2be24e9b131 100644 --- a/app/assets/stylesheets/sections/dashboard.scss +++ b/app/assets/stylesheets/sections/dashboard.scss @@ -89,6 +89,10 @@ } } +.project-description { + overflow: hidden; +} + .project-access-icon { margin-left: 10px; float: left; diff --git a/app/views/explore/projects/_project.html.haml b/app/views/explore/projects/_project.html.haml index a9498416c8a..0b4be2ef5cd 100644 --- a/app/views/explore/projects/_project.html.haml +++ b/app/views/explore/projects/_project.html.haml @@ -1,25 +1,26 @@ %li - %h4.project-title - .project-access-icon - = visibility_level_icon(project.visibility_level) - = link_to project.name_with_namespace, project + .project-access-icon + = visibility_level_icon(project.visibility_level) - - if current_page?(starred_explore_projects_path) - %strong.pull-right - = pluralize project.star_count, 'star' + .project-description + %h4.project-title + = link_to project.name_with_namespace, project - - if project.description.present? - %p.project-description.str-truncated - = project.description + - if current_page?(starred_explore_projects_path) + %strong.pull-right + = pluralize project.star_count, 'star' - .repo-info - - unless project.empty_repo? - = link_to pluralize(project.repository.round_commit_count, 'commit'), project_commits_path(project, project.default_branch) - · - = link_to pluralize(project.repository.branch_names.count, 'branch'), project_branches_path(project) - · - = link_to pluralize(project.repository.tag_names.count, 'tag'), project_tags_path(project) - - else - %i.icon-warning-sign - Empty repository + - if project.description.present? + %p.project-description.str-truncated + = project.description + .repo-info + - unless project.empty_repo? + = link_to pluralize(project.repository.round_commit_count, 'commit'), project_commits_path(project, project.default_branch) + · + = link_to pluralize(project.repository.branch_names.count, 'branch'), project_branches_path(project) + · + = link_to pluralize(project.repository.tag_names.count, 'tag'), project_tags_path(project) + - else + %i.icon-warning-sign + Empty repository |