Ubuntu
adium-theme-ubuntu package

Merge lp:~udienz/ubuntu/maverick/adium-theme-ubuntu/adium-theme-ubuntu.fix619932 into lp:ubuntu/maverick/adium-theme-ubuntu

  1. Maverick (10.10)
  2. adium-theme-ubuntu.fix619932
  3. Merge into maverick
Proposed by Mahyuddin Susanto
Status: Rejected
Rejected by: Sebastien Bacher
Proposed branch: lp:~udienz/ubuntu/maverick/adium-theme-ubuntu/adium-theme-ubuntu.fix619932
Merge into: lp:ubuntu/maverick/adium-theme-ubuntu
Diff against target: 117 lines (+17/-8)
9 files modified
debian/changelog (+9/-0)
ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Content.html (+1/-1)
ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Context.html (+1/-1)
ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html (+1/-1)
ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html (+1/-1)
ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html (+1/-1)
ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html (+1/-1)
ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html (+1/-1)
ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html (+1/-1)
To merge this branch: bzr merge lp:~udienz/ubuntu/maverick/adium-theme-ubuntu/adium-theme-ubuntu.fix619932
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+43431@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

thank you for your work, I'm rejecting the request though since maverick is stable and ui frozen now and the bug still needs discussion and design input

Unmerged revisions

5. By Mahyuddin Susanto

* Decrease font at time stamp (Nicolo Chiffo) (LP: #619932)
  - ubuntu.AdiumMessageStyle/Contents/Resources/*/Content.html
  - ubuntu.AdiumMessageStyle/Contents/Resources/*/NextContent.html

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-08-11 19:04:05 +0000
3+++ debian/changelog 2010-12-11 20:19:30 +0000
4@@ -1,3 +1,12 @@
5+adium-theme-ubuntu (0.3-0ubuntu2) maverick; urgency=low
6+
7+ * Decrease font at time stamp (Nicolò Chiffo) (LP: #619932)
8+ - ubuntu.AdiumMessageStyle/Contents/Resources/*/Content.html
9+ - ubuntu.AdiumMessageStyle/Contents/Resources/*/NextContent.html
10+
11+
12+ -- Mahyuddin Susanto <udienz@gmail.com> Sun, 12 Dec 2010 03:07:21 +0700
13+
14 adium-theme-ubuntu (0.3-0ubuntu1) maverick; urgency=low
15
16 * New upstream release.
17
18=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Content.html'
19--- ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Content.html 2010-08-11 19:04:05 +0000
20+++ ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Content.html 2010-12-11 20:19:30 +0000
21@@ -12,7 +12,7 @@
22 </tr>
23 <tr>
24 <td class="message">
25- <div class="timeStamp nameStamp">%sender% <span class="timeStamp">%time{%x %X}%</span></div>
26+ <div class="timeStamp nameStamp">%sender% <span class="timeStamp">%time%</span></div>
27 %message%
28 <span id="insert"></span>
29 </td>
30
31=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Context.html'
32--- ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Context.html 2010-08-11 19:04:05 +0000
33+++ ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Context.html 2010-12-11 20:19:30 +0000
34@@ -12,7 +12,7 @@
35 </tr>
36 <tr>
37 <td class="message">
38- <div class="timeStamp nameStamp">%sender% <span class="timeStamp">%time{%x %X}%</span>
39+ <div class="timeStamp nameStamp">%sender% <span class="timeStamp">%time%</span>
40 </div>
41 %message%
42 <span id="insert"></span>
43
44=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html'
45--- ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html 2010-08-11 19:04:05 +0000
46+++ ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html 2010-12-11 20:19:30 +0000
47@@ -3,7 +3,7 @@
48 <div>
49
50 %message%
51- <div class="timeStamp">%time{%x %X}%</div>
52+ <div class="timeStamp">%time%</div>
53 </div>
54 <span id="insert"></span>
55 </div>
56
57=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html'
58--- ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html 2010-08-11 19:04:05 +0000
59+++ ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html 2010-12-11 20:19:30 +0000
60@@ -2,6 +2,6 @@
61 <div>
62
63 %message%
64- <div class="timeStamp">%time{%x %X}%</div>
65+ <div class="timeStamp">%time%</div>
66 </div><span id="insert"></span>
67
68
69=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html'
70--- ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html 2010-08-11 19:04:05 +0000
71+++ ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html 2010-12-11 20:19:30 +0000
72@@ -12,7 +12,7 @@
73 </tr>
74 <tr>
75 <td class="message">
76- <div class="timeStamp nameStamp">%sender% <span class="timeStamp">%time{%x %X}%</span></div>
77+ <div class="timeStamp nameStamp">%sender% <span class="timeStamp">%time%</span></div>
78 %message%
79 <span id="insert"></span>
80 </td>
81
82=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html'
83--- ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html 2010-08-11 19:04:05 +0000
84+++ ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html 2010-12-11 20:19:30 +0000
85@@ -12,7 +12,7 @@
86 </tr>
87 <tr>
88 <td class="message">
89- <div class="timeStamp nameStamp">%sender% <span class="timeStamp">%time{%x %X}%</span> <span class="historyIcon"><img src="history.png"/></span>
90+ <div class="timeStamp nameStamp">%sender% <span class="timeStamp">%time%</span> <span class="historyIcon"><img src="history.png"/></span>
91 </div>
92 %message%
93 <span id="insert"></span>
94
95=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html'
96--- ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html 2010-08-11 19:04:05 +0000
97+++ ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html 2010-12-11 20:19:30 +0000
98@@ -2,7 +2,7 @@
99 <div class="followUp"></div>
100 <div>
101 %message%
102- <div class="timeStamp">%time{%x %X}%</div>
103+ <div class="timeStamp">%time%</div>
104 </div>
105 <span id="insert"></span>
106 </div>
107
108=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html'
109--- ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html 2010-08-11 19:04:05 +0000
110+++ ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html 2010-12-11 20:19:30 +0000
111@@ -1,6 +1,6 @@
112 <div class="followUp"></div>
113 <div>
114 %message%
115- <div class="timeStamp">%time{%x %X}%</div>
116+ <div class="timeStamp">%time%</div>
117 </div><span id="insert"></span>
118

Subscribers

People subscribed via source and target branches