xtras/mathuaerknedam 374:76747b9a4d6a: Mockie: combined indicato...

commits at adium.im commits at adium.im
Wed Feb 24 05:47:06 UTC 2010


details:	http://hg.adium.im/xtras/mathuaerknedam/rev/76747b9a4d6a
revision:	374:76747b9a4d6a
author:		mathuaerknedam
date:		Tue Feb 23 23:44:48 2010 -0600

Mockie: combined indicator for mention + focus.
Subject: xtras/mathuaerknedam 375:a8c0ebecc11c: Stockholm: add/remove files I missed in the last commit.

details:	http://hg.adium.im/xtras/mathuaerknedam/rev/a8c0ebecc11c
revision:	375:a8c0ebecc11c
author:		mathuaerknedam
date:		Tue Feb 23 23:46:51 2010 -0600

Stockholm: add/remove files I missed in the last commit.

diffs (315 lines):

diff -r 1afbb94d6f35 -r a8c0ebecc11c Mockie ☿.AdiumMessageStyle/Contents/Resources/Styles/basestyle.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/Styles/basestyle.css	Tue Feb 23 23:35:23 2010 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/Styles/basestyle.css	Tue Feb 23 23:46:51 2010 -0600
@@ -354,6 +354,11 @@
 	margin-top: 19px;
 }
 
+.mention.firstFocus > .x-message > .x-text:before,
+.mention.firstFocus.x-message-next > .x-text:before
+{
+	content: "mentioned here + focus lost here";
+}
 
 .history + :not(.history):before
 {
diff -r 1afbb94d6f35 -r a8c0ebecc11c Stockholm ☿.AdiumMessageStyle/Contents/Resources/Mockup-color.html
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Mockup-color.html	Tue Feb 23 23:35:23 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,292 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-	<head>
-		<title>Stockholm colorcheck orig/new</title>
-		<style type="text/css">
-
-			@import url( "./Main.css" );
-			@import url( "./Variants/red - grey.css" );
-
-			body
-			{
-				margin: 8px;
-				font-family: LucidaGrande;
-				font-size: 11px;
-			}
-		</style>
-	</head>
-	<body>
-
-<div class="x-container focus incoming message voice">
-	<div class="x-iconsubstitute" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-		<div class="x-contents_left">
-			<img class="x-buddyicon" src="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-			<div class="x-iconoverlay"></div>
-		</div>
-	</div>
-	<div class="x-contents_right" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-		<div class="x-message_top">
-			<div class="x-header">
-				<div class="x-incomingheader_left"></div>
-				<div class="x-incomingheader_center">
-					<div class="x-sender">LuX</div>
-					<div class="x-time">8:34 AM</div>
-				</div>
-				<div class="x-incomingheader_right"></div>
-			</div>
-			<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>
-			<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>
-
-<div class="x-container incoming message voice">
-	<div class="x-iconsubstitute" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-		<div class="x-contents_left">
-			<img class="x-buddyicon" src="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-			<div class="x-iconoverlay"></div>
-		</div>
-	</div>
-	<div class="x-contents_right" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-		<div class="x-message_top">
-			<div class="x-header">
-				<div class="x-incomingheader_left"></div>
-				<div class="x-incomingheader_center">
-					<div class="x-sender">LuX</div>
-					<div class="x-time">8:34 AM</div>
-				</div>
-				<div class="x-incomingheader_right"></div>
-			</div>
-			<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>
-			<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>
-
-<div class="x-container mention incoming message voice">
-	<div class="x-iconsubstitute" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-		<div class="x-contents_left">
-			<img class="x-buddyicon" src="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-			<div class="x-iconoverlay"></div>
-		</div>
-	</div>
-	<div class="x-contents_right" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-		<div class="x-message_top">
-			<div class="x-header">
-				<div class="x-incomingheader_left"></div>
-				<div class="x-incomingheader_center">
-					<div class="x-sender">LuX</div>
-					<div class="x-time">8:34 AM</div>
-				</div>
-				<div class="x-incomingheader_right"></div>
-			</div>
-			<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>
-			<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>
-
-<div class="x-container incoming message voice">
-	<div class="x-iconsubstitute" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-		<div class="x-contents_left">
-			<img class="x-buddyicon" src="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-			<div class="x-iconoverlay"></div>
-		</div>
-	</div>
-	<div class="x-contents_right" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-		<div class="x-message_top">
-			<div class="x-header">
-				<div class="x-incomingheader_left"></div>
-				<div class="x-incomingheader_center">
-					<div class="x-sender">LuX</div>
-					<div class="x-time">8:34 AM</div>
-				</div>
-				<div class="x-incomingheader_right"></div>
-			</div>
-			<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>
-			<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>
-<HR>
-<HR>
-
-<div class="x-container focus outgoing message">
-	<div class="x-iconsubstitute" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-		<div class="x-outgoing_left">
-			<img class="x-outgoing_buddyicon" src="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-			<div class="x-outgoing_iconoverlay"></div>
-		</div>
-	</div>
-	<div class="x-outgoing_right" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-		<div class="x-message_top">
-			<div class="x-header">
-				<div class="x-outgoingheader_left"></div>
-				<div class="x-outgoingheader_center">
-					<div class="x-sender">aerk</div>
-					<div class="x-time">6:31 PM</div>
-				</div>
-				<div class="x-outgoingheader_right"></div>
-			</div>
-			<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>
-			</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>
-
-<div class="x-container outgoing message">
-	<div class="x-iconsubstitute" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-		<div class="x-outgoing_left">
-			<img class="x-outgoing_buddyicon" src="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-			<div class="x-outgoing_iconoverlay"></div>
-		</div>
-	</div>
-	<div class="x-outgoing_right" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-		<div class="x-message_top">
-			<div class="x-header">
-				<div class="x-outgoingheader_left"></div>
-				<div class="x-outgoingheader_center">
-					<div class="x-sender">aerk</div>
-					<div class="x-time">6:31 PM</div>
-				</div>
-				<div class="x-outgoingheader_right"></div>
-			</div>
-			<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>
-			</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>
-
-<div class="x-container mention outgoing message">
-	<div class="x-iconsubstitute" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-		<div class="x-outgoing_left">
-			<img class="x-outgoing_buddyicon" src="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-			<div class="x-outgoing_iconoverlay"></div>
-		</div>
-	</div>
-	<div class="x-outgoing_right" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-		<div class="x-message_top">
-			<div class="x-header">
-				<div class="x-outgoingheader_left"></div>
-				<div class="x-outgoingheader_center">
-					<div class="x-sender">aerk</div>
-					<div class="x-time">6:31 PM</div>
-				</div>
-				<div class="x-outgoingheader_right"></div>
-			</div>
-			<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>
-			</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>
-
-<div class="x-container outgoing message">
-	<div class="x-iconsubstitute" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-		<div class="x-outgoing_left">
-			<img class="x-outgoing_buddyicon" src="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-			<div class="x-outgoing_iconoverlay"></div>
-		</div>
-	</div>
-	<div class="x-outgoing_right" background="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-15YNLJ7.png">
-		<div class="x-message_top">
-			<div class="x-header">
-				<div class="x-outgoingheader_left"></div>
-				<div class="x-outgoingheader_center">
-					<div class="x-sender">aerk</div>
-					<div class="x-time">6:31 PM</div>
-				</div>
-				<div class="x-outgoingheader_right"></div>
-			</div>
-			<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>
-			</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>
-</html>
diff -r 1afbb94d6f35 -r a8c0ebecc11c Stockholm ☿.AdiumMessageStyle/Contents/Resources/images/icon_overlay_white.png
Binary file Stockholm ☿.AdiumMessageStyle/Contents/Resources/images/icon_overlay_white.png has changed
diff -r 1afbb94d6f35 -r a8c0ebecc11c Stockholm ☿.AdiumMessageStyle/Contents/Resources/images/pref-mention.png
Binary file Stockholm ☿.AdiumMessageStyle/Contents/Resources/images/pref-mention.png has changed


More information about the commits mailing list