adium 3638:976b62a9eaa3: Stockholm: Add support for displaying m...
commits at adium.im
commits at adium.im
Fri Feb 11 18:20:55 UTC 2011
details: http://hg.adium.im/adium/rev/976b62a9eaa3
revision: 3638:976b62a9eaa3
author: mathuaerknedam
date: Fri Feb 11 11:43:13 2011 -0600
Stockholm: Add support for displaying message timestamps on the left when the message text is RTL. Fixes #10403.
(transplanted from d3e9da090928e37e80ca82046fb10866fdc7aae2)
Subject: adium 3639:1a8bcb002f99: yMous: update the license and tweak the Mockup.
details: http://hg.adium.im/adium/rev/1a8bcb002f99
revision: 3639:1a8bcb002f99
author: mathuaerknedam
date: Fri Feb 11 11:45:23 2011 -0600
yMous: update the license and tweak the Mockup.
(transplanted from 3eb522469b8b38ec9ef6a7b309a5824f7bdc60fa)
Subject: adium 3640:975bc3530cf1: Mockie: Remove the ancient Sample file (mockup).
details: http://hg.adium.im/adium/rev/975bc3530cf1
revision: 3640:975bc3530cf1
author: mathuaerknedam
date: Fri Feb 11 11:54:04 2011 -0600
Mockie: Remove the ancient Sample file (mockup).
(transplanted from be2cf36c26e32ab48d12f188c44c8aae660de98b)
Subject: adium 3641:fae695f5555f: Mockie: new mention/focus indicators. For this I needed to improve element scaling at large font sizes, so that's fixed here too. Fixes #14420.
details: http://hg.adium.im/adium/rev/fae695f5555f
revision: 3641:fae695f5555f
author: mathuaerknedam
date: Fri Feb 11 11:55:09 2011 -0600
Mockie: new mention/focus indicators. For this I needed to improve element scaling at large font sizes, so that's fixed here too. Fixes #14420.
(transplanted from b85467db029b4bc47e4e68174550f1b53aee097b)
Subject: adium 3642:dfc2cdb06868: Smooth Operator: shift the builtin buddy icons down a few pixels so they look more centered.
details: http://hg.adium.im/adium/rev/dfc2cdb06868
revision: 3642:dfc2cdb06868
author: mathuaerknedam
date: Fri Feb 11 11:57:24 2011 -0600
Smooth Operator: shift the builtin buddy icons down a few pixels so they look more centered.
(transplanted from c257a836420add459fe3c47b4059bcf25d279ed5)
Subject: adium 3643:329dd2e8801a: Smooth Operator: update the license.
details: http://hg.adium.im/adium/rev/329dd2e8801a
revision: 3643:329dd2e8801a
author: mathuaerknedam
date: Fri Feb 11 11:58:13 2011 -0600
Smooth Operator: update the license.
(transplanted from 03442b6f024a23f0bc8aadedb8fabb0b3396b6b7)
Subject: adium 3644:fa87b8c079a1: Smooth Operator: all-by-sender-highlighting is now limited to visible messages. Thanks to Kronuz in #adium for the additional javascript.
details: http://hg.adium.im/adium/rev/fa87b8c079a1
revision: 3644:fa87b8c079a1
author: mathuaerknedam
date: Fri Feb 11 12:01:04 2011 -0600
Smooth Operator: all-by-sender-highlighting is now limited to visible messages. Thanks to Kronuz in #adium for the additional javascript.
(transplanted from 9a27d5786720d042cc9b339bad5c3c2175857a71)
Subject: adium 3645:831f7361a5dd: Smooth Operator: adding a dark variant and lightening the on-click shadow in the classic variant.
details: http://hg.adium.im/adium/rev/831f7361a5dd
revision: 3645:831f7361a5dd
author: mathuaerknedam
date: Fri Feb 11 12:08:14 2011 -0600
Smooth Operator: adding a dark variant and lightening the on-click shadow in the classic variant.
(transplanted from bf1b88542bf62820aeb8398c81a97a66f822b0e9)
Subject: adium 3646:e4fa74ef8b52: Smooth Operator: the per-message marks in the classic variant now grows to the left rather than to the right where it can overlap message text. In other variants the mark is a fixed size so that it's always the same horizontal position in the color bar.
details: http://hg.adium.im/adium/rev/e4fa74ef8b52
revision: 3646:e4fa74ef8b52
author: mathuaerknedam
date: Fri Feb 11 12:09:51 2011 -0600
Smooth Operator: the per-message marks in the classic variant now grows to the left rather than to the right where it can overlap message text. In other variants the mark is a fixed size so that it's always the same horizontal position in the color bar.
(transplanted from 6a1df5a6ed012f7003fdcceb7f16884dc4ccf086)
Subject: adium 3647:170b7ad505e4: Smooth Operator: Misc small tweaks.
details: http://hg.adium.im/adium/rev/170b7ad505e4
revision: 3647:170b7ad505e4
author: mathuaerknedam
date: Fri Feb 11 12:13:40 2011 -0600
Smooth Operator: Misc small tweaks.
(transplanted from d6bb60df824d45d11793c41487af1993b3010928)
diffs (truncated from 2740 to 1000 lines):
diff -r fd18f58e6966 -r 170b7ad505e4 Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/basestyle.css
--- a/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/basestyle.css Thu Feb 10 18:42:38 2011 -0500
+++ b/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/basestyle.css Fri Feb 11 12:13:40 2011 -0600
@@ -6,7 +6,7 @@
#Chat
{
overflow: hidden;
- padding: 5px 10px 5px 10px;
+ padding: 5px 10px 5px 1em;
}
#topic
@@ -39,9 +39,11 @@
word-break: break-word;
}
-#topic[title=""] #topicEdit:after
+#topic[title=""] #topicEdit
{
- content: "< no topic available >";
+ border-top: .2em solid rgba(184, 184, 184, 1);
+ margin-top: .4em;
+ margin-bottom: .4em;
}
.incoming,
@@ -72,8 +74,6 @@
{
color: white;
font-weight: bold;
- font-size: 11px;
- height: 14px;
padding-right: 4px;
padding-left: 4px;
overflow: hidden;
@@ -89,14 +89,10 @@
{
color: rgba(255, 255, 255, .5);
font-weight: bold;
- font-size: 11px;
float: right;
- position: relative;
- height: 14px;
- top: -14px;
+ margin-top: -1.18em;
padding-right: 4px;
right: 0px;
- margin-bottom: -14px;
word-wrap: normal;
}
@@ -159,142 +155,49 @@
width:auto;
}
-.firstFocus.message .x-text:before,
-.firstFocus.status .x-wrap:before,
-.firstFocus.event .x-wrap:before
+.focus .x-message:before
{
position: absolute;
- right: 10px;
- margin-top: -19px;
- content: "focus lost here";
- background: rgba(184, 184, 184, 1);
- color: white;
+ margin-top: 2px;
+ margin-left: -.8em;
+ content: "\25e6";
+ color: rgba(176, 176, 176, .8);
font-weight: bold;
- font-size: 11px;
- z-index: 99;
- white-space: nowrap;
- overflow: hidden;
- padding: 2px;
- padding-left: 4px;
- -webkit-border-top-left-radius: 5px;
- -webkit-border-top-right-radius: 5px;
}
-.firstFocus.status .x-wrap:before,
-.firstFocus.event .x-wrap:before
+.focus.status .x-wrap:before,
+.focus.event .x-wrap:before
{
- padding-right: 4px;
- margin-top: -17px;
+ position: absolute;
+ margin-top: 1px;
+ margin-left: -.8em;
+ content: "\25e6";
+ color: rgba(176, 176, 176, .8);
+ font-weight: bold;
}
-.firstFocus.message .x-text,
-.firstFocus.status .x-wrap,
-.firstFocus.event .x-wrap
+.mention.focus .x-message:before
{
- border-top: 4px solid rgba(184, 184, 184, 1);
+ position: absolute;
+ margin-top: 3px;
+ margin-left: -.8em;
+ content: "\25e6";
+ font-weight: bold;
}
-.firstFocus.message .x-text
-{
- margin-top: 15px;
- margin-right: 2px;
-}
-
-.firstFocus.message .x-time
-{
- margin-top: 19px;
-}
-
-.firstFocus.status .x-wrap,
-.firstFocus.event .x-wrap
-{
- margin-top: 18px;
- /*margin-top: 20px;*/
- /*padding-top: 2px;*/
-}
-
-.mention .x-text:before
+.mention .x-message:before
{
position: absolute;
- margin-top: -19px;
- margin-left: -2px;
- content: "mentioned here";
- background: rgba(184, 184, 184, 1);
- color: white;
- font-weight: bold;
- font-size: 11px;
- z-index: 99;
- white-space: nowrap;
- overflow: hidden;
- padding: 2px;
- padding-right: 4px;
- -webkit-border-top-left-radius: 5px;
- -webkit-border-top-right-radius: 5px;
-}
-
-.mention .x-text
-{
- border-top: 4px solid rgba(184, 184, 184, 1);
- padding-left: 2px;
- padding-right: 4px;
- margin-bottom: 2px;
- margin-left: 2px;
- margin-top: 15px;
-}
-
-.mention .x-time
-{
- margin-top: 19px;
-}
-
-.mention.firstFocus .x-text:before
-{
- content: "mentioned here + focus lost here";
- padding-left: 4px;
-}
-
-.mention.firstFocus .x-text
-{
- margin-left: 0px;
-}
-
-.history + :not(.history):before
-{
- position: absolute;
- margin-top: -22px;
- margin-left: 0px;
- content: "message history ends here";
- background: rgba(184, 184, 184, 1);
- color: white;
- font-weight: bold;
- font-size: 11px;
- z-index: 99;
- white-space: nowrap;
- overflow: hidden;
- padding: 4px;
- padding-top: 2px;
- padding-bottom: 2px;
- -webkit-border-bottom-left-radius: 5px;
- -webkit-border-bottom-right-radius: 5px;
+ margin-top: 2px;
+ margin-left: -.8em;
+ content: "\2022";
}
.history + :not(.history)
{
- margin-top: 5px;
- padding-top: 18px;
- border-top: 4px solid rgba(184, 184, 184, 1);
-}
-
-.history + :not(.history).status.firstFocus:before,
-.history + :not(.history).event.firstFocus:before
-{
- margin-top: -14px;
-}
-
-.history + :not(.history).status.firstFocus,
-.history + :not(.history).event.firstFocus
-{
- padding-top: 10px;
+ border-top: .2em solid rgba(184, 184, 184, 1);
+ margin-top: .4em;
+ padding-top: .4em;
}
.message.consecutive:not(.firstFocus) .x-buddyicon,
@@ -336,11 +239,3 @@
{
-webkit-border-radius: 3px;
}
-
-.status.firstFocus .x-wrap,
-.event.firstFocus .x-wrap
-{
- -webkit-border-top-left-radius: 0px;
- -webkit-border-top-right-radius: 0px;
-}
-
diff -r fd18f58e6966 -r 170b7ad505e4 Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/colors_brown_olive.css
--- a/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/colors_brown_olive.css Thu Feb 10 18:42:38 2011 -0500
+++ b/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/colors_brown_olive.css Fri Feb 11 12:13:40 2011 -0600
@@ -27,6 +27,8 @@
background: rgba(209, 184, 156, 1);
}
+.focus.mention .x-message:before,
+.mention .x-message:before,
.incoming .x-time,
.incoming a
{
@@ -45,7 +47,7 @@
}
.incoming.history .x-message,
-.incoming.consecutive .x-message
+.incoming.consecutive:not(.firstFocus) .x-message
{
border-top: 1px solid rgba(209, 184, 156, 1);
}
@@ -85,7 +87,7 @@
}
.outgoing.history .x-message,
-.outgoing.consecutive .x-message
+.outgoing.consecutive:not(.firstFocus) .x-message
{
border-top: 1px solid rgba(178, 200, 166, 1);
}
diff -r fd18f58e6966 -r 170b7ad505e4 Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/colors_indigo_maroon.css
--- a/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/colors_indigo_maroon.css Thu Feb 10 18:42:38 2011 -0500
+++ b/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/colors_indigo_maroon.css Fri Feb 11 12:13:40 2011 -0600
@@ -27,6 +27,8 @@
background: rgba(161, 168, 211, 1);
}
+.focus.mention .x-message:before,
+.mention .x-message:before,
.incoming .x-time,
.incoming a
{
@@ -45,7 +47,7 @@
}
.incoming.history .x-message,
-.incoming.consecutive .x-message
+.incoming.consecutive:not(.firstFocus) .x-message
{
border-top: 1px solid rgba(161, 168, 211, 1);
}
@@ -85,7 +87,7 @@
}
.outgoing.history .x-message,
-.outgoing.consecutive .x-message
+.outgoing.consecutive:not(.firstFocus) .x-message
{
border-top: 1px solid rgba(212, 159, 159, 1);
}
diff -r fd18f58e6966 -r 170b7ad505e4 Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/colors_orange_green.css
--- a/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/colors_orange_green.css Thu Feb 10 18:42:38 2011 -0500
+++ b/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/colors_orange_green.css Fri Feb 11 12:13:40 2011 -0600
@@ -27,6 +27,8 @@
background: rgba(249, 188, 120, 1);
}
+.focus.mention .x-message:before,
+.mention .x-message:before,
.incoming .x-time,
.incoming a
{
@@ -45,7 +47,7 @@
}
.incoming.history .x-message,
-.incoming.consecutive .x-message
+.incoming.consecutive:not(.firstFocus) .x-message
{
border-top: 1px solid rgba(249, 188, 120, 1);
}
@@ -85,7 +87,7 @@
}
.outgoing.history .x-message,
-.outgoing.consecutive .x-message
+.outgoing.consecutive:not(.firstFocus) .x-message
{
border-top: 1px solid rgba(172, 228, 145, 1);
}
diff -r fd18f58e6966 -r 170b7ad505e4 Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/colors_red_blue.css
--- a/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/colors_red_blue.css Thu Feb 10 18:42:38 2011 -0500
+++ b/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/colors_red_blue.css Fri Feb 11 12:13:40 2011 -0600
@@ -27,6 +27,8 @@
background: rgba(127, 145, 250, 1);
}
+.focus.mention .x-message:before,
+.mention .x-message:before,
.incoming .x-time,
.incoming a
{
@@ -45,7 +47,7 @@
}
.incoming.history .x-message,
-.incoming.consecutive .x-message
+.incoming.consecutive:not(.firstFocus) .x-message
{
border-top: 1px solid rgba(127, 145, 250, 1);
}
@@ -85,7 +87,7 @@
}
.outgoing.history .x-message,
-.outgoing.consecutive .x-message
+.outgoing.consecutive:not(.firstFocus) .x-message
{
border-top: 1px solid rgba(254, 123, 123, 1);
}
diff -r fd18f58e6966 -r 170b7ad505e4 Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/icon_alternate.css
--- a/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/icon_alternate.css Thu Feb 10 18:42:38 2011 -0500
+++ b/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/icon_alternate.css Fri Feb 11 12:13:40 2011 -0600
@@ -17,16 +17,5 @@
.outgoing .x-buddyicon
{
position: absolute;
- left: 10px;
+ margin-left: -37px;
}
-
-.firstFocus.message .x-text:before
-{
- right: 49px;
-}
-
-.firstFocus.status .x-text:before,
-.firstFocus.event .x-text:before
-{
- right: 10px;
-}
diff -r fd18f58e6966 -r 170b7ad505e4 Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/icon_hidden.css
--- a/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/icon_hidden.css Thu Feb 10 18:42:38 2011 -0500
+++ b/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/icon_hidden.css Fri Feb 11 12:13:40 2011 -0600
@@ -7,14 +7,3 @@
{
padding-right: 41px;
}
-
-.firstFocus.message .x-text:before
-{
- right: 12px;
-}
-
-.firstFocus.status .x-text:before,
-.firstFocus.event .x-text:before
-{
- right: 10px;
-}
diff -r fd18f58e6966 -r 170b7ad505e4 Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/icon_left.css
--- a/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/icon_left.css Thu Feb 10 18:42:38 2011 -0500
+++ b/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/icon_left.css Fri Feb 11 12:13:40 2011 -0600
@@ -1,3 +1,8 @@
+#Chat
+{
+ padding: 5px 1em 5px 10px;
+}
+
.message .x-wrap
{
margin-left: 37px;
@@ -9,13 +14,24 @@
left: 10px;
}
-.firstFocus.message .x-text:before
+.focus .x-message:before
{
- right: 12px;
+ right: .2em;
}
-.firstFocus.status .x-text:before,
-.firstFocus.event .x-text:before
+.focus.status .x-wrap:before,
+.focus.event .x-wrap:before
{
- right: 10px;
+ right: .2em;
}
+
+.mention .x-message:before
+{
+ right: .2em;
+}
+
+.mention.focus .x-message:before
+{
+ right: .2em;
+}
+
diff -r fd18f58e6966 -r 170b7ad505e4 Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/icon_right.css
--- a/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/icon_right.css Thu Feb 10 18:42:38 2011 -0500
+++ b/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/Styles/icon_right.css Fri Feb 11 12:13:40 2011 -0600
@@ -8,11 +8,3 @@
position: absolute;
right: 10px;
}
-
-.firstFocus.message .x-text:before,
-.firstFocus.status .x-text:before,
-.firstFocus.event .x-text:before
-{
- right: 49px;
-}
-
diff -r fd18f58e6966 -r 170b7ad505e4 Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/mockup.html
--- a/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/mockup.html Thu Feb 10 18:42:38 2011 -0500
+++ b/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/mockup.html Fri Feb 11 12:13:40 2011 -0600
@@ -6,7 +6,7 @@
</title>
<style type="text/css" media="screen,print">
- @import url( "./Variants/Red - Icon Alternate.css" );
+ @import url( "./Variants/Indigo - Icon left.css" );
body
{
@@ -19,6 +19,14 @@
<body>
+<div id="topic" title="1.3.6 http://adium.im || Adium VV? See http://adium.im/blog/2009/08/pidgin-2-6-0-and-adium-vv/ || #adium-devl for development talk || Paste into http://paste.lisp.org/new/adium">
+ <style type="text/css">
+ @import url(./Styles/Topic.css);
+ </style>
+
+ <span id="topicEdit" ondblclick="this.setAttribute('contentEditable', true); this.focus();">1.3.6 http://adium.im || Adium VV? See http://adium.im/blog/2009/08/pidgin-2-6-0-and-adium-vv/ || #adium-devl for development talk || Paste into http://paste.lisp.org/new/adium"</span>
+</div>
+
<div id="Chat" style="top: 248px; position: static; " class="">
<div class="history date_separator event">
@@ -31,11 +39,12 @@
<div class="outgoing message history">
<div class="x-wrap">
<div class="x-buddyicon">
- <img src="file:///Users/mneedham/Library/Caches/Adium/Default/TEMP-155YTHE.png"> </div>
+ <img src="Outgoing/buddy_icon.png">
+ </div>
<div class="x-sender">mthrkndm</div>
<div class="x-service">IRC</div>
<div class="x-message" style="background-color:;">
- <div class="x-time" title="11 May 2010">20:48:05 </div>
+ <div class="x-time" title="11 May 2010">20:48:05</div>
<div class="x-text">Yessir.</div>
</div>
</div>
@@ -44,11 +53,12 @@
<div class="incoming message autoreply history">
<div class="x-wrap">
<div class="x-buddyicon">
- <img src="Incoming/buddy_icon.png"> </div>
+ <img src="Incoming/buddy_icon.png">
+ </div>
<div class="x-sender">vnds (Autoreply)</div>
<div class="x-service">IRC</div>
<div class="x-message" style="background-color:;">
- <div class="x-time" title="11 May 2010">20:48:05 </div>
+ <div class="x-time" title="11 May 2010">20:48:05</div>
<div class="x-text">Dinner</div>
</div>
</div>
@@ -57,16 +67,100 @@
<div class="consecutive incoming message history">
<div class="x-wrap">
<div class="x-buddyicon">
- <img src="Incoming/buddy_icon.png"> </div>
+ <img src="Incoming/buddy_icon.png">
+ </div>
<div class="x-sender">vnds</div>
<div class="x-service">IRC</div>
<div class="x-message" style="background-color:;">
- <div class="x-time" title="11 May 2010">20:49:40 </div>
+ <div class="x-time" title="11 May 2010">20:49:40</div>
<div class="x-text">oops, nm</div>
</div>
</div>
</div>
+<div class="outgoing message">
+ <div class="x-wrap">
+ <div class="x-buddyicon">
+ <img src="Outgoing/buddy_icon.png"> </div>
+ <div class="x-sender">mthrkndm</div>
+ <div class="x-service">IRC</div>
+ <div class="x-message" style="background-color:;">
+ <div class="x-time" title="11 May 2010">20:48:05</div>
+ <div class="x-text">Yessir.</div>
+ </div>
+ </div>
+</div>
+
+<div class="status">
+ <div class="x-wrap">
+ <span class="x-time" title="11 May 2010">20:48:05 </span>
+ <span class="x-text">vnds went away!</span>
+ </div>
+</div>
+
+<div class="event firstFocus focus">
+ <div class="x-wrap">
+ <span class="x-time" title="11 May 2010">20:48:05 </span>
+ <span class="x-text">vnds wants your attention!</span>
+ </div>
+</div>
+
+<div class="incoming focus message">
+ <div class="x-wrap">
+ <div class="x-buddyicon">
+ <img src="Incoming/buddy_icon.png">
+ </div>
+ <div class="x-sender">vnds</div>
+ <div class="x-service">IRC</div>
+ <div class="x-message" style="background-color:;">
+ <div class="x-time" title="11 May 2010">20:48:05</div>
+ <div class="x-text">BUZZ!</div>
+ </div>
+ </div>
+</div>
+
+<div class="consecutive incoming focus message">
+ <div class="x-wrap">
+ <div class="x-buddyicon">
+ <img src="Incoming/buddy_icon.png">
+ </div>
+ <div class="x-sender">vnds</div>
+ <div class="x-service">IRC</div>
+ <div class="x-message" style="background-color:;">
+ <div class="x-time" title="11 May 2010">20:48:05</div>
+ <div class="x-text">oops, nvm</div>
+ </div>
+ </div>
+</div>
+
+<div class="consecutive incoming firstFocus focus message mention">
+ <div class="x-wrap">
+ <div class="x-buddyicon">
+ <img src="Incoming/buddy_icon.png">
+ </div>
+ <div class="x-sender">vnds</div>
+ <div class="x-service">IRC</div>
+ <div class="x-message" style="background-color:;">
+ <div class="x-time" title="11 May 2010">20:48:05</div>
+ <div class="x-text">Mentioning you</div>
+ </div>
+ </div>
+</div>
+
+<div class="incoming message mention">
+ <div class="x-wrap">
+ <div class="x-buddyicon">
+ <img src="Incoming/buddy_icon.png">
+ </div>
+ <div class="x-sender">ctfsh_mn</div>
+ <div class="x-service">IRC</div>
+ <div class="x-message" style="background-color:;">
+ <div class="x-time" title="11 May 2010">20:48:05</div>
+ <div class="x-text">also mentioning you</div>
+ </div>
+ </div>
+</div>
+
<div id="insert"></div>
</div>
diff -r fd18f58e6966 -r 170b7ad505e4 Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/sample.html
--- a/Resources/Message Styles/Mockie.AdiumMessageStyle/Contents/Resources/sample.html Thu Feb 10 18:42:38 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <meta http-equiv="content-type" content="text/html; charset=utf-8" />
- <meta name="generator" content="Colloquy 2.0" />
- <meta name="formatter" content="libxslt 1.0.30" />
- <link rel="stylesheet" href="main.css" type="text/css" />
-
- <script type="text/ecmascript" defer="defer">
- var scrollToBottomIsNeeded = false;
-
- function appendMessage(html) {
- //Remove any existing insertion point
- insert = document.getElementById("insert");
- if(insert) insert.parentNode.removeChild(insert);
-
- //Append the new message to the bottom of our chat block
- chat = document.getElementById("Chat");
- range = document.createRange();
- range.selectNode(chat);
- documentFragment = range.createContextualFragment(html);
- chat.appendChild(documentFragment);
- alignChat();
- }
-
- function appendNextMessage(html){
- //
- insert = document.getElementById("insert");
-
- //make new node
- range = document.createRange();
- range.selectNode(insert.parentNode);
- newNode = range.createContextualFragment(html);
-
- //swap
- insert.parentNode.replaceChild(newNode,insert);
- alignChat();
- }
-
- function scrollToBottom() {
- document.body.scrollTop = document.body.offsetHeight;
- }
-
- function checkIfScrollToBottomIsNeeded() {
- scrollToBottomIsNeeded = ( document.body.scrollTop >= ( document.body.offsetHeight - ( window.innerHeight * 1.2 ) ) );
- }
-
- function scrollToBottomIfNeeded() {
- if( scrollToBottomIsNeeded )
- document.body.scrollTop = document.body.offsetHeight;
- }
-
- function setStylesheet( id, url ) {
- code = "<style id=\"" + id + "\" type=\"text/css\" media=\"screen,print\">";
- if( url.length ) code += "@import url( \"" + url + "\" );";
- code += "</style>";
- range = document.createRange();
- head = document.getElementsByTagName( "head" ).item(0);
- range.selectNode( head );
- documentFragment = range.createContextualFragment( code );
- head.removeChild( document.getElementById( id ) );
- head.appendChild( documentFragment );
- }
- document.onclick = imageCheck;
- function imageCheck() {
- node = event.target;
- if(node.tagName == 'IMG' && node.alt) {
- a = document.createElement('a');
- a.setAttribute('onclick', 'imageSwap(this)');
- a.setAttribute('src', node.src);
- text = document.createTextNode(node.alt);
- a.appendChild(text);
- node.parentNode.replaceChild(a, node);
- }
- }
- function imageSwap(node) {
- img = document.createElement('img');
- img.setAttribute('src', node.src);
- img.setAttribute('alt', node.firstChild.nodeValue);
- node.parentNode.replaceChild(img, node);
- }
- function alignChat() {
- var windowHeight = window.innerHeight;
- if (windowHeight > 0) {
- var contentElement = document.getElementById('Chat');
- var contentHeight = contentElement.offsetHeight;
- if (windowHeight - contentHeight > 0) {
- contentElement.style.position = 'relative';
- contentElement.style.top = (windowHeight - contentHeight) + 'px';
- }
- else {
- contentElement.style.position = 'static';
- }
- }
- scrollToBottom();
- }
- window.onresize = alignChat;
-
- </script>
-</head>
-<!--
-<body onload="alignChat();" style="background: url(josie2.jpg); font: 11px 'Lucida Grande';">
--->
-<body onload="alignChat();" style="background: url(); font: 11px 'Lucida Grande';">
-<div id="Chat">
-<div class="x-incoming context">
- <div class="x-buddyicon">
- <img src="Incoming/buddy_icon.png" width="32" height="32" />
- </div>
- <div class="x-mask"></div>
- <div class="x-topleft"></div>
- <div class="x-sender">
- <span alt="ramoth4">Colin the Great</span>
- </div>
- <div class="x-protocol">AIM</div>
- <div class="x-message">
- <div class="x-time_initial">10:24:14</div><p>Testing context messages!</p>
- <div class="x-time_consecutive">10:24:14</div><p>Not much</p>
- <div id="insert"></div>
- </div>
-</div>
-<div class="x-outgoing context">
- <div class="x-buddyicon">
- <img src="Incoming/buddy_icon.png" width="32" height="32" />
- </div>
- <div class="x-mask"></div>
- <div class="x-topleft"></div>
- <div class="x-sender">
- Jorge Salvador Caffarena (eevyl at mac.com) testing very long wassup
- </div>
- <div class="x-protocol">AIM</div>
- <div class="x-message">
- <div class="x-time_initial">10:24:14</div><p>more test</p>
- </div>
-</div>
-<div class="x-incoming actual">
- <div class="x-buddyicon">
- <img src="Incoming/buddy_icon.png" width="32" height="32" />
- </div>
- <div class="x-topleft"></div>
- <div class="x-sender">
- Colin the Great
- </div>
- <div class="x-protocol">AIM</div>
- <div class="x-message">
- <div class="x-time_initial">10:24:14</div><p>Ahoy!</p>
- </div>
-</div>
-<div class="x-status_container">
- <div class="x-status_message">
- Pepito has gone offline
- <span class="x-status_time">
- 10:23
- </span>
- </div>
-</div>
-<div class="x-status_container">
- <div class="x-status_message">
- Colin has returned from idle
- <span class="x-status_time">
- 10:23
- </span>
- </div>
-</div>
-<div class="x-outgoing actual">
- <div class="x-buddyicon">
- <img src="Incoming/buddy_icon.png" width="32" height="32" />
- </div>
- <div class="x-topleft"></div>
- <div class="x-sender">
- Jorge Salvador Caffarena (eevyl at mac.com) testing very long wassup
- </div>
- <div class="x-protocol">AIM</div>
- <div class="x-message">
- <div class="x-time_initial">10:23:22</div><p>That is what happens when a long url is inserted, magic scroller</p>
- <div class="x-time_consecutive">10:23:22</div><p>Not much <a href="http://www.apple.com/long/url/as/it/can/be/whatever">http://www.apple.com/long/url/as/it/can/be/whatever/longer/than/anything/</a></p>
- <div id="insert"></div>
- </div>
-</div>
-<div class="x-incoming actual">
- <div class="x-buddyicon">
- <img src="Incoming/buddy_icon.png" width="32" height="32" />
- </div>
- <div class="x-topleft"></div>
- <div class="x-sender">
- Colin the Great
- </div>
- <div class="x-protocol">AIM</div>
- <div class="x-message">
- <div class="x-time_initial">10:23:22</div><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean quam lectus, tristique sit amet, luctus ut, euismod ut, velit. Quisque vulputate tortor nec justo. Suspendisse pede. Curabitur ac enim ac nunc porta bibendum. Ut vel dolor id orci tempus semper. Sed pretium enim eget nulla. Vestibulum mollis, tortor at accumsan luctus, dolor nulla aliquam elit, nec vehicula augue erat sit amet leo. Sed ornare est. Maecenas facilisis, erat quis varius vehicula, nibh lorem tempor quam, vel egestas massa wisi viverra orci. Etiam rutrum erat nec est. Donec facilisis, ligula nec venenatis interdum, mi wisi dapibus nulla, eu consectetuer libero justo id lectus. Sed vitae ipsum vitae lectus tincidunt malesuada. Nulla congue erat. Mauris auctor, neque ut pellentesque placerat, metus augue aliquam risus, vitae elementum diam ante a lectus. Etiam dignissim scelerisque lectus. Vivamus libero metus, ullamcorper sit amet, bibendum a, pretium quis, leo. Vivamus vel elit.</p>
- <div class="x-time_consecutive">10:23:22</div><p>Not much</p>
- <div id="insert"></div>
- </div>
-</div>
-</div>
-</body>
-</html>
diff -r fd18f58e6966 -r 170b7ad505e4 Resources/Message Styles/Smooth Operator.AdiumMessageStyle/Contents/Resources/Footer.js
--- a/Resources/Message Styles/Smooth Operator.AdiumMessageStyle/Contents/Resources/Footer.js Thu Feb 10 18:42:38 2011 -0500
+++ b/Resources/Message Styles/Smooth Operator.AdiumMessageStyle/Contents/Resources/Footer.js Fri Feb 11 12:13:40 2011 -0600
@@ -1,4 +1,4 @@
- var highlightActive = false;
+ var highlightActive = false;
function selectSender() {
if (highlightActive || event.target.tagName.toLowerCase() == 'a')
@@ -17,7 +17,14 @@
var elms = document.getElementsByClassName(senderName); var elemArray = new Array(elms.length); for (var i=0; i<elms.length; i++) { elemArray[i]=elms[i]; }
var len = elemArray.length;
for(var i = 0; i < len; i++) {
- elemArray[i].className += ' x-hover';
+ var elem = elms[i];
+ if(elem.offsetTop + elem.offsetHeight >= window.pageYOffset) {
+ if(elem.offsetTop > window.pageYOffset + window.innerHeight) {
+ break;
+ }
+ elemArray.push(elem);
+ elem.className += ' x-hover';
+ }
}
}
diff -r fd18f58e6966 -r 170b7ad505e4 Resources/Message Styles/Smooth Operator.AdiumMessageStyle/Contents/Resources/Incoming/buddy_icon.png
Binary file Resources/Message Styles/Smooth Operator.AdiumMessageStyle/Contents/Resources/Incoming/buddy_icon.png has changed
diff -r fd18f58e6966 -r 170b7ad505e4 Resources/Message Styles/Smooth Operator.AdiumMessageStyle/Contents/Resources/Mockup-SpecialCases.html
--- a/Resources/Message Styles/Smooth Operator.AdiumMessageStyle/Contents/Resources/Mockup-SpecialCases.html Thu Feb 10 18:42:38 2011 -0500
+++ b/Resources/Message Styles/Smooth Operator.AdiumMessageStyle/Contents/Resources/Mockup-SpecialCases.html Fri Feb 11 12:13:40 2011 -0600
@@ -7,16 +7,19 @@
</title>
<style type="text/css">
- @import url( "./Variants/time-icon.css" );
+ @import url( "./Variants/dark.css" );
body
{
font-size: 7.5pt;
+ font-family: "Lucida Grande";
+ //font-weight: bold;
border-bottom: 1px solid yellow;
//background: url(/Library/Desktop\ Pictures/Plants/Petals.jpg) center repeat;
//background: url(/Library/Desktop\ Pictures/Plants/Leaves.jpg) center repeat;
- //background: url(/Library/Desktop\ Pictures/Nature/Zen\ Garden.jpg) center repeat;
+ //background: url(/Library/Desktop\ Pictures/Nature/Iceberg.jpg) center repeat;
+ //background: lime;
}
</style>
@@ -25,39 +28,41 @@
<body>
<div id="x-header">
- <style type="text/css">
+ <style id="mainStyle" type="text/css" media="screen,print">
@import url(./Header.css);
</style>
- <div id="x-hide" class="x-toggle" onClick="hide_header();"></div>
- <div id="x-show" class="x-toggle" onClick="show_header();" style="display: none"></div>
+ <div id="x-hide" class="x-toggle" onclick="hide_header();"></div>
+ <div id="x-show" class="x-toggle" onclick="show_header();" style="display: none"></div>
<div id="x-wrap">
<span class="x-date">Wednesday, June 09, 2004</span>
<span class="x-time">12:45:48</span>
- <img class="serviceIcon" src="/Users/mneedham/src/Adium/build/Release-Debug/Adium.app/Contents/Resources/Service Icons/Aqua.AdiumServiceIcons/aim.png" alt="AIM"/>
- <span class="x-sender x-incoming">Jeff Jeff Jeff Jeff Jeff Jeff Jeff Jeff Jeff Jeff</span>
- <span class="x-sender x-outgoing">EvanEvanEvanEvanEvanEvanEvanEvanEvanEvan</span>
- <img class="x-icon x-incoming" src="/Users/mneedham/Library/Application%20Support/Adium%202.0/Users/Default/libpurple/icons/8c814ad7cf1b910b74a9c84fb2b6a85e3cc8cba1.png" />
- <span class="x-iconmask x-incoming" style="-webkit-mask-box-image: url(/Users/mneedham/Library/Application%20Support/Adium%202.0/Users/Default/libpurple/icons/8c814ad7cf1b910b74a9c84fb2b6a85e3cc8cba1.png);"></span>
- <span class="x-color x-incoming" style="background-color: blue"></span>
- <img class="x-icon x-outgoing" src="/Users/mneedham/Library/Application%20Support/Adium%202.0/Users/Default/libpurple/icons/23c091f19e3feacaf0cc782065025af54fc64cd0.png" />
- <span class="x-iconmask x-outgoing" style="-webkit-mask-box-image: url(/Users/mneedham/Library/Application%20Support/Adium%202.0/Users/Default/libpurple/icons/23c091f19e3feacaf0cc782065025af54fc64cd0.png);"></span>
- <span class="x-color x-outgoing" style="background-color: seagreen"></span>
+ <a onclick="imageSwap(this, true)" src="/Users/mneedham/Applications/Adium Latest/Adium.app/Contents/Resources/Service Icons/Aqua.AdiumServiceIcons/jabber.png" isemoticon="true" class="serviceIcon">Jabber</a>
+ <img src="/Users/mneedham/Applications/Adium Latest/Adium.app/Contents/Resources/Service Icons/Aqua.AdiumServiceIcons/jabber.png" alt="Jabber" class="serviceIcon" />
+ <span class="x-sender x-incoming">Jeff Jeff Jeff Jeff Jeff Jeff Jeff Jeff Jeff Jeff!</span>
+ <span class="x-sender x-outgoing">EvanEvanEvanEvanEvanEvanEvanEvanEvanEvanEvanEvan!</span>
+ <img class="x-icon x-incoming" src="/Users/mneedham/Library/Caches/Adium/Default/TEMP-Jabber.butlerb at illinois.eduVIPQH.png" />
+ <span class="x-iconmask x-incoming" style="-webkit-mask-box-image: url(/Users/mneedham/Library/Caches/Adium/Default/TEMP-Jabber.butlerb at illinois.eduVIPQH.png);"></span>
+ <span class="x-color x-incoming" style="background-color: paleturquoise;"></span>
+ <img class="x-icon x-outgoing" src="/Users/mneedham/Library/Caches/Adium/Default/TEMP-27SV4D5.png" />
+ <span class="x-iconmask x-outgoing" style="-webkit-mask-box-image: url(/Users/mneedham/Library/Caches/Adium/Default/TEMP-27SV4D5.png);"></span>
+ <span class="x-color x-outgoing" style="background-color: springgreen;"></span>
</div>
</div>
<!--
-<div id="topic" title="1.3.6 http://adium.im || Adium VV? See http://adium.im/blog/2009/08/pidgin-2-6-0-and-adium-vv/ || #adium-devl for development talk || Paste into http://paste.lisp.org/new/adium">
+<div id="topic" title="#adium-devl Adium development channel - for user help, go to #adium. | 1.5hg nightly: http://nightly.adium.im | Make this go down: http://webnumbr.com/adium-1-5-defects">
<div id="x-topic">
<style type="text/css">
@import url(./Topic.css);
</style>
- <div id="x-hide" class="x-toggle" onclick="hide_header();" style=""></div>
- <div id="x-show" class="x-toggle" onclick="show_header();" style="display: none; "></div>
- <div id="x-wrap" style="top: 8px; ">
- <img class="serviceIcon" title="IRC" alt="IRC" src="/Users/mneedham/Applications/AdiumNightly/Adium.app/Contents/Frameworks/AdiumLibpurple.framework/Resources/irc.png">
- <span id="topicEdit" ondblclick="this.setAttribute('contentEditable', true); this.focus();">1.3.6 http://adium.im || Adium VV? See http://adium.im/blog/2009/08/pidgin-2-6-0-and-adium-vv/ || #adium-devl for development talk || Paste into http://paste.lisp.org/new/adium"</span>
+ <div id="x-hide" class="x-toggle" onclick="hide_header();"></div>
+ <div id="x-show" class="x-toggle" onclick="show_header();" style="display: none"></div>
+ <div id="x-wrap">
+ <a onclick="imageSwap(this, true)" src="/Users/mneedham/Applications/Adium Latest/Adium.app/Contents/Frameworks/AdiumLibpurple.framework/Resources/irc.png" isemoticon="true" class="x-serviceIcon">IRC</a>
+ <img class="x-serviceIcon" title="IRC" alt="IRC" src="/Users/mneedham/Applications/Adium Latest/Adium.app/Contents/Frameworks/AdiumLibpurple.framework/Resources/irc.png" />
+ <span id="topicEdit" ondblclick="this.setAttribute('contentEditable', true); this.focus();"><a href="irc://irc.freenode.net:6667/#adium-devl" title="irc://irc.freenode.net:6667/#adium-devl">#adium-devl</a> Adium development channel - for user help, go to <a href="irc://irc.freenode.net:6667/#adium" title="irc://irc.freenode.net:6667/#adium">#adium</a>. | 1.5hg nightly: <a href="http://nightly.adium.im" title="http://nightly.adium.im">http://nightly.adium.im</a> | Make this go down: <a href="http://webnumbr.com/adium-1-5-defects" title="http://webnumbr.com/adium-1-5-defects">http://webnumbr.com/adium-1-5-defects</a></span>
</div>
</div>
</div>
@@ -74,11 +79,54 @@
</span>
</div>
+<div class="history date_separator event SERVICE showIcons">
+ <span class="x-wrap">
+ <span class="x-rtime" title="19 Apr 2004">12:45:48 </span>
+ <span class="x-ltime" title="19 Apr 2004">12:45:48 </span>
+ <span class="x-mark"></span>
+ <span class="x-message" title="12:45:48">Wednesday, June 09, 2004 </span>
+ </span>
+</div>
-<div class="history outgoing message SERVICE showIcons xx-TekJew" style="background-color: seagreen;">
+<div class="history incoming autoreply message SERVICE showIcons xx-fetchgreebledonx" style="background-color: paleturquoise;">
+ <img class="x-icon" src="incoming_icon.png" />
+ <span class="x-iconmask" style="-webkit-mask-box-image: url(./incoming_icon.png);"></span>
+ <span class="x-color" style="background-color: paleturquoise"></span>
+ <span class="x-wrap">
+ <span class="x-sender" title="fetchgreebledonx">Jeff (Autoreply) </span>
+ <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>
+ <div class="history incoming message consecutive SERVICE showIcons xx-fetchgreebledonx" style="background-color: paleturquoise;">
+ <img class="x-icon" src="incoming_icon.png" />
+ <span class="x-iconmask" style="-webkit-mask-box-image: url(./incoming_icon.png);"></span>
+ <span class="x-color" style="background-color: paleturquoise"></span>
+ <span class="x-wrap">
+ <span class="x-sender" title="fetchgreebledonx">Jeff (Autoreply) </span>
+ <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>
+ </div>
+</div>
+
+
+<div class="history date_separator event SERVICE showIcons">
+ <span class="x-wrap">
+ <span class="x-rtime" title="19 Apr 2004">12:45:48 </span>
+ <span class="x-ltime" title="19 Apr 2004">12:45:48 </span>
+ <span class="x-mark"></span>
+ <span class="x-message" title="12:45:48">Wednesday, June 09, 2004 </span>
+ </span>
+</div>
+
+<div class="history outgoing message SERVICE showIcons xx-TekJew" style="background-color: springgreen;">
<img class="x-icon" src="./outgoing_icon.png" />
<span class="x-iconmask" style="-webkit-mask-box-image: url(./outgoing_icon.png);"></span>
- <span class="x-color" style="background-color: seagreen"></span>
+ <span class="x-color" style="background-color: springgreen"></span>
<span class="x-wrap">
<span class="x-sender" title="TekJew">Evan </span>
<span class="x-rtime" title="19 Apr 2004">12:45:48 </span>
@@ -88,10 +136,10 @@
</span>
</div>
-<div class="history incoming message SERVICE showIcons xx-fetchgreebledonx" style="background-color: blue;">
+<div class="history incoming message SERVICE showIcons xx-fetchgreebledonx" style="background-color: paleturquoise;">
<img class="x-icon" src="./incoming_icon.png" />
<span class="x-iconmask" style="-webkit-mask-box-image: url(./incoming_icon.png);"></span>
- <span class="x-color" style="background-color: blue"></span>
+ <span class="x-color" style="background-color: paleturquoise"></span>
<span class="x-wrap">
<span class="x-sender" title="fetchgreebledonx">Jeff </span>
<span class="x-rtime" title="19 Apr 2004">12:46:07 </span>
@@ -99,10 +147,10 @@
<span class="x-mark"></span>
<span class="x-message">I'mprettysureI'veheardthisonebefore.I'mprettysureI'veheardthisonebefore.I'mprettysureI'veheardthisonebefore.I'mprettysureI'veheardthisonebefore.I'mprettysureI'veheardthisonebefore.I'mprettysureI'veheardthisonebefore.I'mprettysureI'veheardthisonebefore.I'mprettysureI'veheardthisonebefore.I'mprettysureI'veheardthisonebefore.I'mprettysureI'veheardthisonebefore. </span>
</span>
- <div class="history consecutive incoming message SERVICE showIcons xx-fetchgreebledonx" style="background-color: blue;">
+ <div class="history consecutive incoming message SERVICE showIcons xx-fetchgreebledonx" style="background-color: paleturquoise;">
<img class="x-icon" src="./incoming_icon.png" />
- <span class="x-iconmask" style="-webkit-mask-box-image: url(./incoming_icon.png);"></span>
More information about the commits
mailing list