From b78f6581434b30f18e694e57c7427ad764fc26f4 Mon Sep 17 00:00:00 2001 From: gitlabhq Date: Wed, 9 Nov 2011 06:37:01 -0500 Subject: [PATCH] dashboard beautify --- app/assets/stylesheets/projects.css.scss | 29 ++++++++++++------- app/views/projects/_recent_commits.html.haml | 7 ++--- app/views/projects/_recent_messages.html.haml | 12 ++++---- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss index 8c5d8a68..10885d3b 100644 --- a/app/assets/stylesheets/projects.css.scss +++ b/app/assets/stylesheets/projects.css.scss @@ -443,16 +443,6 @@ input.ssh_project_url { padding: 10px; } -.commit, -.message{ - .author { - background: #eaeaea; - color: #333; - border: 1px solid #aaa; - padding:1px 2px; - margin-right:5px; - } -} /* Note textare */ #note_note { @@ -673,4 +663,21 @@ body.project-page #notes-list .note span.note-author strong{font-weight: bold; f } } -.message .note-title p { margin-bottom:0px; } +//.message .note-title p { margin-bottom:0px; } + +.commit, +.message { + .title { + color:#666; + a { + color:#666 !important; + } + p { + margin-top:0px; + } + } + + .author { + color: #999 + } +} diff --git a/app/views/projects/_recent_commits.html.haml b/app/views/projects/_recent_commits.html.haml index 385fa4b6..5e9eca8d 100644 --- a/app/views/projects/_recent_commits.html.haml +++ b/app/views/projects/_recent_commits.html.haml @@ -21,12 +21,11 @@ = image_tag gravatar_icon(commit.author.email), :class => "left", :width => 40, :style => "padding-right:5px;" - else = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;" - %p{:style => "margin-bottom: 3px;"} - %strong - = link_to truncate(commit.safe_message, :length => fixed_mode? ? 40 : 100), project_commit_path(@project, :id => commit.id) + .title + %p= link_to truncate(commit.safe_message, :length => fixed_mode? ? 40 : 100), project_commit_path(@project, :id => commit.id) %span - %span.note-author + %span.author %strong= commit.author.name.force_encoding("UTF-8") %cite.cgray = time_ago_in_words(commit.committed_date) diff --git a/app/views/projects/_recent_messages.html.haml b/app/views/projects/_recent_messages.html.haml index 00052963..1a8c8c97 100644 --- a/app/views/projects/_recent_messages.html.haml +++ b/app/views/projects/_recent_messages.html.haml @@ -13,15 +13,15 @@ %td %div.message = image_tag gravatar_icon(note.author_email), :class => "left", :width => 40, :style => "padding-right:5px;" - %div.note-author - %strong= note.author_name - %cite.cgray - = time_ago_in_words(note.updated_at) - ago - %div.note-title + %div.title = link_to markdown(truncate(note.note, :length => fixed_mode? ? 40 : 100)), dashboard_feed_path(@project, parent) + "#note_#{note.id}" - if note.attachment.url %br Attachment: = link_to note.attachment_identifier, note.attachment.url + %div.author + %strong= note.author_name + %cite.cgray + = time_ago_in_words(note.updated_at) + ago %br