You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/12/13 06:08:21 UTC
[35/45] git commit: [#6970] Make user icons on activity page larger
and fix alignment in Firefox
[#6970] Make user icons on activity page larger and fix alignment in Firefox
Signed-off-by: Cory Johns <ad...@users.sf.net>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/e569faa6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/e569faa6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/e569faa6
Branch: refs/heads/tv/6942
Commit: e569faa6955710d34caf5e0693b195ffb55286ae
Parents: 4aeceac
Author: Cory Johns <ad...@users.sf.net>
Authored: Thu Dec 12 19:01:41 2013 +0000
Committer: Cory Johns <ad...@users.sf.net>
Committed: Thu Dec 12 19:02:00 2013 +0000
----------------------------------------------------------------------
ForgeActivity/forgeactivity/nf/activity/css/activity.css | 6 +++---
ForgeActivity/forgeactivity/templates/index.html | 6 ++++--
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e569faa6/ForgeActivity/forgeactivity/nf/activity/css/activity.css
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/nf/activity/css/activity.css b/ForgeActivity/forgeactivity/nf/activity/css/activity.css
index ca6ea59..dc71608 100644
--- a/ForgeActivity/forgeactivity/nf/activity/css/activity.css
+++ b/ForgeActivity/forgeactivity/nf/activity/css/activity.css
@@ -42,7 +42,7 @@
vertical-align: top;
font-size: 14px;
}
-.activity ul.timeline li p .avatar {
- display: inline-block;
- margin: 0 8px 8px 0;
+.activity ul.timeline li .avatar {
+ float: left;
+ margin: 10px 10px 0 0;
}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e569faa6/ForgeActivity/forgeactivity/templates/index.html
----------------------------------------------------------------------
diff --git a/ForgeActivity/forgeactivity/templates/index.html b/ForgeActivity/forgeactivity/templates/index.html
index f430c64..8293763 100644
--- a/ForgeActivity/forgeactivity/templates/index.html
+++ b/ForgeActivity/forgeactivity/templates/index.html
@@ -60,10 +60,12 @@
{% for a in timeline %}
<li>
<time datetime="{{a.published|datetimeformat}}" title="{{a.published|datetimeformat}}">{{h.ago(a.published, show_date_after=None)}}</time>
- <h1>{{activity_obj(a.actor)}} {{a.verb}} {{activity_obj(a.obj)}} {% if a.target.activity_name %}on {{activity_obj(a.target)}}{% endif %}</h1>
+ <h1>
+ {{ icon(a.actor, 32, 'avatar') }}
+ {{activity_obj(a.actor)}} {{a.verb}} {{activity_obj(a.obj)}} {% if a.target.activity_name %}on {{activity_obj(a.target)}}{% endif %}
+ </h1>
{% if a.obj.activity_extras.get('summary') %}
<p>
- {{ icon(a.actor, 16, 'avatar') }}
{{ a.obj.activity_extras.get('summary') }}
</p>
{% endif %}