Download as
Browse Code »

Commit 1647f46b1f3e442c94dd58864b564e137f7fa04d

Authored by Dmitriy Zaporozhets
1 parent 788de6f1
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Project show page polished

Showing 2 changed files with 35 additions and 34 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @1647f46
... ... @@ -1010,6 +1010,7 @@ p.time {
1010 1010 }
1011 1011 }
1012 1012  
  1013 +.project_box,
1013 1014 .issue_box,
1014 1015 .commit_box,
1015 1016 .merge_request_box{
... ... @@ -1028,18 +1029,17 @@ p.time {
1028 1029 }
1029 1030 }
1030 1031  
1031   -.commit_box {
1032   - .commit_message {
1033   - margin: -20px;
1034   - padding: 20px;
1035   - margin-top:10px;
1036   - border-radius:0;
1037   - border:none;
1038   - font-size:12px;
1039   - background-color:#f5f5f5;
1040   - border:none;
1041   - border-top:1px solid #eee;
1042   - }
  1032 +.project_box .project_descr,
  1033 +.commit_box .commit_message {
  1034 + margin: -20px;
  1035 + padding: 20px;
  1036 + margin-top:10px;
  1037 + border-radius:0;
  1038 + border:none;
  1039 + font-size:12px;
  1040 + background-color:#f5f5f5;
  1041 + border:none;
  1042 + border-top:1px solid #eee;
1043 1043 }
1044 1044  
1045 1045 .highlight_word {
... ...
app/views/projects/show.html.haml
  Diff comments   View file @1647f46
1 1 = render "project_head"
2   -%h3
3   - = @project.name
4   - %span.right
5   - - if can? current_user, :download_code, @project
6   - = link_to "Download", archive_project_repository_path(@project), :class => "btn small padded"
7   - - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
8   - = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small padded" do
9   - Merge Request
10   - - if @project.issues_enabled && can?(current_user, :write_issue, @project)
11   - = link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do
12   - Issue
13   -.back_link
14   - = link_to projects_path do
15   - ← To projects list
16   -%br
17   -.alert-message.block-message.warning
18   - .input
19   - .input-prepend
20   - %span.add-on git clone
21   - = text_field_tag :project_clone, @project.url_to_repo, :class => "xlarge one_click_select git_clone_url"
  2 +.project_box
  3 + %h3
  4 + = @project.name
  5 + %span.right
  6 + - if can? current_user, :download_code, @project
  7 + = link_to "Download", archive_project_repository_path(@project), :class => "btn small padded"
  8 + - if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
  9 + = link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small padded" do
  10 + Merge Request
  11 + - if @project.issues_enabled && can?(current_user, :write_issue, @project)
  12 + = link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do
  13 + Issue
  14 + .back_link
  15 + = link_to projects_path do
  16 + ← To projects list
  17 + %br
  18 + .alert-message.block-message.warning
  19 + .input
  20 + .input-prepend
  21 + %span.add-on git clone
  22 + = text_field_tag :project_clone, @project.url_to_repo, :class => "xlarge one_click_select git_clone_url"
22 23  
23   -- if @project.description.present?
24   - .markdown.prettyprint= markdown @project.description
  24 + - if @project.description.present?
  25 + .markdown.project_descr= markdown @project.description
25 26 - unless @events.blank?
26 27 %br
27 28 %h5.cgray
... ...