xtras/mathuaerknedam 338:f54de4e7c967: Stockholm: Revamp mention...
commits at adium.im
commits at adium.im
Mon Feb 15 02:47:03 UTC 2010
details: http://hg.adium.im/xtras/mathuaerknedam/rev/f54de4e7c967
revision: 338:f54de4e7c967
author: mathuaerknedam
date: Sun Feb 14 20:46:16 2010 -0600
Stockholm: Revamp mentions to use a per-variant colorized version of the mentions icon in Adium prefs.
diffs (truncated from 5384 to 1000 lines):
diff -r 3dd3e569fad6 -r f54de4e7c967 Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/Content.html Thu Feb 11 21:40:39 2010 -0600
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/Content.html Sun Feb 14 20:46:16 2010 -0600
@@ -18,17 +18,16 @@
<div class="x-message">
<div class="x-message_left"></div>
<div class="x-message_right"></div>
- <div class="x-text">
- <p>%message%</p>
- <div id="insert" border="1"></div>
- </div>
+ <div class="x-text">
+ <p>%message%</p>
+ <div id="insert" border="1"></div>
</div>
</div>
- <div class="x-message_bottom">
- <div class="x-message_bottomleft"></div>
- <div class="x-message_bottomcenter"></div>
- <div class="x-message_bottomright"></div>
- </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-message_bottomleft"></div>
+ <div class="x-message_bottomcenter"></div>
+ <div class="x-message_bottomright"></div>
</div>
</div>
</div>
diff -r 3dd3e569fad6 -r f54de4e7c967 Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/Context.html
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/Context.html Thu Feb 11 21:40:39 2010 -0600
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/Context.html Sun Feb 14 20:46:16 2010 -0600
@@ -18,17 +18,16 @@
<div class="x-message">
<div class="x-message_left"></div>
<div class="x-message_right"></div>
- <div class="x-text">
- <p>%message%</p>
- <div id="insert" border="1"></div>
- </div>
+ <div class="x-text">
+ <p>%message%</p>
+ <div id="insert" border="1"></div>
</div>
</div>
- <div class="x-message_bottom">
- <div class="x-message_bottomleft"></div>
- <div class="x-message_bottomcenter"></div>
- <div class="x-message_bottomright"></div>
- </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-message_bottomleft"></div>
+ <div class="x-message_bottomcenter"></div>
+ <div class="x-message_bottomright"></div>
</div>
</div>
</div>
diff -r 3dd3e569fad6 -r f54de4e7c967 Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/FileTransferRequest.html
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/FileTransferRequest.html Thu Feb 11 21:40:39 2010 -0600
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Incoming/FileTransferRequest.html Sun Feb 14 20:46:16 2010 -0600
@@ -18,22 +18,21 @@
<div class="x-message">
<div class="x-message_left"></div>
<div class="x-message_right"></div>
- <div class="x-filetext">
- <div class="x-fileicon"><img src="%fileIconPath%" onclick="%saveFileHandler%" /></div>
- <div class="x-fileincoming">Incoming file:</div>
- <div class="x-filename" onclick="%saveFileHandler%"><a href="#">%fileName%</a></div>
- <div class="x-filemessage">%message%</div>
- <input type="button" value="Save As..." onclick="%saveFileAsHandler%"></button>
- <input type="button" value="Cancel" onclick="%cancelRequestHandler%"></button>
- <div id="insert" border="1"></div>
- </div>
+ <div class="x-filetext">
+ <div class="x-fileicon"><img src="%fileIconPath%" onclick="%saveFileHandler%" /></div>
+ <div class="x-fileincoming">Incoming file:</div>
+ <div class="x-filename" onclick="%saveFileHandler%"><a href="#">%fileName%</a></div>
+ <div class="x-filemessage">%message%</div>
+ <input type="button" value="Save As..." onclick="%saveFileAsHandler%"></button>
+ <input type="button" value="Cancel" onclick="%cancelRequestHandler%"></button>
+ <div id="insert" border="1"></div>
</div>
</div>
- <div class="x-message_bottom">
- <div class="x-message_bottomleft"></div>
- <div class="x-message_bottomcenter"></div>
- <div class="x-message_bottomright"></div>
- </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-message_bottomleft"></div>
+ <div class="x-message_bottomcenter"></div>
+ <div class="x-message_bottomright"></div>
</div>
</div>
</div>
diff -r 3dd3e569fad6 -r f54de4e7c967 Stockholm ☿.AdiumMessageStyle/Contents/Resources/Mockup.html
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Mockup.html Thu Feb 11 21:40:39 2010 -0600
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Mockup.html Sun Feb 14 20:46:16 2010 -0600
@@ -6,7 +6,7 @@
<style type="text/css">
@import url( "./Main.css" );
- @import url( "./Variants/alt green - red.css" );
+ @import url( "./Variants/grey - orange.css" );
body
{
@@ -44,17 +44,16 @@
<div class="x-message">
<div class="x-message_left"></div>
<div class="x-message_right"></div>
- <div class="x-text">
- <p><a href=http://>1</a></p>
- </div>
- </div>
- <div class="x-message_bottom">
- <div class="x-message_bottomleft"></div>
- <div class="x-message_bottomcenter"></div>
- <div class="x-message_bottomright"></div>
+ <div class="x-text">
+ <p><a href=http://>1</a></p>
</div>
</div>
</div>
+ <div class="x-message_bottom">
+ <div class="x-message_bottomleft"></div>
+ <div class="x-message_bottomcenter"></div>
+ <div class="x-message_bottomright"></div>
+ </div>
</div>
</div>
@@ -80,28 +79,26 @@
<div class="x-message">
<div class="x-message_left"></div>
<div class="x-message_right"></div>
- <div class="x-text">
- <p><a href=http://>1</a></p>
- <div class="x-combine consecutive incoming message history">
- <div class="x-ctime">12:22 PM</div>
- 2
- </div>
- <div class="x-combine consecutive incoming message history">
- <div class="x-ctime">12:22 PM</div>
- 3</div>
- </div>
+ <div class="x-text">
+ <p><a href=http://>1</a></p>
+ <div class="x-combine consecutive incoming message history">
+ <div class="x-ctime">12:22 PM</div>
+ 2
</div>
- </div>
- <div class="x-message_bottom">
- <div class="x-message_bottomleft"></div>
- <div class="x-message_bottomcenter"></div>
- <div class="x-message_bottomright"></div>
+ <div class="x-combine consecutive incoming message history">
+ <div class="x-ctime">12:22 PM</div>
+ 3
+ </div>
</div>
</div>
</div>
+ <div class="x-message_bottom">
+ <div class="x-message_bottomleft"></div>
+ <div class="x-message_bottomcenter"></div>
+ <div class="x-message_bottomright"></div>
+ </div>
</div>
</div>
-
<HR>
INCOMING CONTEXT MENTION
@@ -128,17 +125,16 @@
<div class="x-message">
<div class="x-message_left"></div>
<div class="x-message_right"></div>
- <div class="x-text">
- <p><a href=http://>1</a></p>
- </div>
- </div>
- <div class="x-message_bottom">
- <div class="x-message_bottomleft"></div>
- <div class="x-message_bottomcenter"></div>
- <div class="x-message_bottomright"></div>
+ <div class="x-text">
+ <p><a href=http://>1</a></p>
</div>
</div>
</div>
+ <div class="x-message_bottom">
+ <div class="x-message_bottomleft"></div>
+ <div class="x-message_bottomcenter"></div>
+ <div class="x-message_bottomright"></div>
+ </div>
</div>
</div>
@@ -164,28 +160,26 @@
<div class="x-message">
<div class="x-message_left"></div>
<div class="x-message_right"></div>
- <div class="x-text">
- <p><a href=http://>1</a></p>
- <div class="x-combine consecutive incoming message history">
- <div class="x-ctime">12:22 PM</div>
- 3.141592653589793238462643383279502884197169399375105820974944592307816406286208998628034825342117067982148086513282306647093844609550582231725359408128481117450284102701938521105559644622948954930381964428810975665933446128475648233786783165271201909145648566923460348610454326648213393607260249141273724587006606315588174881520920962829254091715364367892590360011330530548820466521384146951941511609É
- </div>
- <div class="x-combine consecutive incoming message history">
- <div class="x-ctime">12:22 PM</div>
- 3</div>
- </div>
+ <div class="x-text">
+ <p><a href=http://>1</a></p>
+ <div class="x-combine mention consecutive incoming message history">
+ <div class="x-ctime">12:22 PM</div>
+ 3.141592653589793238462643383279502884197169399375105820974944592307816406286208998628034825342117067982148086513282306647093844609550582231725359408128481117450284102701938521105559644622948954930381964428810975665933446128475648233786783165271201909145648566923460348610454326648213393607260249141273724587006606315588174881520920962829254091715364367892590360011330530548820466521384146951941511609É
</div>
- </div>
- <div class="x-message_bottom">
- <div class="x-message_bottomleft"></div>
- <div class="x-message_bottomcenter"></div>
- <div class="x-message_bottomright"></div>
+ <div class="x-combine mention consecutive incoming message history">
+ <div class="x-ctime">12:22 PM</div>
+ 3
+ </div>
</div>
</div>
</div>
+ <div class="x-message_bottom">
+ <div class="x-message_bottomleft"></div>
+ <div class="x-message_bottomcenter"></div>
+ <div class="x-message_bottomright"></div>
+ </div>
</div>
</div>
-
<HR>
INCOMING CONTENT MENTION FOCUS
@@ -212,18 +206,18 @@
<div class="x-message">
<div class="x-message_left"></div>
<div class="x-message_right"></div>
- <div class="x-text">
- <p><a href=http://>1</a></p>
- </div>
+ <div class="x-text">
+ <p><a href=http://>1</a></p>
</div>
</div>
- <div class="x-message_bottom">
- <div class="x-message_bottomleft"></div>
- <div class="x-message_bottomcenter"></div>
- <div class="x-message_bottomright"></div>
- </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-message_bottomleft"></div>
+ <div class="x-message_bottomcenter"></div>
+ <div class="x-message_bottomright"></div>
</div>
</div>
+</div>
<HR>
@@ -251,18 +245,18 @@
<div class="x-message">
<div class="x-message_left"></div>
<div class="x-message_right"></div>
- <div class="x-text">
- <p><a href=http://>1</a></p>
- </div>
+ <div class="x-text">
+ <p><a href=http://>1</a></p>
</div>
</div>
- <div class="x-message_bottom">
- <div class="x-message_bottomleft"></div>
- <div class="x-message_bottomcenter"></div>
- <div class="x-message_bottomright"></div>
- </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-message_bottomleft"></div>
+ <div class="x-message_bottomcenter"></div>
+ <div class="x-message_bottomright"></div>
</div>
</div>
+</div>
<HR>
@@ -290,26 +284,26 @@
<div class="x-message">
<div class="x-message_left"></div>
<div class="x-message_right"></div>
- <div class="x-text">
- <p><a href=http://>1</a></p>
- <div class="x-combine consecutive incoming message voice">
- <div class="x-ctime">12:22 PM</div>
- 2
- </div>
- <div class="x-combine consecutive incoming message voice">
- <div class="x-ctime">12:22 PM</div>
- 3
- </div>
+ <div class="x-text">
+ <p><a href=http://>1</a></p>
+ <div class="x-combine focus consecutive incoming message voice">
+ <div class="x-ctime">12:22 PM</div>
+ 2
+ </div>
+ <div class="x-combine focus consecutive incoming message voice">
+ <div class="x-ctime">12:22 PM</div>
+ 3
</div>
</div>
</div>
- <div class="x-message_bottom">
- <div class="x-message_bottomleft"></div>
- <div class="x-message_bottomcenter"></div>
- <div class="x-message_bottomright"></div>
- </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-message_bottomleft"></div>
+ <div class="x-message_bottomcenter"></div>
+ <div class="x-message_bottomright"></div>
</div>
</div>
+</div>
<HR>
@@ -337,18 +331,18 @@
<div class="x-message">
<div class="x-message_left"></div>
<div class="x-message_right"></div>
- <div class="x-text">
- <p><a href=http://>1</a></p>
- </div>
+ <div class="x-text">
+ <p><a href=http://>1</a></p>
</div>
</div>
- <div class="x-message_bottom">
- <div class="x-message_bottomleft"></div>
- <div class="x-message_bottomcenter"></div>
- <div class="x-message_bottomright"></div>
- </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-message_bottomleft"></div>
+ <div class="x-message_bottomcenter"></div>
+ <div class="x-message_bottomright"></div>
</div>
</div>
+</div>
<HR>
@@ -372,26 +366,26 @@
<div class="x-message">
<div class="x-message_left"></div>
<div class="x-message_right"></div>
- <div class="x-text">
- <p><a href=http://>1</a></p>
- <div class="x-combine consecutive incoming message voice">
- <div class="x-ctime">12:22 PM</div>
- 2
- </div>
- <div class="x-combine consecutive incoming message voice">
- <div class="x-ctime">12:22 PM</div>
- 3
- </div>
+ <div class="x-text">
+ <p><a href=http://>1</a></p>
+ <div class="x-combine consecutive incoming message voice">
+ <div class="x-ctime">12:22 PM</div>
+ 2
+ </div>
+ <div class="x-combine consecutive incoming message voice">
+ <div class="x-ctime">12:22 PM</div>
+ 3
</div>
</div>
</div>
- <div class="x-message_bottom">
- <div class="x-message_bottomleft"></div>
- <div class="x-message_bottomcenter"></div>
- <div class="x-message_bottomright"></div>
- </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-message_bottomleft"></div>
+ <div class="x-message_bottomcenter"></div>
+ <div class="x-message_bottomright"></div>
</div>
</div>
+</div>
<HR>
@@ -462,7 +456,10 @@
<div class="x-outgoing_iconoverlay"></div>
</div>
</div>
- <div class="x-outgoing_right" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-11WLX6L.png"> <div class="x-message_top"> <div class="x-header"> <div class="x-outgoingheader_ctx_left"></div>
+ <div class="x-outgoing_right" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-11WLX6L.png">
+ <div class="x-message_top">
+ <div class="x-header">
+ <div class="x-outgoingheader_ctx_left"></div>
<div class="x-outgoingheader_ctx_center">
<div class="x-sender">ujm | yhn</div>
<div class="x-time">12:22 PM</div>
@@ -472,16 +469,15 @@
<div class="x-message">
<div class="x-outgoingmessage_left"></div>
<div class="x-outgoingmessage_right"></div>
- <div class="x-text">
- <p><a href=http://>1</a></p>
- </div>
+ <div class="x-text">
+ <p><a href=http://>1</a></p>
</div>
</div>
- <div class="x-message_bottom">
- <div class="x-outgoingmessage_bottomleft"></div>
- <div class="x-outgoingmessage_bottomcenter"></div>
- <div class="x-outgoingmessage_bottomright"></div>
- </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-outgoingmessage_bottomleft"></div>
+ <div class="x-outgoingmessage_bottomcenter"></div>
+ <div class="x-outgoingmessage_bottomright"></div>
</div>
</div>
</div>
@@ -499,7 +495,10 @@
<div class="x-outgoing_iconoverlay"></div>
</div>
</div>
- <div class="x-outgoing_right" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-11WLX6L.png"> <div class="x-message_top"> <div class="x-header"> <div class="x-outgoingheader_ctx_left"></div>
+ <div class="x-outgoing_right" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-11WLX6L.png">
+ <div class="x-message_top">
+ <div class="x-header">
+ <div class="x-outgoingheader_ctx_left"></div>
<div class="x-outgoingheader_ctx_center">
<div class="x-sender">ujm | yhn</div>
<div class="x-time">12:22 PM</div>
@@ -509,24 +508,23 @@
<div class="x-message">
<div class="x-outgoingmessage_left"></div>
<div class="x-outgoingmessage_right"></div>
- <div class="x-text">
- <p><a href=http://>1</a></p>
- <div class="x-combine consecutive outgoing message history">
- <div class="x-ctime">12:22 PM</div>
- 2
- </div>
- <div class="x-combine consecutive outgoing message history">
- <div class="x-ctime">9:13 PM</div>
- 3
- </div>
+ <div class="x-text">
+ <p><a href=http://>1</a></p>
+ <div class="x-combine focus consecutive outgoing message history">
+ <div class="x-ctime">12:22 PM</div>
+ 2
+ </div>
+ <div class="x-combine focus consecutive outgoing message history">
+ <div class="x-ctime">9:13 PM</div>
+ 3
</div>
</div>
</div>
- <div class="x-message_bottom">
- <div class="x-outgoingmessage_bottomleft"></div>
- <div class="x-outgoingmessage_bottomcenter"></div>
- <div class="x-outgoingmessage_bottomright"></div>
- </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-outgoingmessage_bottomleft"></div>
+ <div class="x-outgoingmessage_bottomcenter"></div>
+ <div class="x-outgoingmessage_bottomright"></div>
</div>
</div>
</div>
@@ -540,7 +538,10 @@
<div class="x-outgoing_iconoverlay"></div>
</div>
</div>
- <div class="x-outgoing_right" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-11WLX6L.png"> <div class="x-message_top"> <div class="x-header"> <div class="x-outgoingheader_ctx_left"></div>
+ <div class="x-outgoing_right" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-11WLX6L.png">
+ <div class="x-message_top">
+ <div class="x-header">
+ <div class="x-outgoingheader_ctx_left"></div>
<div class="x-outgoingheader_ctx_center">
<div class="x-sender">ujm | yhn</div>
<div class="x-time">12:22 PM</div>
@@ -550,16 +551,15 @@
<div class="x-message">
<div class="x-outgoingmessage_left"></div>
<div class="x-outgoingmessage_right"></div>
- <div class="x-text">
- <p><a href=http://>1</a></p>
- </div>
+ <div class="x-text">
+ <p><a href=http://>1</a></p>
</div>
</div>
- <div class="x-message_bottom">
- <div class="x-outgoingmessage_bottomleft"></div>
- <div class="x-outgoingmessage_bottomcenter"></div>
- <div class="x-outgoingmessage_bottomright"></div>
- </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-outgoingmessage_bottomleft"></div>
+ <div class="x-outgoingmessage_bottomcenter"></div>
+ <div class="x-outgoingmessage_bottomright"></div>
</div>
</div>
</div>
@@ -590,26 +590,26 @@
<div class="x-message">
<div class="x-outgoingmessage_left"></div>
<div class="x-outgoingmessage_right"></div>
- <div class="x-text">
- <p><a href=http://>1</a></p>
- <div class="x-combine consecutive outgoing message">
- <div class="x-ctime">12:22 PM</div>
- 2
- </div>
- <div class="x-combine consecutive outgoing message">
- <div class="x-ctime">12:22 PM</div>
- <a href=http://>3</a>
- </div>
+ <div class="x-text">
+ <p><a href=http://>1</a></p>
+ <div class="x-combine focus consecutive outgoing message">
+ <div class="x-ctime">12:22 PM</div>
+ 2
+ </div>
+ <div class="x-combine focus consecutive outgoing message">
+ <div class="x-ctime">12:22 PM</div>
+ <a href=http://>3</a>
</div>
</div>
</div>
- <div class="x-message_bottom">
- <div class="x-outgoingmessage_bottomleft"></div>
- <div class="x-outgoingmessage_bottomcenter"></div>
- <div class="x-outgoingmessage_bottomright"></div>
- </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-outgoingmessage_bottomleft"></div>
+ <div class="x-outgoingmessage_bottomcenter"></div>
+ <div class="x-outgoingmessage_bottomright"></div>
</div>
</div>
+</div>
<HR>
@@ -633,18 +633,18 @@
<div class="x-message">
<div class="x-outgoingmessage_left"></div>
<div class="x-outgoingmessage_right"></div>
- <div class="x-text">
- <p><a href=http://>1</a></p>
- </div>
+ <div class="x-text">
+ <p><a href=http://>1</a></p>
</div>
</div>
- <div class="x-message_bottom">
- <div class="x-outgoingmessage_bottomleft"></div>
- <div class="x-outgoingmessage_bottomcenter"></div>
- <div class="x-outgoingmessage_bottomright"></div>
- </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-outgoingmessage_bottomleft"></div>
+ <div class="x-outgoingmessage_bottomcenter"></div>
+ <div class="x-outgoingmessage_bottomright"></div>
</div>
</div>
+</div>
<HR>
@@ -672,26 +672,26 @@
<div class="x-message">
<div class="x-outgoingmessage_left"></div>
<div class="x-outgoingmessage_right"></div>
- <div class="x-text">
- <p><a href=http://>1</a></p>
- <div class="x-combine consecutive outgoing message">
- <div class="x-ctime">12:22 PM</div>
- 2
- </div>
- <div class="x-combine consecutive outgoing message">
- <div class="x-ctime">12:22 PM</div>
- <a href=http://>3</a>
- </div>
+ <div class="x-text">
+ <p><a href=http://>1</a></p>
+ <div class="x-combine consecutive outgoing message">
+ <div class="x-ctime">12:22 PM</div>
+ 2
+ </div>
+ <div class="x-combine consecutive outgoing message">
+ <div class="x-ctime">12:22 PM</div>
+ <a href=http://>3</a>
</div>
</div>
</div>
- <div class="x-message_bottom">
- <div class="x-outgoingmessage_bottomleft"></div>
- <div class="x-outgoingmessage_bottomcenter"></div>
- <div class="x-outgoingmessage_bottomright"></div>
- </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-outgoingmessage_bottomleft"></div>
+ <div class="x-outgoingmessage_bottomcenter"></div>
+ <div class="x-outgoingmessage_bottomright"></div>
</div>
</div>
+</div>
<HR>
@@ -715,20 +715,18 @@
<div class="x-message">
<div class="x-outgoingmessage_left"></div>
<div class="x-outgoingmessage_right"></div>
- <div class="x-text">
- <p><a href=http://>1</a></p>
- </div>
+ <div class="x-text">
+ <p><a href=http://>1</a></p>
</div>
</div>
- <div class="x-message_bottom">
- <div class="x-outgoingmessage_bottomleft"></div>
- <div class="x-outgoingmessage_bottomcenter"></div>
- <div class="x-outgoingmessage_bottomright"></div>
- </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-outgoingmessage_bottomleft"></div>
+ <div class="x-outgoingmessage_bottomcenter"></div>
+ <div class="x-outgoingmessage_bottomright"></div>
</div>
</div>
+</div>
-
-
- </body>
+</body>
</html>
diff -r 3dd3e569fad6 -r f54de4e7c967 Stockholm ☿.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html Thu Feb 11 21:40:39 2010 -0600
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Outgoing/Content.html Sun Feb 14 20:46:16 2010 -0600
@@ -18,17 +18,16 @@
<div class="x-message">
<div class="x-outgoingmessage_left"></div>
<div class="x-outgoingmessage_right"></div>
- <div class="x-text">
- <p>%message%</p>
- <div id="insert" border="1"></div>
- </div>
+ <div class="x-text">
+ <p>%message%</p>
+ <div id="insert" border="1"></div>
</div>
</div>
- <div class="x-message_bottom">
- <div class="x-outgoingmessage_bottomleft"></div>
- <div class="x-outgoingmessage_bottomcenter"></div>
- <div class="x-outgoingmessage_bottomright"></div>
- </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-outgoingmessage_bottomleft"></div>
+ <div class="x-outgoingmessage_bottomcenter"></div>
+ <div class="x-outgoingmessage_bottomright"></div>
</div>
</div>
</div>
diff -r 3dd3e569fad6 -r f54de4e7c967 Stockholm ☿.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html Thu Feb 11 21:40:39 2010 -0600
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Outgoing/Context.html Sun Feb 14 20:46:16 2010 -0600
@@ -18,17 +18,16 @@
<div class="x-message">
<div class="x-outgoingmessage_left"></div>
<div class="x-outgoingmessage_right"></div>
- <div class="x-text">
- <p>%message%</p>
- <div id="insert" border="1"></div>
- </div>
+ <div class="x-text">
+ <p>%message%</p>
+ <div id="insert" border="1"></div>
</div>
</div>
- <div class="x-message_bottom">
- <div class="x-outgoingmessage_bottomleft"></div>
- <div class="x-outgoingmessage_bottomcenter"></div>
- <div class="x-outgoingmessage_bottomright"></div>
- </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-outgoingmessage_bottomleft"></div>
+ <div class="x-outgoingmessage_bottomcenter"></div>
+ <div class="x-outgoingmessage_bottomright"></div>
</div>
</div>
</div>
diff -r 3dd3e569fad6 -r f54de4e7c967 Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Blue - Blue.css
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Blue - Blue.css Thu Feb 11 21:40:39 2010 -0600
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Blue - Blue.css Sun Feb 14 20:46:16 2010 -0600
@@ -30,7 +30,7 @@
background: url("../images/blue_left_a.png") top right no-repeat;
}
-.focus:not(.history):not(.mention) .x-contents_right .x-header
+.focus:not(.history) .x-contents_right .x-header
{
background:
/*corners?*/
@@ -62,7 +62,7 @@
-webkit-border-top-right-radius: 5px;
}
-.focus:not(.history):not(.mention) .x-outgoing_right .x-header
+.focus:not(.history) .x-outgoing_right .x-header
{
background:
/*corners?*/
@@ -94,54 +94,7 @@
-webkit-border-top-left-radius: 5px;
}
-/* mention+focus header*/
-
-.mention.focus .x-header
+.mention.x-container
{
- background:
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) left 0px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) left 1px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(140, 140, 140, 1)), to(rgba(140, 140, 140, 1))) left 5px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(192, 192, 192, .5)), to(rgba(192, 192, 192, 1))) left 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) right top no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) right top no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(140, 140, 140, 1)), to(rgba(140, 140, 140, 1))) right 5px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(192, 192, 192, .5)), to(rgba(192, 192, 192, 1))) right 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 33%, 1)), to(hsla(215, 73%, 33%, 1))) 0px 0px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 68%, 1)), to(hsla(215, 73%, 68%, 1))) 0px 1px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 49%, 1)), to(hsla(215, 73%, 49%, 1))) 0px 2px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, 1)), to(hsla(215, 73%, 41%, 1))) 0px 3px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(140, 140, 140, 1)), to(rgba(140, 140, 140, 1))) 0px 4px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(181, 181, 181, 1)), to(rgba(181, 181, 181, 1))) 1px 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(rgba(181, 181, 181, 1)), to(rgba(181, 181, 181, 1))) 1px 6px no-repeat;
- -webkit-border-top-right-radius: 4px;
+ background: url("../images/pref-mention-blue.png") 4px 4px no-repeat !important;
}
-
-/* mention header*/
-
-.mention:not(.focus) .x-header
-{
- background:
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) left 0px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) left 1px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(202, 202, 202, 1)), to(rgba(202, 202, 202, 1))) left 5px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(248, 248, 248, .5)), to(rgba(248, 248, 248, 1))) left 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) right top no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) right top no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(187, 187, 187, 1)), to(rgba(187, 187, 187, 1))) right 5px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(248, 248, 248, .5)), to(rgba(248, 248, 248, 1))) right 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 33%, 1)), to(hsla(215, 73%, 33%, 1))) 0px 0px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 68%, 1)), to(hsla(215, 73%, 68%, 1))) 0px 1px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 49%, 1)), to(hsla(215, 73%, 49%, 1))) 0px 2px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, 1)), to(hsla(215, 73%, 41%, 1))) 0px 3px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(178, 178, 178, 1)), to(rgba(178, 178, 178, 1))) 0px 4px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(220, 220, 220, 1)), to(rgba(220, 220, 220, 1))) 1px 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(rgba(241, 241, 241, 1)), to(rgba(241, 241, 241, 1))) 1px 6px no-repeat;
- -webkit-border-top-right-radius: 4px;
-}
diff -r 3dd3e569fad6 -r f54de4e7c967 Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Blue - Green.css
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Blue - Green.css Thu Feb 11 21:40:39 2010 -0600
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Blue - Green.css Sun Feb 14 20:46:16 2010 -0600
@@ -32,7 +32,7 @@
/* focus header*/
-.focus:not(.history):not(.mention) .x-contents_right .x-header
+.focus:not(.history) .x-contents_right .x-header
{
background:
/*corners?*/
@@ -64,7 +64,7 @@
-webkit-border-top-right-radius: 5px;
}
-.focus:not(.history):not(.mention) .x-outgoing_right .x-header
+.focus:not(.history) .x-outgoing_right .x-header
{
background:
/*corners?*/
@@ -96,54 +96,7 @@
-webkit-border-top-left-radius: 5px;
}
-/* mention+focus header*/
-
-.mention.focus .x-header
+.mention.x-container
{
- background:
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) left 0px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) left 1px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(140, 140, 140, 1)), to(rgba(140, 140, 140, 1))) left 5px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(192, 192, 192, .5)), to(rgba(192, 192, 192, 1))) left 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) right top no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) right top no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(140, 140, 140, 1)), to(rgba(140, 140, 140, 1))) right 5px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(192, 192, 192, .5)), to(rgba(192, 192, 192, 1))) right 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 33%, 1)), to(hsla(215, 73%, 33%, 1))) 0px 0px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 68%, 1)), to(hsla(215, 73%, 68%, 1))) 0px 1px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 49%, 1)), to(hsla(215, 73%, 49%, 1))) 0px 2px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, 1)), to(hsla(215, 73%, 41%, 1))) 0px 3px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(140, 140, 140, 1)), to(rgba(140, 140, 140, 1))) 0px 4px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(181, 181, 181, 1)), to(rgba(181, 181, 181, 1))) 1px 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(rgba(181, 181, 181, 1)), to(rgba(181, 181, 181, 1))) 1px 6px no-repeat;
- -webkit-border-top-right-radius: 4px;
+ background: url("../images/pref-mention-blue.png") 4px 4px no-repeat !important;
}
-
-/* mention header*/
-
-.mention:not(.focus) .x-header
-{
- background:
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) left 0px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) left 1px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(202, 202, 202, 1)), to(rgba(202, 202, 202, 1))) left 5px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(248, 248, 248, .5)), to(rgba(248, 248, 248, 1))) left 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) right top no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) right top no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(187, 187, 187, 1)), to(rgba(187, 187, 187, 1))) right 5px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(248, 248, 248, .5)), to(rgba(248, 248, 248, 1))) right 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 33%, 1)), to(hsla(215, 73%, 33%, 1))) 0px 0px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 68%, 1)), to(hsla(215, 73%, 68%, 1))) 0px 1px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 49%, 1)), to(hsla(215, 73%, 49%, 1))) 0px 2px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, 1)), to(hsla(215, 73%, 41%, 1))) 0px 3px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(178, 178, 178, 1)), to(rgba(178, 178, 178, 1))) 0px 4px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(220, 220, 220, 1)), to(rgba(220, 220, 220, 1))) 1px 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(rgba(241, 241, 241, 1)), to(rgba(241, 241, 241, 1))) 1px 6px no-repeat;
- -webkit-border-top-right-radius: 4px;
-}
diff -r 3dd3e569fad6 -r f54de4e7c967 Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Blue - Grey.css
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Blue - Grey.css Thu Feb 11 21:40:39 2010 -0600
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Blue - Grey.css Sun Feb 14 20:46:16 2010 -0600
@@ -32,7 +32,7 @@
/* focus header*/
-.focus:not(.history):not(.mention) .x-contents_right .x-header
+.focus:not(.history) .x-contents_right .x-header
{
background:
/*corners?*/
@@ -64,7 +64,7 @@
-webkit-border-top-right-radius: 5px;
}
-.focus:not(.history):not(.mention) .x-outgoing_right .x-header
+.focus:not(.history) .x-outgoing_right .x-header
{
background:
/*corners?*/
@@ -96,54 +96,7 @@
-webkit-border-top-left-radius: 5px;
}
-/* mention+focus header*/
-
-.mention.focus .x-header
+.mention.x-container
{
- background:
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) left 0px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) left 1px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(140, 140, 140, 1)), to(rgba(140, 140, 140, 1))) left 5px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(192, 192, 192, .5)), to(rgba(192, 192, 192, 1))) left 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) right top no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) right top no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(140, 140, 140, 1)), to(rgba(140, 140, 140, 1))) right 5px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(192, 192, 192, .5)), to(rgba(192, 192, 192, 1))) right 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 33%, 1)), to(hsla(215, 73%, 33%, 1))) 0px 0px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 68%, 1)), to(hsla(215, 73%, 68%, 1))) 0px 1px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 49%, 1)), to(hsla(215, 73%, 49%, 1))) 0px 2px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, 1)), to(hsla(215, 73%, 41%, 1))) 0px 3px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(140, 140, 140, 1)), to(rgba(140, 140, 140, 1))) 0px 4px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(181, 181, 181, 1)), to(rgba(181, 181, 181, 1))) 1px 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(rgba(181, 181, 181, 1)), to(rgba(181, 181, 181, 1))) 1px 6px no-repeat;
- -webkit-border-top-right-radius: 4px;
+ background: url("../images/pref-mention-blue.png") 4px 4px no-repeat !important;
}
-
-/* mention header*/
-
-.mention:not(.focus) .x-header
-{
- background:
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) left 0px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) left 1px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(202, 202, 202, 1)), to(rgba(202, 202, 202, 1))) left 5px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(248, 248, 248, .5)), to(rgba(248, 248, 248, 1))) left 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) right top no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) right top no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(187, 187, 187, 1)), to(rgba(187, 187, 187, 1))) right 5px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(248, 248, 248, .5)), to(rgba(248, 248, 248, 1))) right 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 33%, 1)), to(hsla(215, 73%, 33%, 1))) 0px 0px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 68%, 1)), to(hsla(215, 73%, 68%, 1))) 0px 1px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 49%, 1)), to(hsla(215, 73%, 49%, 1))) 0px 2px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, 1)), to(hsla(215, 73%, 41%, 1))) 0px 3px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(178, 178, 178, 1)), to(rgba(178, 178, 178, 1))) 0px 4px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(220, 220, 220, 1)), to(rgba(220, 220, 220, 1))) 1px 5px no-repeat,
-
- -webkit-gradient(linear, left top, left bottom, from(rgba(241, 241, 241, 1)), to(rgba(241, 241, 241, 1))) 1px 6px no-repeat;
- -webkit-border-top-right-radius: 4px;
-}
diff -r 3dd3e569fad6 -r f54de4e7c967 Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Blue - Orange.css
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Blue - Orange.css Thu Feb 11 21:40:39 2010 -0600
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Blue - Orange.css Sun Feb 14 20:46:16 2010 -0600
@@ -32,7 +32,7 @@
/* focus header*/
-.focus:not(.history):not(.mention) .x-contents_right .x-header
+.focus:not(.history) .x-contents_right .x-header
{
background:
/*corners?*/
@@ -64,7 +64,7 @@
-webkit-border-top-right-radius: 5px;
}
-.focus:not(.history):not(.mention) .x-outgoing_right .x-header
+.focus:not(.history) .x-outgoing_right .x-header
{
background:
/*corners?*/
@@ -96,54 +96,7 @@
-webkit-border-top-left-radius: 5px;
}
-/* mention+focus header*/
-
-.mention.focus .x-header
+.mention.x-container
{
- background:
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) left 0px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(hsla(215, 73%, 41%, .8)), to(hsla(215, 73%, 41%, .8))) left 1px no-repeat,
- -webkit-gradient(linear, left top, left bottom, from(rgba(140, 140, 140, 1)), to(rgba(140, 140, 140, 1))) left 5px no-repeat,
More information about the commits
mailing list