xtras/mathuaerknedam 187:cb4f465650bd: yMous: rename x-iconsmall...

commits at adium.im commits at adium.im
Fri Nov 6 03:51:58 UTC 2009


details:	http://hg.adium.im/xtras/mathuaerknedam/rev/cb4f465650bd
revision:	187:cb4f465650bd
author:		mathuaerknedam
date:		Thu Nov 05 21:51:52 2009 -0600

yMous: rename x-iconsmall x-icon, change focus colors from red to dark or light grey, and slightly improve mention highlight visibility, especially in message history.

diffs (455 lines):

diff -r 2fe90b5f245e -r cb4f465650bd yMous ☿.AdiumMessageStyle/Contents/Resources/Content.html
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Content.html	Thu Nov 05 16:59:22 2009 -0600
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Content.html	Thu Nov 05 21:51:52 2009 -0600
@@ -1,6 +1,6 @@
 <div class="x-wrapper %messageClasses% %service% xx-%senderScreenName%" title="%senderPrefix% %senderScreenName%%status% · %service% · %time% · %time{dd MMM yyyy}%">
 	<span class="x-focus"></span>
-	<span class="x-iconsmall"><img src="%userIconPath%" /></span>
+	<span class="x-icon"><img src="%userIconPath%" /></span>
 	<span class="x-sender">%sender%</span>
 	<span class="x-mark" style="background-color: %senderColor%; color: %senderColor%">‣</span>
 	<span class="x-message">%message%</span>
@@ -9,7 +9,7 @@
 
 <div id="insert" class="x-wrapper">
 	<span class="x-focus"></span>
-	<span class="x-iconsmall"></span>
+	<span class="x-icon"></span>
 	<span class="x-sender"></span>
 	<span class="x-mark"></span>
 	<span class="x-message"></span>
diff -r 2fe90b5f245e -r cb4f465650bd yMous ☿.AdiumMessageStyle/Contents/Resources/Mockup.html
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Mockup.html	Thu Nov 05 16:59:22 2009 -0600
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Mockup.html	Thu Nov 05 21:51:52 2009 -0600
@@ -15,7 +15,7 @@
 			border-bottom: 1px solid yellow !important;
 		}
 
-		img.x-iconsmall
+		img.x-icon
 		{
 			//display: none;
 		}
@@ -51,7 +51,7 @@
 
 <div class="x-wrapper SERVICE history date_separator event" title="date_separator · AIM · 12:45:48 · 19 Apr 2004">
 <span class="x-focus"></span>
-<span class="x-iconsmall"><img src="buddy_icon.png" /></span>
+<span class="x-icon"><img src="buddy_icon.png" /></span>
 <span class="x-sender"></span>
 <span class="x-mark" style="background-color: cyan; color: cyan;">‣</span>
 <span class="x-message">Wednesday, June 09, 2004</span>
@@ -60,7 +60,7 @@
 
 <div class="x-wrapper SERVICE history outgoing message xx-TekJew" title="Evan · AIM · 12:45:48 · 19 Apr 2004">
 <span class="x-focus"></span>
-<span class="x-iconsmall"><img src="./outgoing_icon.png" /></span>
+<span class="x-icon"><img src="./outgoing_icon.png" /></span>
 <span class="x-sender">Evan</span>
 <span class="x-mark" style="background-color: seagreen; color: seagreen;">‣</span>
 <span class="x-message">So a priest, a rabbi, and a chicken walk into a bar.</span>
@@ -69,7 +69,7 @@
 
 <div class="x-wrapper SERVICE history incoming message xx-fetchgreebledonx" title="Jeff · AIM · 12:46:07 · 19 Apr 2004">
 <span class="x-focus"></span>
-<span class="x-iconsmall"><img src="./incoming_icon.png" /></span>
+<span class="x-icon"><img src="./incoming_icon.png" /></span>
 <span class="x-sender">Jeff</span>
 <span class="x-mark" style="background-color: blue; color: blue;">‣</span>
 <span class="x-message">I'm pretty sure I've heard this one before.</span>
@@ -78,7 +78,7 @@
 
 <div class="x-wrapper SERVICE history consecutive incoming message xx-fetchgreebledonx" title="Jeff · AIM · 12:46:32 · 19 Apr 2004">
 <span class="x-focus"></span>
-<span class="x-iconsmall"><img src="./incoming_icon.png" /></span>
+<span class="x-icon"><img src="./incoming_icon.png" /></span>
 <span class="x-sender">Jeff</span>
 <span class="x-mark" style="background-color: blue; color: blue;">‣</span>
 <span class="x-message">So what happens next?</span>
@@ -87,7 +87,7 @@
 
 <div class="x-wrapper SERVICE outgoing message xx-TekJew" title="Evan · AIM · 12:46:50 · 19 Apr 2004">
 <span class="x-focus"></span>
-<span class="x-iconsmall"><img src="./outgoing_icon.png" /></span>
+<span class="x-icon"><img src="./outgoing_icon.png" /></span>
 <span class="x-sender">Evan</span>
 <span class="x-mark" style="background-color: seagreen; color: seagreen;">‣</span>
 <span class="x-message">If I remember correctly, they explode outward at the speed of light.</span>
@@ -96,7 +96,7 @@
 
 <div class="x-wrapper SERVICE consecutive outgoing message xx-TekJew" title="Evan · AIM · 12:47:00 · 19 Apr 2004">
 <span class="x-focus"></span>
-<span class="x-iconsmall"><img src="./outgoing_icon.png" /></span>
+<span class="x-icon"><img src="./outgoing_icon.png" /></span>
 <span class="x-sender">Evan</span>
 <span class="x-mark" style="background-color: seagreen; color: seagreen;">‣</span>
 <span class="x-message">But that might be if you cross the streams…</span>
@@ -105,7 +105,7 @@
 
 <div class="x-wrapper SERVICE incoming message xx-fetchgreebledonx" title="Jeff · AIM · 12:47:06 · 19 Apr 2004">
 <span class="x-focus"></span>
-<span class="x-iconsmall"><img src="./incoming_icon.png" /></span>
+<span class="x-icon"><img src="./incoming_icon.png" /></span>
 <span class="x-sender">Jeff</span>
 <span class="x-mark" style="background-color: blue; color: blue;">‣</span>
 <span class="x-message">…thus negating all existence!</span>
@@ -114,7 +114,7 @@
 
 <div class="x-wrapper SERVICE outgoing message mention xx-TekJew" title="Evan · AIM · 12:47:51 · 19 Apr 2004">
 <span class="x-focus"></span>
-<span class="x-iconsmall"><img src="./outgoing_icon.png" /></span>
+<span class="x-icon"><img src="./outgoing_icon.png" /></span>
 <span class="x-sender">Evan</span>
 <span class="x-mark" style="background-color: seagreen; color: seagreen;">‣</span>
 <span class="x-message">Precisely! it's a risk one takes whenever one walks into a bar, I'm afraid. Especially if one is a chicken.</span>
@@ -123,7 +123,7 @@
 
 <div class="x-wrapper SERVICE status away" title="away · AIM · 12:47:54 · 19 Apr 2004">
 <span class="x-focus"></span>
-<span class="x-iconsmall"><img src="buddy_icon.png" /></span>
+<span class="x-icon"><img src="buddy_icon.png" /></span>
 <span class="x-sender"></span>
 <span class="x-mark" style="background-color: cyan; color: cyan;">‣</span>
 <span class="x-message">Jeff went away</span>
@@ -132,7 +132,7 @@
 
 <div class="x-wrapper SERVICE consecutive status away_message" title="away_message · AIM · 12:47:55 · 19 Apr 2004">
 <span class="x-focus"></span>
-<span class="x-iconsmall"><img src="buddy_icon.png" /></span>
+<span class="x-icon"><img src="buddy_icon.png" /></span>
 <span class="x-sender"></span>
 <span class="x-mark" style="background-color: cyan; color: cyan;">‣</span>
 <span class="x-message">Away Message: "Away for the sake of being away."</span>
@@ -141,7 +141,7 @@
 
 <div class="x-wrapper SERVICE focus incoming message auto_reply xx-fetchgreebledonx" title="Jeff · AIM (Autoreply) · 12:47:51 · 19 Apr 2004">
 <span class="x-focus"></span>
-<span class="x-iconsmall"><img src="./incoming_icon.png" /></span>
+<span class="x-icon"><img src="./incoming_icon.png" /></span>
 <span class="x-sender">Jeff (Autoreply)</span>
 <span class="x-mark" style="background-color: blue; color: blue;">‣</span>
 <span class="x-message">Away for the sake of being away.</span>
@@ -150,7 +150,7 @@
 
 <div class="x-wrapper SERVICE action outgoing message xx-TekJew" title="Evan · AIM · 12:48:02 · 19 Apr 2004">
 <span class="x-focus"></span>
-<span class="x-iconsmall"><img src="./outgoing_icon.png" /></span>
+<span class="x-icon"><img src="./outgoing_icon.png" /></span>
 <span class="x-sender">Evan</span>
 <span class="x-mark" style="background-color: seagreen; color: seagreen;">‣</span>
 <span class="x-message">Gotta run; catch ya later ;)</span>
@@ -159,7 +159,7 @@
 
 <div id="insert" class="x-wrapper">
 <span class="x-focus"></span>
-<span class="x-iconsmall"></span>
+<span class="x-icon"></span>
 <span class="x-sender"></span>
 <span class="x-mark"></span>
 <span class="x-message"></span>
diff -r 2fe90b5f245e -r cb4f465650bd yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_Base.css
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_Base.css	Thu Nov 05 16:59:22 2009 -0600
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_Base.css	Thu Nov 05 21:51:52 2009 -0600
@@ -27,7 +27,13 @@
 	display: table;
 }
 
-#insert *
+
+#insert .x-focus,
+#insert .x-icon,
+#insert .x-sender,
+#insert .x-mark,
+#insert .x-message,
+#insert .x-time
 {
 	border-top: 0px !important;
 }
@@ -52,22 +58,13 @@
 }
 
 .x-focus,
-.x-iconsmall,
+.x-icon,
 .x-sender,
 .x-mark,
 .x-message,
 .x-time
 {
 	-webkit-transition: background-color .4s linear;
-}
-
-.x-iconsmall,
-.x-sender,
-.x-mark,
-.x-message,
-.x-focus,
-.x-time
-{
 	display: table-cell;
 }
 
@@ -81,23 +78,23 @@
 	margin-right: 2px;
 }
 
-.IRC .x-iconsmall img,
-.status .x-iconsmall img,
-.event .x-iconsmall img,
-.consecutive .x-iconsmall img,
-.history .x-iconsmall img
+.IRC .x-icon img,
+.status .x-icon img,
+.event .x-icon img,
+.consecutive .x-icon img,
+.history .x-icon img
 {
 	display: none;
 }
 
-.x-iconsmall img[src*="buddy_icon.png"]
+.x-icon img[src*="buddy_icon.png"]
 {
 	display: none;
 	//visibility: hidden;
 	//height: 0em;
 }
 
-.x-iconsmall img
+.x-icon img
 {
 	max-height: 1.1em;
 	max-width: 1.1em;
diff -r 2fe90b5f245e -r cb4f465650bd yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseM.css
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseM.css	Thu Nov 05 16:59:22 2009 -0600
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseM.css	Thu Nov 05 21:51:52 2009 -0600
@@ -24,7 +24,7 @@
 }
 
 #Chat > div:first-of-type .x-focus,
-#Chat > div:first-of-type .x-iconsmall,
+#Chat > div:first-of-type .x-icon,
 #Chat > div:first-of-type .x-sender,
 #Chat > div:first-of-type .x-time
 {
@@ -32,7 +32,7 @@
 }
 
 #insert .x-focus,
-#insert .x-iconsmall,
+#insert .x-icon,
 #insert .x-sender,
 #insert .x-time
 {
@@ -46,7 +46,7 @@
 }
 
 .history + :not(.history) .x-focus,
-.history + :not(.history) .x-iconsmall,
+.history + :not(.history) .x-icon,
 .history + :not(.history) .x-sender,
 .history + :not(.history) .x-time
 {
@@ -54,11 +54,11 @@
 }
 
 .mention .x-focus,
-.mention .x-iconsmall,
+.mention .x-icon,
 .mention .x-sender,
 .mention .x-time,
 .history.mention .x-focus,
-.history.mention .x-iconsmall,
+.history.mention .x-icon,
 .history.mention .x-sender,
 .history.mention .x-time
 {
@@ -70,7 +70,7 @@
 .history.mention .x-mark,
 .history.mention .x-message
 {
-	background-color: hsla(0, 0%, 95%, 1) !important;
+	background-color: hsla(0, 0%, 96%, 1) !important;
 }
 
 .x-wrapper:hover,
@@ -92,13 +92,13 @@
 }
 
 .x-wrapper:hover:not(.focus) > .x-focus,
-.x-wrapper:hover > .x-iconsmall,
+.x-wrapper:hover > .x-icon,
 .x-wrapper:hover > .x-sender,
 .x-wrapper:hover > .x-mark,
 .x-wrapper:hover > .x-message,
 .x-wrapper:hover > .x-time,
 .x-wrapper.x-hover > .x-focus,
-.x-wrapper.x-hover > .x-iconsmall,
+.x-wrapper.x-hover > .x-icon,
 .x-wrapper.x-hover > .x-sender,
 .x-wrapper.x-hover > .x-mark,
 .x-wrapper.x-hover > .x-message,
@@ -133,7 +133,7 @@
 .focus .x-focus
 {
 	//border-left: 1px solid hsla(0, 0%, 63%, 1) !important;
-	background: red;
+	background: hsla(0, 0%, 18%, 1);
 }
 
 #topic #x-header
diff -r 2fe90b5f245e -r cb4f465650bd yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseS.css
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseS.css	Thu Nov 05 16:59:22 2009 -0600
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseS.css	Thu Nov 05 21:51:52 2009 -0600
@@ -24,7 +24,7 @@
 }
 
 #Chat > div:first-of-type .x-focus,
-#Chat > div:first-of-type .x-iconsmall,
+#Chat > div:first-of-type .x-icon,
 #Chat > div:first-of-type .x-sender,
 #Chat > div:first-of-type .x-time
 {
@@ -32,7 +32,7 @@
 }
 
 #insert .x-focus,
-#insert .x-iconsmall,
+#insert .x-icon,
 #insert .x-sender,
 #insert .x-time
 {
@@ -46,7 +46,7 @@
 }
 
 .history + :not(.history) .x-focus,
-.history + :not(.history) .x-iconsmall,
+.history + :not(.history) .x-icon,
 .history + :not(.history) .x-sender,
 .history + :not(.history) .x-time
 {
@@ -54,16 +54,16 @@
 }
 
 .mention .x-focus,
-.mention .x-iconsmall,
+.mention .x-icon,
 .mention .x-sender,
 .mention .x-time,
 .history.mention .x-focus,
-.history.mention .x-iconsmall,
+.history.mention .x-icon,
 .history.mention .x-sender,
 .history.mention .x-time
 {
 	//background-color: hsla(0, 25%, 15%, 1) !important;
-	background-color: hsla(0, 0%, 17.5%, 1) !important;
+	background-color: hsla(0, 0%, 17%, 1) !important;
 }
 
 .mention .x-mark,
@@ -72,7 +72,7 @@
 .history.mention .x-message
 {
 	//background-color: hsla(0, 25%, 15%, 1) !important;
-	background-color: hsla(0, 0%, 15%, 1) !important;
+	background-color: hsla(0, 0%, 16%, 1) !important;
 }
 
 .x-wrapper:hover,
@@ -94,13 +94,13 @@
 }
 
 .x-wrapper:hover:not(.focus) > .x-focus,
-.x-wrapper:hover > .x-iconsmall,
+.x-wrapper:hover > .x-icon,
 .x-wrapper:hover > .x-sender,
 .x-wrapper:hover > .x-mark,
 .x-wrapper:hover > .x-message,
 .x-wrapper:hover > .x-time,
 .x-wrapper.x-hover > .x-focus,
-.x-wrapper.x-hover > .x-iconsmall,
+.x-wrapper.x-hover > .x-icon,
 .x-wrapper.x-hover > .x-sender,
 .x-wrapper.x-hover > .x-mark,
 .x-wrapper.x-hover > .x-message,
@@ -135,7 +135,7 @@
 .focus .x-focus
 {
 	//border-left: 1px solid hsla(0, 0%, 37%, 1) !important;
-	background: red;
+	background: hsla(0, 0%, 83%, 1);
 }
 
 #topic #x-header
diff -r 2fe90b5f245e -r cb4f465650bd yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorM.css
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorM.css	Thu Nov 05 16:59:22 2009 -0600
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorM.css	Thu Nov 05 21:51:52 2009 -0600
@@ -105,14 +105,14 @@
 	border-bottom: 4px solid hsla(0, 0%, 100%, 1) !important;
 }
 
-#Chat > div:first-of-type .x-iconsmall,
+#Chat > div:first-of-type .x-icon,
 #Chat > div:first-of-type .x-sender,
 #Chat > div:first-of-type .x-time
 {
 	border-top: 4px solid hsla(0, 0%, 90%, 1) !important;
 }
 
-#insert .x-iconsmall,
+#insert .x-icon,
 #insert .x-sender,
 #insert .x-time
 {
@@ -125,7 +125,7 @@
 	border-top: 16px solid hsla(0, 0%, 100%, 1) !important;
 }
 
-.history + :not(.history) .x-iconsmall,
+.history + :not(.history) .x-icon,
 .history + :not(.history) .x-sender,
 .history + :not(.history) .x-time
 {
diff -r 2fe90b5f245e -r cb4f465650bd yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorS.css
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorS.css	Thu Nov 05 16:59:22 2009 -0600
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorS.css	Thu Nov 05 21:51:52 2009 -0600
@@ -105,14 +105,14 @@
 	border-bottom: 4px solid hsla(0, 0%, 0%, 1) !important;
 }
 
-#Chat > div:first-of-type .x-iconsmall,
+#Chat > div:first-of-type .x-icon,
 #Chat > div:first-of-type .x-sender,
 #Chat > div:first-of-type .x-time
 {
 	border-top: 4px solid hsla(0, 0%, 12.5%, 1) !important;
 }
 
-#insert .x-iconsmall,
+#insert .x-icon,
 #insert .x-sender,
 #insert .x-time
 {
@@ -125,7 +125,7 @@
 	border-top: 16px solid hsla(0, 0%, 0%, 1) !important;
 }
 
-.history + :not(.history) .x-iconsmall,
+.history + :not(.history) .x-icon,
 .history + :not(.history) .x-sender,
 .history + :not(.history) .x-time
 {
diff -r 2fe90b5f245e -r cb4f465650bd yMous ☿.AdiumMessageStyle/Contents/Resources/todo.txt
--- a/yMous ☿.AdiumMessageStyle/Contents/Resources/todo.txt	Thu Nov 05 16:59:22 2009 -0600
+++ b/yMous ☿.AdiumMessageStyle/Contents/Resources/todo.txt	Thu Nov 05 21:51:52 2009 -0600
@@ -1,8 +1,4 @@
-# fix mention shading in history.
-
-# fix weird transition dark/light flipping
-
-# change focus color to some shade of grey.
+# fix weird transition dark/light flipping
 
 # Are emoticons a pixel too big? Only at 9pt and 12pt, but not 10pt and 11pt. and only for messages containging only an emoticon.
 


More information about the commits mailing list