Merge lp:~guiona/bilboplanet/669554 into lp:~greg-theclimber/bilboplanet/testing

Proposed by Guiona
Status: Merged
Merged at revision: 121
Proposed branch: lp:~guiona/bilboplanet/669554
Merge into: lp:~greg-theclimber/bilboplanet/testing
Diff against target: 32 lines (+3/-2)
2 files modified
themes/aragorn/css/core.css (+2/-2)
themes/gandalf/posts.tpl (+1/-0)
To merge this branch: bzr merge lp:~guiona/bilboplanet/669554
Reviewer Review Type Date Requested Status
Gregoire de Hemptinne Pending
Review via email: mp+39777@code.launchpad.net

Description of the change

done

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'themes/aragorn/css/core.css'
2--- themes/aragorn/css/core.css 2010-09-21 14:34:02 +0000
3+++ themes/aragorn/css/core.css 2010-11-01 20:24:48 +0000
4@@ -621,14 +621,14 @@
5 .vote img {
6 border:0;
7 }
8-.avote span#imgoui {
9+.vote span#imgoui {
10 display:block;
11 background:url('../images/oui-light.png') no-repeat;
12 height:18px;
13 width:18px;
14 float:left;
15 }
16-.avote span#imgnon {
17+.vote span#imgnon {
18 float:right;
19 display:block;
20 background:url('../images/warn-light.png') no-repeat;
21
22=== modified file 'themes/gandalf/posts.tpl'
23--- themes/gandalf/posts.tpl 2010-10-08 14:16:17 +0000
24+++ themes/gandalf/posts.tpl 2010-11-01 20:24:48 +0000
25@@ -46,6 +46,7 @@
26 <!-- BEGIN post.block -->
27 <div class="post">
28 <div class="post_title">
29+ <a name="post{$post.id}">&nbsp;</a>
30 <!-- BEGIN post.block.gravatar -->
31 <div class="gravatar">
32 <a href="{$planet.url}/index.php?user_id={$post.author_id}" title="{_Show user's posts}">

Subscribers

People subscribed via source and target branches

to all changes: