diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 06fcc0c3..e2b3c9de 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1010,6 +1010,7 @@ p.time { } } +.project_box, .issue_box, .commit_box, .merge_request_box{ @@ -1028,18 +1029,17 @@ p.time { } } -.commit_box { - .commit_message { - margin: -20px; - padding: 20px; - margin-top:10px; - border-radius:0; - border:none; - font-size:12px; - background-color:#f5f5f5; - border:none; - border-top:1px solid #eee; - } +.project_box .project_descr, +.commit_box .commit_message { + margin: -20px; + padding: 20px; + margin-top:10px; + border-radius:0; + border:none; + font-size:12px; + background-color:#f5f5f5; + border:none; + border-top:1px solid #eee; } .highlight_word { diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index 27e38922..4062b271 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -1,27 +1,28 @@ = render "project_head" -%h3 - = @project.name - %span.right - - if can? current_user, :download_code, @project - = link_to "Download", archive_project_repository_path(@project), :class => "btn small padded" - - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project) - = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small padded" do - Merge Request - - if @project.issues_enabled && can?(current_user, :write_issue, @project) - = link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do - Issue -.back_link - = link_to projects_path do - ← To projects list -%br -.alert-message.block-message.warning - .input - .input-prepend - %span.add-on git clone - = text_field_tag :project_clone, @project.url_to_repo, :class => "xlarge one_click_select git_clone_url" +.project_box + %h3 + = @project.name + %span.right + - if can? current_user, :download_code, @project + = link_to "Download", archive_project_repository_path(@project), :class => "btn small padded" + - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project) + = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small padded" do + Merge Request + - if @project.issues_enabled && can?(current_user, :write_issue, @project) + = link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do + Issue + .back_link + = link_to projects_path do + ← To projects list + %br + .alert-message.block-message.warning + .input + .input-prepend + %span.add-on git clone + = text_field_tag :project_clone, @project.url_to_repo, :class => "xlarge one_click_select git_clone_url" -- if @project.description.present? - .markdown.prettyprint= markdown @project.description + - if @project.description.present? + .markdown.project_descr= markdown @project.description - unless @events.blank? %br %h5.cgray