Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5FA07F726 for ; Wed, 8 May 2013 15:35:00 +0000 (UTC) Received: (qmail 40378 invoked by uid 500); 8 May 2013 15:35:00 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 40306 invoked by uid 500); 8 May 2013 15:35:00 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 39315 invoked by uid 99); 8 May 2013 15:34:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 May 2013 15:34:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 188D9889C2A; Wed, 8 May 2013 15:34:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tvansteenburgh@apache.org To: allura-commits@incubator.apache.org Date: Wed, 08 May 2013 15:35:33 -0000 Message-Id: <6163138ee6ab414fbb4acb08b6a39bc2@git.apache.org> In-Reply-To: <5a003d12bac04779b1826db6266a34a0@git.apache.org> References: <5a003d12bac04779b1826db6266a34a0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [36/50] git commit: [#5773] ticket:328 fixed css for log widget [#5773] ticket:328 fixed css for log widget Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/5a51840a Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/5a51840a Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/5a51840a Branch: refs/heads/tv/docs Commit: 5a51840a77960d13fe96f897290d0eee09fbe963 Parents: cf33112 Author: Yuriy Arhipov Authored: Wed May 1 18:19:25 2013 +0400 Committer: Dave Brondsema Committed: Thu May 2 20:37:05 2013 +0000 ---------------------------------------------------------------------- Allura/allura/nf/allura/css/allura.css | 2 ++ Allura/allura/templates/widgets/repo/log.html | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5a51840a/Allura/allura/nf/allura/css/allura.css ---------------------------------------------------------------------- diff --git a/Allura/allura/nf/allura/css/allura.css b/Allura/allura/nf/allura/css/allura.css index 7b0471c..1334b0c 100644 --- a/Allura/allura/nf/allura/css/allura.css +++ b/Allura/allura/nf/allura/css/allura.css @@ -211,6 +211,8 @@ b.ico.ico-vote-down { background-image: url('../images/vote_down.png'); } .pagination_size { height: 40px; } + tr.rev div.markdown_content p { padding: 0; + margin-bottom: 0; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5a51840a/Allura/allura/templates/widgets/repo/log.html ---------------------------------------------------------------------- diff --git a/Allura/allura/templates/widgets/repo/log.html b/Allura/allura/templates/widgets/repo/log.html index 50affe6..c46b425 100644 --- a/Allura/allura/templates/widgets/repo/log.html +++ b/Allura/allura/templates/widgets/repo/log.html @@ -45,11 +45,13 @@ {% endif %} {% if commit.committed.email != commit.authored.email %} {% if commit.committer_url %} + by {{email_gravatar(commit.committed.email, title=commit.committed.name, size=16)}} - {{commit.committed.name}} + {{commit.committed.name}}, pushed {% else %} - {{email_gravatar(commit.committed.email, title=commit.committed.name, size=16)}} {{commit.committed.name}} + by + {{email_gravatar(commit.committed.email, title=commit.committed.name, size=16)}} {{commit.committed.name}}, pushed {% endif %} {% endif %}