xtras/mathuaerknedam 117:fb351852c0f6: Experimental change to Cl...

Tue Aug 25 03:35:47 UTC 2009

details:	http://hg.adium.im/xtras/mathuaerknedam/rev/fb351852c0f6
revision:	117:fb351852c0f6
author:		mathuaerknedam
date:		Mon Aug 24 21:08:01 2009 -0500

Experimental change to Classic variant: When icons are enabled but the icon is missing, the bubble will indent left rather than encompass empty space.
Subject: xtras/mathuaerknedam 118:d65f8ef623df: Experimental change to Icon-Time variants: When icons are enabled but the icon is missing, the bubble will indent left rather than encompass empty space.

details:	http://hg.adium.im/xtras/mathuaerknedam/rev/d65f8ef623df
revision:	118:d65f8ef623df
author:		mathuaerknedam
date:		Mon Aug 24 22:39:37 2009 -0500

Experimental change to Icon-Time variants: When icons are enabled but the icon is missing, the bubble will indent left rather than encompass empty space.
Subject: xtras/mathuaerknedam 119:fc438b8dc847: Changes to content.html (and mockup) to enable the two previous commits to indenting when missing icons

details:	http://hg.adium.im/xtras/mathuaerknedam/rev/fc438b8dc847
revision:	119:fc438b8dc847
author:		mathuaerknedam
date:		Mon Aug 24 22:41:54 2009 -0500

Changes to content.html (and mockup) to enable the two previous commits to indenting when missing icons

diffs (138 lines):

diff -r 2e953be25a72 -r fc438b8dc847 Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Content.html

--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Content.html	Mon Aug 24 14:03:27 2009 -0500
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Content.html	Mon Aug 24 22:41:54 2009 -0500
@@ -1,4 +1,4 @@
-<div class="%messageClasses% %service% %userIcons% xx-%senderScreenName%" style="background-color: %senderColor%;">
+<div class="%messageClasses% %service% %userIcons% xx-%senderScreenName%" style="background-color: %senderColor%;" ico="%userIconPath%">
 	<img class="x-icon" src="%userIconPath%" />
 	<span class="x-iconmask" style="-webkit-mask-box-image: url(%userIconPath%);"></span>
 	<span class="x-color" style="background-color: %senderColor%;"></span>
diff -r 2e953be25a72 -r fc438b8dc847 Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Mockup-SpecialCases.html
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Mockup-SpecialCases.html	Mon Aug 24 14:03:27 2009 -0500
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Mockup-SpecialCases.html	Mon Aug 24 22:41:54 2009 -0500
@@ -7,7 +7,7 @@
 	</title>
 
 	<style type="text/css">
-		@import url( "./Variants/Compact.css" );
+		@import url( "./Variants/Icon-Time2.css" );
 
 		body
 		{
@@ -309,7 +309,7 @@
 			<span class="x-rtime" title="19 Apr 2004">12:47:55 </span>
 			<span class="x-ltime" title="19 Apr 2004">12:47:55 </span>
 			<span class="x-mark">‣</span>
-			<span class="x-message">Away Message: "Away for the sake of being away. Away for the sake of being away. Away for the sake of being away. Away for the sake of being away. " </span>
+			<span class="x-message">|Away Message: "Away for the sake of being away. Away for the sake of being away. Away for the sake of being away. Away for the sake of being away. " </span>
 		</span>
 	</div>
 </div>
@@ -323,11 +323,11 @@
 		<span class="x-rtime" title="19 Apr 2004">12:47:51 </span>
 		<span class="x-ltime" title="19 Apr 2004">12:47:51 </span>
 		<span class="x-mark">‣</span>
-		<span class="x-message">Away for the sake of being away. Away for the sake of being away. Away for the sake of being away. Away for the sake of being away. Away for the sake of being away. </span>
+		<span class="x-message">|Away for the sake of being away. Away for the sake of being away. Away for the sake of being away. Away for the sake of being away. Away for the sake of being away. </span>
 	</span>
 </div>
 
-<div class="outgoing message SERVICE showIcons xx-TekJew" style="background-color: seagreen;">
+<div class="outgoing message SERVICE showIcons xx-TekJew" style="background-color: seagreen;" ico="./buddy_icon.png">
 	<img class="x-icon" src="./buddy_icon.png" />
 	<span class="x-iconmask" style="-webkit-mask-box-image: url(./buddy_icon.png);"></span>
 	<span class="x-color" style="background-color: seagreen"></span>
@@ -336,7 +336,7 @@
 		<span class="x-rtime" title="19 Apr 2004">12:48:02 </span>
 		<span class="x-ltime" title="19 Apr 2004">12:48:02 </span>
 		<span class="x-mark">‣</span>
-		<span class="x-message">Gotta run; catch ya later <a href="http://slashdot.org">;) </a></span>
+		<span class="x-message">|Gotta run; catch ya later <a href="http://slashdot.org">;) </a></span>
 	</span>
 	<span id="insert"></span>
 </div>
diff -r 2e953be25a72 -r fc438b8dc847 Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Classic.css
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Classic.css	Mon Aug 24 14:03:27 2009 -0500
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Classic.css	Mon Aug 24 22:41:54 2009 -0500
@@ -70,6 +70,16 @@
 	min-height: 30px;
 }
 
+.message.showIcons[ico*="buddy_icon.png"]:not(.consecutive):not(.IRC)
+{
+	margin-left: 36px;
+}
+
+.message.showIcons[ico*="buddy_icon.png"]:not(.consecutive):not(.IRC) .x-wrap
+{
+	margin-left: 0px;
+}
+
 .status:not(.consecutive),
 .event:not(.consecutive)
 {
diff -r 2e953be25a72 -r fc438b8dc847 Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Icon-Time1.css
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Icon-Time1.css	Mon Aug 24 14:03:27 2009 -0500
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Icon-Time1.css	Mon Aug 24 22:41:54 2009 -0500
@@ -62,6 +62,16 @@
 	margin-right: 10px;
 }
 
+.message.showIcons[ico*="buddy_icon.png"]:not(.consecutive):not(.IRC)
+{
+	margin-left: 32px;
+}
+
+.message.showIcons[ico*="buddy_icon.png"]:not(.consecutive):not(.IRC) .x-wrap
+{
+	margin-left: 5px;
+}
+
 .message:not(.consecutive):not(.history),
 .status:not(.consecutive):not(.history),
 .event:not(.consecutive):not(.history)
@@ -115,7 +125,7 @@
 	-webkit-border-top-left-radius: 5px;
 }
 
-.message.showIcons:not(.autoreply):not(.consecutive):not(.history):not(.x-hover):not(.IRC)
+.message.showIcons:not(.autoreply):not(.consecutive):not(.history):not(.x-hover):not(.IRC):not([ico*="buddy_icon.png"])
 {
 	background:
 		-webkit-gradient(linear, left top, left bottom, from(rgba(255, 255, 255, 1)), to(rgba(248, 248, 248, 1))) 0px 0px no-repeat,
@@ -152,6 +162,7 @@
 	-webkit-box-shadow: 0px 2px 4px rgba(0, 0, 0, .4), 0px 0px 1px rgba(0, 0, 0, .4), 0px 0px 1px rgba(0, 0, 0, 1);
 }
 
+.message.showIcons[ico*="buddy_icon.png"]:not(.consecutive):not(.IRC):not(.x-hover),
 .IRC.message:not(.mention):not(.autoreply):not(.consecutive):not(.history):not(.x-hover),
 .message.hideIcons:not(.mention):not(.autoreply):not(.consecutive):not(.history):not(.x-hover)
 {
@@ -196,6 +207,7 @@
 	-webkit-box-shadow: 0px 2px 4px rgba(255, 255, 255, 1), 0px -1px 1px rgba(0, 0, 0, .4);
 }
 
+.message.x-hover.showIcons[ico*="buddy_icon.png"]:not(.consecutive):not(.IRC),
 .IRC.message.x-hover:not(.consecutive),
 .message.hideIcons.x-hover:not(.consecutive)
 {
diff -r 2e953be25a72 -r fc438b8dc847 Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Icon-Time2.css
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Icon-Time2.css	Mon Aug 24 14:03:27 2009 -0500
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Icon-Time2.css	Mon Aug 24 22:41:54 2009 -0500
@@ -111,6 +111,16 @@
 	color: rgba(64, 64, 64, 1);
 }
 
+.message.showIcons[ico*="buddy_icon.png"]:not(.consecutive):not(.IRC)
+{
+	margin-left: 32px;
+}
+
+.message.showIcons[ico*="buddy_icon.png"]:not(.consecutive):not(.IRC) .x-wrap
+{
+	margin-left: 0px;
+}
+
 .message:not(.autoreply):not(.consecutive):not(.x-hover):not(.history)
 {
 	background:
