xtras/mathuaerknedam 635:912759f36fab: Stockholm: fix a problem ...

[commits at adium.im]

details:	http://hg.adium.im/xtras/mathuaerknedam/rev/912759f36fab
revision:	635:912759f36fab
branch:		(none)
author:		mathuaerknedam
date:		Sun Nov 10 22:42:50 2013 -0600

Stockholm: fix a problem with indicating where focus was lost after a series of consecutive messages begain or was regain before a series of consecutive messages ended.

diffs (108 lines):

diff -r a2f59f4246ad -r 912759f36fab Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Mockup.html
--- a/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Mockup.html	Sun Nov 10 22:14:30 2013 -0600
+++ b/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Mockup.html	Sun Nov 10 22:42:50 2013 -0600
@@ -5,7 +5,7 @@
 		<title>Stockholm</title>
 		<style type="text/css">
 
-			@import url( "./Variants/sendercolor.css" );
+			@import url( "./Variants/green - grey.css" );
 
 			body
 			{
@@ -147,7 +147,7 @@
 		<div class="x-time">12:22 PM</div>
 		<div class="x-text"><a href=http://>1</a></div>
 	</div>
-	<div class="x-message ltr mention consecutive incoming message focus AIM showIcons">
+	<div class="x-message ltr mention consecutive incoming message AIM showIcons">
 		<div class="x-time">12:22 PM</div>
 		<div class="x-text">3.141592653589793238462643383279502884197169399375105820974944592307816406286208998628034825342117067982148086513282306647093844609550582231725359408128481117450284102701938521105559644622948954930381964428810975665933446128475648233786783165271201909145648566923460348610454326648213393607260249141273724587006606315588174881520920962829254091715364367892590360011330530548820466521384146951941511609…</div>
 	</div>
diff -r a2f59f4246ad -r 912759f36fab Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/ColorIn-Blue.css
--- a/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/ColorIn-Blue.css	Sun Nov 10 22:14:30 2013 -0600
+++ b/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/ColorIn-Blue.css	Sun Nov 10 22:42:50 2013 -0600
@@ -1,6 +1,7 @@
 .x-container.incoming:not(.history) .x-header,
 .x-container.mention:not(.history) .x-mentionicon,
-.x-container.incoming.focus .x-text:before
+.focus > .x-message:not(.consecutive) > .x-text:before,
+.x-message.focus.consecutive > .x-text:before
 {
 	background:
 		linear-gradient(to bottom, hsla(0, 0%, 100%, .2), hsla(0, 0%, 0%, .1) 45%, hsla(0, 0%, 0%, .2) 50%, hsla(0, 0%, 0%, .1)),
diff -r a2f59f4246ad -r 912759f36fab Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/ColorIn-Green.css
--- a/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/ColorIn-Green.css	Sun Nov 10 22:14:30 2013 -0600
+++ b/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/ColorIn-Green.css	Sun Nov 10 22:42:50 2013 -0600
@@ -1,6 +1,7 @@
 .x-container.incoming:not(.history) .x-header,
 .x-container.mention:not(.history) .x-mentionicon,
-.x-container.incoming.focus .x-text:before
+.focus > .x-message:not(.consecutive) > .x-text:before,
+.x-message.focus.consecutive > .x-text:before
 {
 	background:
 		linear-gradient(to bottom, hsla(0, 0%, 100%, .2), hsla(0, 0%, 0%, .1) 45%, hsla(0, 0%, 0%, .2) 50%, hsla(0, 0%, 0%, .1)),
diff -r a2f59f4246ad -r 912759f36fab Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/ColorIn-Grey.css
--- a/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/ColorIn-Grey.css	Sun Nov 10 22:14:30 2013 -0600
+++ b/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/ColorIn-Grey.css	Sun Nov 10 22:42:50 2013 -0600
@@ -1,6 +1,7 @@
 .x-container.incoming:not(.history) .x-header,
 .x-container.mention:not(.history) .x-mentionicon,
-.x-container.incoming.focus .x-text:before
+.focus > .x-message:not(.consecutive) > .x-text:before,
+.x-message.focus.consecutive > .x-text:before
 {
 	background:
 		linear-gradient(to bottom, hsla(0, 0%, 100%, .2), hsla(0, 0%, 0%, .1) 45%, hsla(0, 0%, 0%, .2) 50%, hsla(0, 0%, 0%, .1)),
diff -r a2f59f4246ad -r 912759f36fab Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/ColorIn-Orange.css
--- a/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/ColorIn-Orange.css	Sun Nov 10 22:14:30 2013 -0600
+++ b/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/ColorIn-Orange.css	Sun Nov 10 22:42:50 2013 -0600
@@ -1,6 +1,7 @@
 .x-container.incoming:not(.history) .x-header,
 .x-container.mention:not(.history) .x-mentionicon,
-.x-container.incoming.focus .x-text:before
+.focus > .x-message:not(.consecutive) > .x-text:before,
+.x-message.focus.consecutive > .x-text:before
 {
 	background:
 		linear-gradient(to bottom, hsla(0, 0%, 100%, .2), hsla(0, 0%, 0%, .1) 45%, hsla(0, 0%, 0%, .2) 50%, hsla(0, 0%, 0%, .1)),
diff -r a2f59f4246ad -r 912759f36fab Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/ColorIn-Red.css
--- a/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/ColorIn-Red.css	Sun Nov 10 22:14:30 2013 -0600
+++ b/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/ColorIn-Red.css	Sun Nov 10 22:42:50 2013 -0600
@@ -1,6 +1,7 @@
 .x-container.incoming:not(.history) .x-header,
 .x-container.mention:not(.history) .x-mentionicon,
-.x-container.incoming.focus .x-text:before
+.focus > .x-message:not(.consecutive) > .x-text:before,
+.x-message.focus.consecutive > .x-text:before
 {
 	background:
 		linear-gradient(to bottom, hsla(0, 0%, 100%, .2), hsla(0, 0%, 0%, .1) 45%, hsla(0, 0%, 0%, .22) 50%, hsla(0, 0%, 0%, .1)),
diff -r a2f59f4246ad -r 912759f36fab Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/SenderColor.css
--- a/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/SenderColor.css	Sun Nov 10 22:14:30 2013 -0600
+++ b/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/SenderColor.css	Sun Nov 10 22:42:50 2013 -0600
@@ -5,7 +5,8 @@
 		linear-gradient(to bottom, hsla(0, 0%, 100%, .2), hsla(0, 0%, 0%, .2) 50%, hsla(0, 0%, 0%, .3) 55%, hsla(0, 0%, 0%, .2));
 }
 
-.x-container.focus .x-text:before
+.focus > .x-message:not(.consecutive) > .x-text:before,
+.x-message.focus.consecutive > .x-text:before
 {
 	background:
 		linear-gradient(to bottom, hsla(0, 0%, 100%, .5), hsla(0, 0%, 0%, .5) 50%, hsla(0, 0%, 0%, .5) 55%, hsla(0, 0%, 0%, .5));
diff -r a2f59f4246ad -r 912759f36fab Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/main.css
--- a/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/main.css	Sun Nov 10 22:14:30 2013 -0600
+++ b/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/main.css	Sun Nov 10 22:42:50 2013 -0600
@@ -366,8 +366,8 @@
 	clear: both;
 }
 
-.focus > .x-message > .x-text:before,
-.focus > .x-text:before
+.focus > .x-message:not(.consecutive) > .x-text:before,
+.x-message.focus.consecutive > .x-text:before
 {
 	box-shadow: 0px 2px 1px hsla(0, 0%, 100%, 1), 0px -1px 1px hsla(0, 0%, 0%, 1);
 	content: "\feff";