xtras/mathuaerknedam 121:b44ab4cf2962: Fix problem where per-mes...
commits at adium.im
commits at adium.im
Wed Aug 26 22:09:17 UTC 2009
details: http://hg.adium.im/xtras/mathuaerknedam/rev/b44ab4cf2962
revision: 121:b44ab4cf2962
author: mathuaerknedam
date: Wed Aug 26 13:57:59 2009 -0500
Fix problem where per-message triangle would be white in icon-time2 variant.
Subject: xtras/mathuaerknedam 122:7886e3ed84da: Fix problem with the padding-left of historical event content when icons are shown in icon-time2 variant.
details: http://hg.adium.im/xtras/mathuaerknedam/rev/7886e3ed84da
revision: 122:7886e3ed84da
author: mathuaerknedam
date: Wed Aug 26 14:08:01 2009 -0500
Fix problem with the padding-left of historical event content when icons are shown in icon-time2 variant.
Subject: xtras/mathuaerknedam 123:fa3815127f10: updates to mockups and todo
details: http://hg.adium.im/xtras/mathuaerknedam/rev/fa3815127f10
revision: 123:fa3815127f10
author: mathuaerknedam
date: Wed Aug 26 17:15:42 2009 -0500
updates to mockups and todo
diffs (281 lines):
diff -r 7f3f1d1664d6 -r fa3815127f10 Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Mockup-SpecialCases.html
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Mockup-SpecialCases.html Tue Aug 25 15:49:52 2009 -0500
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Mockup-SpecialCases.html Wed Aug 26 17:15:42 2009 -0500
@@ -7,7 +7,7 @@
</title>
<style type="text/css">
- @import url( "./Variants/Compact.css" );
+ @import url( "./Variants/Classic.css" );
body
{
@@ -34,7 +34,7 @@
<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 incoming">JeffJeffJeffJeffJeffJeffJeffJeffJeffJeff</span>
+ <span class="x-sender incoming">Jeff Jeff Jeff Jeff Jeff Jeff Jeff Jeff Jeff Jeff</span>
<span class="x-sender outgoing">EvanEvanEvanEvanEvanEvanEvanEvanEvanEvan</span>
<img class="x-icon incoming" src="/Users/mneedham/Library/Application%20Support/Adium%202.0/Users/Default/libpurple/icons/8c814ad7cf1b910b74a9c84fb2b6a85e3cc8cba1.png" />
<span class="x-iconmask incoming" style="-webkit-mask-box-image: url(/Users/mneedham/Library/Application%20Support/Adium%202.0/Users/Default/libpurple/icons/8c814ad7cf1b910b74a9c84fb2b6a85e3cc8cba1.png);"></span>
@@ -341,9 +341,22 @@
<span id="insert"></span>
</div>
+<div class="incoming message SERVICE showIcons xx-fetchgreebledonx" style="background-color: blue;">
+ <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-wrap">
+ <span class="x-sender" title="fetchgreebledonx" >Jeff </span>
+ <span class="x-rtime" title="19 Apr 2004">12:46:32 </span>
+ <span class="x-ltime" title="19 Apr 2004">12:46:32 </span>
+ <span class="x-mark">‣</span>
+ <span class="x-message">So what happens next? </span>
+ </span>
</div>
-<hr id="focus" style="position: absolute; top: 109px;">
+</div>
+
+<hr id="focus" style="position: absolute; top: 128px;">
<script type="text/javascript">
var highlightActive = false;
diff -r 7f3f1d1664d6 -r fa3815127f10 Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Mockup.html
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Mockup.html Tue Aug 25 15:49:52 2009 -0500
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Mockup.html Wed Aug 26 17:15:42 2009 -0500
@@ -7,7 +7,7 @@
</title>
<style type="text/css">
- @import url( "./Variants/Alternating.css" );
+ @import url( "./Variants/time-icon.css" );
body
{
@@ -15,28 +15,36 @@
border-bottom: 1px solid yellow;
}
+ hr#focus
+ {
+ border: 0px;
+ border-bottom: 1px solid red;
+ margin: 0px auto 0px 0px;
+
</style>
</head>
<body>
-<!--
<div id="x-header">
- <style id="mainStyle" type="text/css">
+ <style type="text/css">
@import url(./Header.css);
</style>
- <h1>Wednesday, June 09, 2004</h1>
- <h2>12:45:48</h2>
- <img src="./Images/compact/normal/aim.png" id="SERVICE" />
- <h3 class="incoming">Jeff</h3>
- <h3 class="outgoing">Evan</h3>
- <img class="x-icon incoming" src="./incoming_icon.png" />
- <img class="x-icon outgoing" src="./outgoing_icon.png" />
+ <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 incoming">JeffJeffJeffJeffJeffJeffJeffJeffJeffJeff</span>
+ <span class="x-sender outgoing">EvanEvanEvanEvanEvanEvanEvanEvanEvanEvan</span>
+ <img class="x-icon incoming" src="/Users/mneedham/Library/Application%20Support/Adium%202.0/Users/Default/libpurple/icons/8c814ad7cf1b910b74a9c84fb2b6a85e3cc8cba1.png" />
+ <span class="x-iconmask 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 incoming" style="background-color: blue"></span>
+ <img class="x-icon outgoing" src="/Users/mneedham/Library/Application%20Support/Adium%202.0/Users/Default/libpurple/icons/23c091f19e3feacaf0cc782065025af54fc64cd0.png" />
+ <span class="x-iconmask 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 outgoing" style="background-color: seagreen"></span>
</div>
---!>
+<!--
-<!--
<div id="topic" title="">
<style type="text/css">
@import url(./Topic.css);
@@ -48,7 +56,7 @@
<div id="Chat" class="groupchat">
-<div class="history date_separator event SERVICE hideIcons">
+<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>
@@ -57,7 +65,7 @@
</span>
</div>
-<div class="history outgoing message SERVICE hideIcons xx-TekJew" style="background-color: seagreen;">
+<div class="history outgoing message SERVICE showIcons xx-TekJew" style="background-color: seagreen;">
<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>
@@ -70,7 +78,7 @@
</span>
</div>
-<div class="history incoming message SERVICE hideIcons xx-fetchgreebledonx" style="background-color: blue;">
+<div class="history incoming message SERVICE showIcons xx-fetchgreebledonx" style="background-color: blue;">
<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>
@@ -81,7 +89,7 @@
<span class="x-mark">‣</span>
<span class="x-message">I'm pretty sure I've heard this one before. </span>
</span>
- <div class="history consecutive incoming message SERVICE hideIcons xx-fetchgreebledonx" style="background-color: blue;">
+ <div class="history consecutive incoming message SERVICE showIcons xx-fetchgreebledonx" style="background-color: blue;">
<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>
@@ -95,7 +103,7 @@
</div>
</div>
-<div class="date_separator event SERVICE hideIcons">
+<div class="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>
@@ -104,7 +112,7 @@
</span>
</div>
-<div class="outgoing message SERVICE hideIcons xx-TekJew" style="background-color: seagreen;">
+<div class="outgoing message SERVICE showIcons xx-TekJew" style="background-color: seagreen;">
<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>
@@ -115,7 +123,7 @@
<span class="x-mark">‣</span>
<span class="x-message">If I remember correctly, they explode outward at the speed of light. </span>
</span>
- <div class="consecutive outgoing message SERVICE hideIcons xx-TekJew" style="background-color: seagreen;">
+ <div class="consecutive outgoing message SERVICE showIcons xx-TekJew" style="background-color: seagreen;">
<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>
@@ -129,7 +137,7 @@
</div>
</div>
-<div class="mention incoming message SERVICE hideIcons xx-fetchgreebledonx" style="background-color: blue;">
+<div class="mention incoming message SERVICE showIcons xx-fetchgreebledonx" style="background-color: blue;">
<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>
@@ -142,7 +150,7 @@
</span>
</div>
-<div class="outgoing message SERVICE hideIcons xx-TekJew" style="background-color: seagreen;">
+<div class="outgoing message SERVICE showIcons xx-TekJew" style="background-color: seagreen;">
<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>
@@ -155,14 +163,14 @@
</span>
</div>
-<div class="status away SERVICE hideIcons">
+<div class="status away SERVICE showIcons">
<span class="x-wrap">
<span class="x-rtime" title="19 Apr 2004">12:47:54 </span>
<span class="x-ltime" title="19 Apr 2004">12:47:54 </span>
<span class="x-mark">‣</span>
<span class="x-message">Jeff went away </span>
</span>
- <div class="consecutive status away_message SERVICE hideIcons">
+ <div class="consecutive status away_message SERVICE showIcons">
<span class="x-wrap">
<span class="x-rtime" title="19 Apr 2004">12:47:55 </span>
<span class="x-ltime" title="19 Apr 2004">12:47:55 </span>
@@ -172,7 +180,7 @@
</div>
</div>
-<div class="incoming autoreply message SERVICE hideIcons xx-fetchgreebledonx" style="background-color: blue;">
+<div class="incoming autoreply message SERVICE showIcons xx-fetchgreebledonx" style="background-color: blue;">
<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>
@@ -185,7 +193,7 @@
</span>
</div>
-<div class="outgoing message SERVICE hideIcons xx-TekJew" style="background-color: seagreen;">
+<div class="outgoing message SERVICE showIcons xx-TekJew" style="background-color: seagreen;">
<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>
@@ -200,6 +208,9 @@
</div>
</div>
+
+<hr id="focus" style="position: absolute; top: 394px;">
+
<script type="text/javascript">
var highlightActive = false;
function selectSender() {
@@ -210,7 +221,7 @@
var senderName = null;
while (!senderName) {
var nodeClass = node.className;
- if (nodeClass.indexOf("message") >= 0 && nodeClass.indexOf("x-message") == -1) {
+ if (/(^|[\s])message/.test(nodeClass)) {
var parts = nodeClass.split(" ");
senderName = parts[parts.length - 1];
}
diff -r 7f3f1d1664d6 -r fa3815127f10 Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Icon-Time2.css
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Icon-Time2.css Tue Aug 25 15:49:52 2009 -0500
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Icon-Time2.css Wed Aug 26 17:15:42 2009 -0500
@@ -377,7 +377,7 @@
margin-right: -.33em;
}
-.autoreply:not(.history):not(.IRC) .x-mark,
+.autoreply:not(.history):not(.IRC):not(.hideIcons) .x-mark,
.status .x-mark,
.event .x-mark
{
@@ -583,6 +583,11 @@
padding-right: 4px;
}
+.history.event:not(.IRC):not(.hideIcons) .x-message
+{
+ padding-left: 3px;
+}
+
.history.x-hover + .history.x-hover
{
-webkit-box-shadow: 0px 2px 2px rgba(255, 255, 255, 1) !important;
diff -r 7f3f1d1664d6 -r fa3815127f10 Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/todo.txt
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/todo.txt Tue Aug 25 15:49:52 2009 -0500
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/todo.txt Wed Aug 26 17:15:42 2009 -0500
@@ -3,11 +3,9 @@
!# %sendercolor% fails in header (waiting)
!# topic needs more per-variant styling?
!# header/topic need hideIcons/showIcons styling?
+ !compact has serviceicon height failure
+ !should icn-time2 have a vertical linedown the right edge of the icon?
- !# implement some sort of action using the new class?
- !# Should classic/icon-time bubbles indent when icons are missing?
- !# Should missing icons be replaced with 32x32 sendercolor?
-
Other
# compact and history needs some way to distinguish sender from text besides bold. If the first word is bold, there it's hard to tell. For example, in IRC, I've seen "Cappuccino trac: Ticket #119..." where "Cappuccino trac" is bold.
# multiple backgrounds and multiple background sizes should be reordered from left to wright
More information about the commits
mailing list