xtras/mathuaerknedam 40:0200d4763906: Ugly kludges that begin to...
commits at adium.im
commits at adium.im
Tue Jun 2 21:58:24 UTC 2009
details: http://hg.adium.im/xtras/mathuaerknedam/rev/0200d4763906
revision: 40:0200d4763906
author: mathuaerknedam
date: Tue Jun 02 16:58:09 2009 -0500
Ugly kludges that begin to work around the bugs exposed by the last commit.
diffs (345 lines):
diff -r f72bb8336fdd -r 0200d4763906 yMous.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
--- a/yMous.AdiumMessageStyle/Contents/Resources/Incoming/Content.html Tue Jun 02 15:45:51 2009 -0500
+++ b/yMous.AdiumMessageStyle/Contents/Resources/Incoming/Content.html Tue Jun 02 16:58:09 2009 -0500
@@ -1,5 +1,5 @@
<div class="xxxwrapper %messageClasses% %service% %senderScreenName%">
- <span class="xxxicon"><img class="xxxiconsmall" onMouseDown="this.className='xxxiconlarge'" onMouseUp="this.className='xxxiconsmall'" src="%userIconPath%" /></span>
+ <span class="xxxiconsmall"> <img src="%userIconPath%" /></span>
<span class="xxxsender" title="%senderPrefix% %senderScreenName%">%sender%</span>
<span class="xxxmark" style="background-color: %senderColor%; color: %senderColor%">‣</span>
<span class="xxxmessage" title="%service% · %senderScreenName% · %time%">%message%</span>
diff -r f72bb8336fdd -r 0200d4763906 yMous.AdiumMessageStyle/Contents/Resources/Mockup.html
--- a/yMous.AdiumMessageStyle/Contents/Resources/Mockup.html Tue Jun 02 15:45:51 2009 -0500
+++ b/yMous.AdiumMessageStyle/Contents/Resources/Mockup.html Tue Jun 02 16:58:09 2009 -0500
@@ -56,7 +56,7 @@
<div id="Chat" class="">
<div class="xxxwrapper history date_separator event">
-<span><img class="xxxiconsmall" src="%senderStatusIcon%" onMouseDown="this.className='xxxiconlarge'" onMouseUp="this.className='xxxiconsmall'" /></span>
+<span class="xxxiconsmall"><img src="buddy_icon.png" /></span>
<span class="xxxsender"><!></span>
<span class="xxxmark">‣</span>
<span class="xxxmessage" title="date_separator · 12:45:48">Wednesday, June 09, 2004</span>
@@ -64,7 +64,7 @@
</div>
<div class="xxxwrapper history outgoing message TekJew">
-<span><img class="xxxiconsmall" src="./outgoing_icon.png" onMouseDown="this.className='xxxiconlarge'" onMouseUp="this.className='xxxiconsmall'" /></span>
+<span class="xxxiconsmall"><img src="./outgoing_icon.png" /></span>
<span class="xxxsender">Evan</span>
<span class="xxxmark" style="background-color: seagreen; color: seagreen">‣</span>
<span class="xxxmessage" title="AIM · Evan · 12:45:48">So a priest, a rabbi, and a chicken walk into a bar.</span>
@@ -72,7 +72,7 @@
</div>
<div class="xxxwrapper history incoming message fetchgreebledonx">
-<span><img class="xxxiconsmall" src="./incoming_icon.png" onMouseDown="this.className='xxxiconlarge'" onMouseUp="this.className='xxxiconsmall'" /></span>
+<span class="xxxiconsmall"><img src="./incoming_icon.png" /></span>
<span class="xxxsender">Jeff</span>
<span class="xxxmark" style="background-color: blue; color: blue">‣</span>
<span class="xxxmessage" title="AIM · Jeff · 12:46:07">I'm pretty sure I've heard this one before.</span>
@@ -80,7 +80,7 @@
</div>
<div class="xxxwrapper history consecutive incoming message fetchgreebledonx">
-<span><img class="xxxiconsmall" src="./incoming_icon.png" onMouseDown="this.className='xxxiconlarge'" onMouseUp="this.className='xxxiconsmall'" /></span>
+<span class="xxxiconsmall"><img src="./incoming_icon.png" /></span>
<span class="xxxsender">Jeff</span>
<span class="xxxmark" style="background-color: blue; color: blue">‣</span>
<span class="xxxmessage" title="AIM · Jeff · 12:46:32">So what happens next?</span>
@@ -88,7 +88,7 @@
</div>
<div class="xxxwrapper outgoing message TekJew">
-<span><img class="xxxiconsmall" src="./outgoing_icon.png" onMouseDown="this.className='xxxiconlarge'" onMouseUp="this.className='xxxiconsmall'" /></span>
+<span class="xxxiconsmall"><img src="./outgoing_icon.png" /></span>
<span class="xxxsender">Evan</span>
<span class="xxxmark" style="background-color: seagreen; color: seagreen">‣</span>
<span class="xxxmessage" title="AIM · Evan · 12:46:50">If I remember correctly, they explode outward at the speed of light.</span>
@@ -96,7 +96,7 @@
</div>
<div class="mention xxxwrapper consecutive outgoing message TekJew">
-<span><img class="xxxiconsmall" src="./outgoing_icon.png" onMouseDown="this.className='xxxiconlarge'" onMouseUp="this.className='xxxiconsmall'" /></span>
+<span class="xxxiconsmall"><img src="./outgoing_icon.png" /></span>
<span class="xxxsender">Evan</span>
<span class="xxxmark" style="background-color: seagreen; color: seagreen">‣</span>
<span class="xxxmessage" title="AIM · Evan · 12:47:00">But that might be if you cross the streams…</span>
@@ -104,7 +104,7 @@
</div>
<div class="xxxwrapper incoming message fetchgreebledonx">
-<span><img class="xxxiconsmall" src="./incoming_icon.png" onMouseDown="this.className='xxxiconlarge'" onMouseUp="this.className='xxxiconsmall'" /></span>
+<span class="xxxiconsmall"><img src="./incoming_icon.png" /></span>
<span class="xxxsender">Jeff</span>
<span class="xxxmark" style="background-color: blue; color: blue">‣</span>
<span class="xxxmessage" title="AIM · Jeff · 12:47:06">…thus negating all existence!</span>
@@ -112,7 +112,7 @@
</div>
<div class="xxxwrapper outgoing message TekJew">
-<span><img class="xxxiconsmall" src="./outgoing_icon.png" onMouseDown="this.className='xxxiconlarge'" onMouseUp="this.className='xxxiconsmall'" /></span>
+<span class="xxxiconsmall"><img src="./outgoing_icon.png" /></span>
<span class="xxxsender">Evan</span>
<span class="xxxmark" style="background-color: seagreen; color: seagreen">‣</span>
<span class="xxxmessage" title="AIM · Evan · 12:47:51">Precisely! it's a risk one takes whenever one walks into a bar, I'm afraid. Especially if one is a chicken.</span>
@@ -120,7 +120,7 @@
</div>
<div class="xxxwrapper status away">
-<span><img class="xxxiconsmall" src="%senderStatusIcon%" onMouseDown="this.className='xxxiconlarge'" onMouseUp="this.className='xxxiconsmall'" /></span>
+<span class="xxxiconsmall"><img src="buddy_icon.png" /></span>
<span class="xxxsender"><!></span>
<span class="xxxmark">‣</span>
<span class="xxxmessage" title="away · 12:47:54">Jeff went away</span>
@@ -130,7 +130,7 @@
<hr id="focus" style="position: absolute; top: 146px;">
<div class="xxxwrapper consecutive status away_message">
-<span><img class="xxxiconsmall" src="%senderStatusIcon%" onMouseDown="this.className='xxxiconlarge'" onMouseUp="this.className='xxxiconsmall'" /></span>
+<span class="xxxiconsmall"><img src="buddy_icon.png" /></span>
<span class="xxxsender"><!></span>
<span class="xxxmark">‣</span>
<span class="xxxmessage" title="away_message · 12:47:55">Away Message: "Away for the sake of being away."</span>
@@ -138,7 +138,7 @@
</div>
<div class="xxxwrapper incoming message auto_reply fetchgreebledonx">
-<span><img class="xxxiconsmall" src="./incoming_icon.png" onMouseDown="this.className='xxxiconlarge'" onMouseUp="this.className='xxxiconsmall'" /></span>
+<span class="xxxiconsmall"><img src="./incoming_icon.png" /></span>
<span class="xxxsender">Jeff (Autoreply)</span>
<span class="xxxmark" style="background-color: blue; color: blue">‣</span>
<span class="xxxmessage" title="AIM · Jeff (Autoreply) · 12:47:51">Away for the sake of being away.</span>
@@ -146,7 +146,7 @@
</div>
<div class="xxxwrapper outgoing message action TekJew">
-<span><img class="xxxiconsmall" src="./outgoing_icon.png" onMouseDown="this.className='xxxiconlarge'" onMouseUp="this.className='xxxiconsmall'" /></span>
+<span class="xxxiconsmall"><img src="./outgoing_icon.png" /></span>
<span class="xxxsender">Evan</span>
<span class="xxxmark" style="background-color: seagreen; color: seagreen">‣</span>
<span class="xxxmessage" title="AIM · Evan · 12:48:02">Gotta run; catch ya later ;)</span>
diff -r f72bb8336fdd -r 0200d4763906 yMous.AdiumMessageStyle/Contents/Resources/Status.html
--- a/yMous.AdiumMessageStyle/Contents/Resources/Status.html Tue Jun 02 15:45:51 2009 -0500
+++ b/yMous.AdiumMessageStyle/Contents/Resources/Status.html Tue Jun 02 16:58:09 2009 -0500
@@ -1,5 +1,5 @@
<div class="xxxwrapper %service% %messageClasses%">
- <span class="xxxicon"><img class="xxxiconsmall" onMouseDown="this.className='xxxiconlarge'" onMouseUp="this.className='xxxiconsmall'" src="%userIconPath%" /></span>
+ <span class="xxxiconsmall"><img src="%userIconPath%" /></span>
<span class="xxxsender"><!></span>
<span class="xxxmark">‣</span>
<span class="xxxmessage" title="%time%">%message%</span>
diff -r f72bb8336fdd -r 0200d4763906 yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_Base.css
--- a/yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_Base.css Tue Jun 02 15:45:51 2009 -0500
+++ b/yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_Base.css Tue Jun 02 16:58:09 2009 -0500
@@ -91,23 +91,24 @@
display: table-cell;
}
-.IRC .xxxiconsmall,
-.status .xxxiconsmall,
-.event .xxxiconsmall,
-.consecutive .xxxiconsmall,
-.history .xxxiconsmall
+.IRC .xxxiconsmall img,
+.status .xxxiconsmall img,
+.event .xxxiconsmall img,
+.consecutive .xxxiconsmall img,
+.history .xxxiconsmall img
{
display: none;
+
}
-.xxxiconsmall[src*="buddy_icon.png"]
+.xxxiconsmall img[src*="buddy_icon.png"]
{
display: none;
//visibility: hidden;
//height: 0em;
}
-.xxxiconsmall
+.xxxiconsmall img
{
max-height: 1.3em;
max-width: 1.3em;
@@ -115,13 +116,6 @@
opacity: .875;
}
-.xxxiconlarge
-{
- width: auto;
- height: auto;
- opacity: .875;
-}
-
.status .xxxsender,
.event .xxxsender
{
diff -r f72bb8336fdd -r 0200d4763906 yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseM.css
--- a/yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseM.css Tue Jun 02 15:45:51 2009 -0500
+++ b/yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseM.css Tue Jun 02 16:58:09 2009 -0500
@@ -63,6 +63,19 @@
//border-bottom: 4px solid hsla(0, 0%, 80%, 1);
}
+.history + :not(.history) .xxxmark,
+.history + :not(.history) .xxxmessage
+{
+ border-top: 16px solid hsla(0, 0%, 100%, 1) !important;
+}
+
+.history + :not(.history) .xxxiconsmall,
+.history + :not(.history) .xxxsender,
+.history + :not(.history) .xxxtime
+{
+ border-top: 16px solid hsla(0, 0%, 90%, 1) !important;
+}
+
.xxxwrapper:hover,
.groupchat .xxxhover
{
diff -r f72bb8336fdd -r 0200d4763906 yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseS.css
--- a/yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseS.css Tue Jun 02 15:45:51 2009 -0500
+++ b/yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_BaseS.css Tue Jun 02 16:58:09 2009 -0500
@@ -40,16 +40,14 @@
.history + :not(.history) .xxxmark,
.history + :not(.history) .xxxmessage
{
- //padding-top: 1.6em !important;
- border-top: 1.6em solid hsla(0, 0%, 0%, 1) !important;
+ border-top: 16px solid hsla(0, 0%, 0%, 1) !important;
}
.history + :not(.history) .xxxiconsmall,
.history + :not(.history) .xxxsender,
.history + :not(.history) .xxxtime
{
- //padding-top: 1.6em !important;
- border-top: 1.6em solid hsla(0, 0%, 12.5%, 1) !important;
+ border-top: 16px solid hsla(0, 0%, 12.5%, 1) !important;
}
.xxxwrapper:hover,
diff -r f72bb8336fdd -r 0200d4763906 yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorM.css
--- a/yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorM.css Tue Jun 02 15:45:51 2009 -0500
+++ b/yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorM.css Tue Jun 02 16:58:09 2009 -0500
@@ -68,3 +68,69 @@
{
border-top: transparent !important;
}
+
+#Chat > div:first-of-type .xxxmark,
+#Chat > div:first-of-type .xxxmessage
+{
+ border-top: 4px solid hsla(0, 0%, 100%, 1) !important;
+}
+
+#Chat > div:last-of-type .xxxmark,
+#Chat > div:last-of-type .xxxmessage
+{
+ border-bottom: 4px solid hsla(0, 0%, 100%, 1) !important;
+}
+
+#Chat > div:first-of-type .xxxiconsmall,
+#Chat > div:first-of-type .xxxsender,
+#Chat > div:first-of-type .xxxtime
+{
+ border-top: 4px solid hsla(0, 0%, 90%, 1) !important;
+}
+
+#Chat > div:last-of-type .xxxiconsmall,
+#Chat > div:last-of-type .xxxsender,
+#Chat > div:last-of-type .xxxtime
+{
+ border-bottom: 4px solid hsla(0, 0%, 90%, 1) !important;
+}
+
+#Chat > div.history:first-of-type .xxxmark,
+#Chat > div.history:first-of-type .xxxmessage
+{
+ //border-bottom: 4px solid hsla(0, 0%, 90%, 1) !important;
+}
+
+#Chat > div.history:last-of-type .xxxmark,
+#Chat > div.history:last-of-type .xxxmessage
+{
+ //border-bottom: 4px solid hsla(0, 0%, 90%, 1) !important;
+}
+
+#Chat > div.history:first-of-type .xxxiconsmall,
+#Chat > div.history:first-of-type .xxxsender,
+#Chat > div.history:first-of-type .xxxtime
+{
+ //border-top: 4px solid hsla(0, 0%, 80%, 1) !important;
+}
+
+#Chat > div.history:last-of-type .xxxiconsmall,
+#Chat > div.history:last-of-type .xxxsender,
+#Chat > div.history:last-of-type .xxxtime
+{
+ //border-bottom: 4px solid hsla(0, 0%, 80%, 1) !important;
+}
+
+.history + :not(.history) .xxxmark,
+.history + :not(.history) .xxxmessage
+{
+ border-top: 16px solid hsla(0, 0%, 100%, 1) !important;
+}
+
+.history + :not(.history) .xxxiconsmall,
+.history + :not(.history) .xxxsender,
+.history + :not(.history) .xxxtime
+{
+ border-top: 16px solid hsla(0, 0%, 90%, 1) !important;
+}
+
diff -r f72bb8336fdd -r 0200d4763906 yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorS.css
--- a/yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorS.css Tue Jun 02 15:45:51 2009 -0500
+++ b/yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorS.css Tue Jun 02 16:58:09 2009 -0500
@@ -70,3 +70,43 @@
{
border-top: transparent !important;
}
+
+#Chat > div:first-of-type .xxxmark,
+#Chat > div:first-of-type .xxxmessage
+{
+ border-top: 4px solid hsla(0, 0%, 0%, 1) !important;
+}
+
+#Chat > div:last-of-type .xxxmark,
+#Chat > div:last-of-type .xxxmessage
+{
+ border-bottom: 4px solid hsla(0, 0%, 0%, 1) !important;
+}
+
+#Chat > div:first-of-type .xxxiconsmall,
+#Chat > div:first-of-type .xxxsender,
+#Chat > div:first-of-type .xxxtime
+{
+ border-top: 4px solid hsla(0, 0%, 12.5%, 1) !important;
+}
+
+#Chat > div:last-of-type .xxxiconsmall,
+#Chat > div:last-of-type .xxxsender,
+#Chat > div:last-of-type .xxxtime
+{
+ border-bottom: 4px solid hsla(0, 0%, 12.5%, 1) !important;
+}
+
+.history + :not(.history) .xxxmark,
+.history + :not(.history) .xxxmessage
+{
+ border-top: 16px solid hsla(0, 0%, 0%, 1) !important;
+}
+
+.history + :not(.history) .xxxiconsmall,
+.history + :not(.history) .xxxsender,
+.history + :not(.history) .xxxtime
+{
+ border-top: 16px solid hsla(0, 0%, 12.5%, 1) !important;
+}
+
More information about the commits
mailing list