Commit b78f6581434b30f18e694e57c7427ad764fc26f4

Authored by gitlabhq
1 parent a44e3292

dashboard beautify

app/assets/stylesheets/projects.css.scss
@@ -443,16 +443,6 @@ input.ssh_project_url { @@ -443,16 +443,6 @@ input.ssh_project_url {
443 padding: 10px; 443 padding: 10px;
444 } 444 }
445 445
446 -.commit,  
447 -.message{  
448 - .author {  
449 - background: #eaeaea;  
450 - color: #333;  
451 - border: 1px solid #aaa;  
452 - padding:1px 2px;  
453 - margin-right:5px;  
454 - }  
455 -}  
456 446
457 /* Note textare */ 447 /* Note textare */
458 #note_note { 448 #note_note {
@@ -673,4 +663,21 @@ body.project-page #notes-list .note span.note-author strong{font-weight: bold; f @@ -673,4 +663,21 @@ body.project-page #notes-list .note span.note-author strong{font-weight: bold; f
673 } 663 }
674 } 664 }
675 665
676 -.message .note-title p { margin-bottom:0px; } 666 +//.message .note-title p { margin-bottom:0px; }
  667 +
  668 +.commit,
  669 +.message {
  670 + .title {
  671 + color:#666;
  672 + a {
  673 + color:#666 !important;
  674 + }
  675 + p {
  676 + margin-top:0px;
  677 + }
  678 + }
  679 +
  680 + .author {
  681 + color: #999
  682 + }
  683 +}
app/views/projects/_recent_commits.html.haml
@@ -21,12 +21,11 @@ @@ -21,12 +21,11 @@
21 = image_tag gravatar_icon(commit.author.email), :class => "left", :width => 40, :style => "padding-right:5px;" 21 = image_tag gravatar_icon(commit.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
22 - else 22 - else
23 = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;" 23 = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
24 - %p{:style => "margin-bottom: 3px;"}  
25 - %strong  
26 - = link_to truncate(commit.safe_message, :length => fixed_mode? ? 40 : 100), project_commit_path(@project, :id => commit.id) 24 + .title
  25 + %p= link_to truncate(commit.safe_message, :length => fixed_mode? ? 40 : 100), project_commit_path(@project, :id => commit.id)
27 26
28 %span 27 %span
29 - %span.note-author 28 + %span.author
30 %strong= commit.author.name.force_encoding("UTF-8") 29 %strong= commit.author.name.force_encoding("UTF-8")
31 %cite.cgray 30 %cite.cgray
32 = time_ago_in_words(commit.committed_date) 31 = time_ago_in_words(commit.committed_date)
app/views/projects/_recent_messages.html.haml
@@ -13,15 +13,15 @@ @@ -13,15 +13,15 @@
13 %td 13 %td
14 %div.message 14 %div.message
15 = image_tag gravatar_icon(note.author_email), :class => "left", :width => 40, :style => "padding-right:5px;" 15 = image_tag gravatar_icon(note.author_email), :class => "left", :width => 40, :style => "padding-right:5px;"
16 - %div.note-author  
17 - %strong= note.author_name  
18 - %cite.cgray  
19 - = time_ago_in_words(note.updated_at)  
20 - ago  
21 - %div.note-title 16 + %div.title
22 = link_to markdown(truncate(note.note, :length => fixed_mode? ? 40 : 100)), dashboard_feed_path(@project, parent) + "#note_#{note.id}" 17 = link_to markdown(truncate(note.note, :length => fixed_mode? ? 40 : 100)), dashboard_feed_path(@project, parent) + "#note_#{note.id}"
23 - if note.attachment.url 18 - if note.attachment.url
24 %br 19 %br
25 Attachment: 20 Attachment:
26 = link_to note.attachment_identifier, note.attachment.url 21 = link_to note.attachment_identifier, note.attachment.url
  22 + %div.author
  23 + %strong= note.author_name
  24 + %cite.cgray
  25 + = time_ago_in_words(note.updated_at)
  26 + ago
27 %br 27 %br