xtras/mathuaerknedam 568:4573f40368fb: minimal_mod: actions don'...

[commits at adium.im]

details:	http://hg.adium.im/xtras/mathuaerknedam/rev/4573f40368fb
revision:	568:4573f40368fb
author:		mathuaerknedam
date:		Thu Feb 24 13:54:11 2011 -0600

minimal_mod: actions don't need a min-height unless the user has selected 'show user icons' *and* an icon is actually available.

diffs (53 lines):

diff -r f615fb33e8f2 -r 4573f40368fb Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/Mockup.html
--- a/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/Mockup.html	Wed Feb 23 20:24:28 2011 -0600
+++ b/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/Mockup.html	Thu Feb 24 13:54:11 2011 -0600
@@ -181,6 +181,33 @@
 		<span class="actionMessageBody">moos.</span>
 	</div>
 </div>
+<div class="x-container action incoming message voice showIcons" style="background-color:;" src="Incoming/buddy_icon.png">
+	<img class="x-buddyicon" src="Incoming/buddy_icon.png">
+	<div class="x-time" title="16 Feb 2011">09:28:21</div>
+	<div class="x-sender" style="color: aqua;" title="+ LuX">LuX</div>
+	<div class="x-message" title="IRC 09:28:15">
+		<span class="actionMessageUserName">mathuaerknedam</span>
+		<span class="actionMessageBody">moos.</span>
+	</div>
+</div>
+<div class="x-container action outgoing consecutive message voice showIcons" style="background-color:;" src="file:///Users/mneedham/Library/Caches/Adium/Default/d2df6b79669c518bac33aa5fbb23b54615ea6b8c.png">
+	<img class="x-buddyicon" src="file:///Users/mneedham/Library/Caches/Adium/Default/d2df6b79669c518bac33aa5fbb23b54615ea6b8c.png">
+	<div class="x-time" title="16 Feb 2011">09:28:15</div>
+	<div class="x-sender" style="color: saddlebrown;" title="+ mathuaerknedam">mathuaerknedam</div>
+	<div class="x-message" title="IRC 09:28:15">
+		<span class="actionMessageUserName">mathuaerknedam</span>
+		<span class="actionMessageBody">moos.</span>
+	</div>
+</div>
+<div class="x-container action incoming message voice hideIcons" style="background-color:;" src="Incoming/buddy_icon.png">
+	<img class="x-buddyicon" src="Incoming/buddy_icon.png">
+	<div class="x-time" title="16 Feb 2011">09:28:21</div>
+	<div class="x-sender" style="color: aqua;" title="+ LuX">LuX</div>
+	<div class="x-message" title="IRC 09:28:15">
+		<span class="actionMessageUserName">mathuaerknedam</span>
+		<span class="actionMessageBody">moos.</span>
+	</div>
+</div>
 <div class="x-container action outgoing consecutive message voice showIcons" style="background-color:;" src="file:///Users/mneedham/Library/Caches/Adium/Default/d2df6b79669c518bac33aa5fbb23b54615ea6b8c.png">
 	<img class="x-buddyicon" src="file:///Users/mneedham/Library/Caches/Adium/Default/d2df6b79669c518bac33aa5fbb23b54615ea6b8c.png">
 	<div class="x-time" title="16 Feb 2011">09:28:15</div>
diff -r f615fb33e8f2 -r 4573f40368fb Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/main.css
--- a/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/main.css	Wed Feb 23 20:24:28 2011 -0600
+++ b/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/main.css	Thu Feb 24 13:54:11 2011 -0600
@@ -100,9 +100,9 @@
 	border-top: 1px dotted rgba(0, 0, 0, .2);
 }
 
-.showIcons.x-container.message:not([src*="buddy_icon.png"]):not(.consecutive),
-.message.action + .showIcons.x-container.message.consecutive:not([src*="buddy_icon.png"]),
-.message.action
+.x-container.message.showIcons:not([src*="buddy_icon.png"]):not(.consecutive),
+.message.action + .x-container.message.consecutive.showIcons:not([src*="buddy_icon.png"]),
+.message.action.showIcons:not([src*="buddy_icon.png"])
 {
 	min-height: 29px;
 }