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
=== modified file 'debian/changelog'
--- debian/changelog 2010-08-11 19:04:05 +0000
+++ debian/changelog 2010-12-11 20:19:30 +0000
@@ -1,3 +1,12 @@
1adium-theme-ubuntu (0.3-0ubuntu2) maverick; urgency=low
2
3 * Decrease font at time stamp (Nicolò Chiffo) (LP: #619932)
4 - ubuntu.AdiumMessageStyle/Contents/Resources/*/Content.html
5 - ubuntu.AdiumMessageStyle/Contents/Resources/*/NextContent.html
6
7
8 -- Mahyuddin Susanto <udienz@gmail.com> Sun, 12 Dec 2010 03:07:21 +0700
9
1adium-theme-ubuntu (0.3-0ubuntu1) maverick; urgency=low10adium-theme-ubuntu (0.3-0ubuntu1) maverick; urgency=low
211
3 * New upstream release.12 * New upstream release.
413
=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Content.html'
--- ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Content.html 2010-08-11 19:04:05 +0000
+++ ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Content.html 2010-12-11 20:19:30 +0000
@@ -12,7 +12,7 @@
12 </tr>12 </tr>
13 <tr>13 <tr>
14 <td class="message">14 <td class="message">
15 <div class="timeStamp nameStamp">%sender% <span class="timeStamp">%time{%x %X}%</span></div>15 <div class="timeStamp nameStamp">%sender% <span class="timeStamp">%time%</span></div>
16 %message%16 %message%
17 <span id="insert"></span>17 <span id="insert"></span>
18 </td>18 </td>
1919
=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Context.html'
--- ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Context.html 2010-08-11 19:04:05 +0000
+++ ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/Context.html 2010-12-11 20:19:30 +0000
@@ -12,7 +12,7 @@
12 </tr>12 </tr>
13 <tr>13 <tr>
14 <td class="message">14 <td class="message">
15 <div class="timeStamp nameStamp">%sender% <span class="timeStamp">%time{%x %X}%</span>15 <div class="timeStamp nameStamp">%sender% <span class="timeStamp">%time%</span>
16 </div>16 </div>
17 %message%17 %message%
18 <span id="insert"></span>18 <span id="insert"></span>
1919
=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html'
--- ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html 2010-08-11 19:04:05 +0000
+++ ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html 2010-12-11 20:19:30 +0000
@@ -3,7 +3,7 @@
3 <div>3 <div>
4 4
5 %message%5 %message%
6 <div class="timeStamp">%time{%x %X}%</div>6 <div class="timeStamp">%time%</div>
7 </div>7 </div>
8 <span id="insert"></span>8 <span id="insert"></span>
9</div>9</div>
1010
=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html'
--- ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html 2010-08-11 19:04:05 +0000
+++ ubuntu.AdiumMessageStyle/Contents/Resources/Incoming/NextContext.html 2010-12-11 20:19:30 +0000
@@ -2,6 +2,6 @@
2 <div>2 <div>
3 3
4 %message%4 %message%
5 <div class="timeStamp">%time{%x %X}%</div>5 <div class="timeStamp">%time%</div>
6 </div><span id="insert"></span>6 </div><span id="insert"></span>
77
88
=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html'
--- ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html 2010-08-11 19:04:05 +0000
+++ ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html 2010-12-11 20:19:30 +0000
@@ -12,7 +12,7 @@
12 </tr>12 </tr>
13 <tr>13 <tr>
14 <td class="message">14 <td class="message">
15 <div class="timeStamp nameStamp">%sender% <span class="timeStamp">%time{%x %X}%</span></div>15 <div class="timeStamp nameStamp">%sender% <span class="timeStamp">%time%</span></div>
16 %message%16 %message%
17 <span id="insert"></span>17 <span id="insert"></span>
18 </td>18 </td>
1919
=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html'
--- ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html 2010-08-11 19:04:05 +0000
+++ ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html 2010-12-11 20:19:30 +0000
@@ -12,7 +12,7 @@
12 </tr>12 </tr>
13 <tr>13 <tr>
14 <td class="message">14 <td class="message">
15 <div class="timeStamp nameStamp">%sender% <span class="timeStamp">%time{%x %X}%</span> <span class="historyIcon"><img src="history.png"/></span>15 <div class="timeStamp nameStamp">%sender% <span class="timeStamp">%time%</span> <span class="historyIcon"><img src="history.png"/></span>
16 </div>16 </div>
17 %message%17 %message%
18 <span id="insert"></span>18 <span id="insert"></span>
1919
=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html'
--- ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html 2010-08-11 19:04:05 +0000
+++ ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContent.html 2010-12-11 20:19:30 +0000
@@ -2,7 +2,7 @@
2 <div class="followUp"></div>2 <div class="followUp"></div>
3 <div>3 <div>
4 %message%4 %message%
5 <div class="timeStamp">%time{%x %X}%</div>5 <div class="timeStamp">%time%</div>
6 </div>6 </div>
7 <span id="insert"></span>7 <span id="insert"></span>
8</div>8</div>
99
=== modified file 'ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html'
--- ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html 2010-08-11 19:04:05 +0000
+++ ubuntu.AdiumMessageStyle/Contents/Resources/Outgoing/NextContext.html 2010-12-11 20:19:30 +0000
@@ -1,6 +1,6 @@
1<div class="followUp"></div>1<div class="followUp"></div>
2<div>2<div>
3 %message%3 %message%
4 <div class="timeStamp">%time{%x %X}%</div>4 <div class="timeStamp">%time%</div>
5</div><span id="insert"></span>5</div><span id="insert"></span>
66

Subscribers

People subscribed via source and target branches