OSDN Git Service

Project show page polished
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Mon, 26 Mar 2012 20:11:15 +0000 (23:11 +0300)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Mon, 26 Mar 2012 20:11:15 +0000 (23:11 +0300)
app/assets/stylesheets/common.scss
app/views/projects/show.html.haml

index 06fcc0c..e2b3c9d 100644 (file)
@@ -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 { 
index 27e3892..4062b27 100644 (file)
@@ -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 
-    &larr; 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 
+      &larr; 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