adium 3686:38528a06b839: Stockholm: As much as I dislike setting...
commits at adium.im
commits at adium.im
Thu Feb 24 21:17:24 UTC 2011
details: http://hg.adium.im/adium/rev/38528a06b839
revision: 3686:38528a06b839
author: mathuaerknedam
date: Wed Feb 23 20:24:28 2011 -0600
Stockholm: As much as I dislike setting aside space for the timestamp and wrapping text around it for no reason that is apparent to the user unles they hover and the timestamp appears, it seems that there's no way to make the timestamp float on top without causing some other problem that doesn't have a good solution.
(transplanted from f615fb33e8f2d369f9a0cb55b828f7abc281576b)
Subject: adium 3687:8ae2aea0f3e3: minimal_mod: actions don't need a min-height unless the user has selected 'show user icons' *and* an icon is actually available.
details: http://hg.adium.im/adium/rev/8ae2aea0f3e3
revision: 3687:8ae2aea0f3e3
author: mathuaerknedam
date: Thu Feb 24 13:54:11 2011 -0600
minimal_mod: actions don't need a min-height unless the user has selected 'show user icons' *and* an icon is actually available.
(transplanted from 4573f40368fb813669c77a3809948e234cd55c66)
diffs (146 lines):
diff -r 6489b31bd796 -r 8ae2aea0f3e3 Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Incoming/Content.html
--- a/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Incoming/Content.html Thu Feb 24 14:57:42 2011 +0100
+++ b/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Incoming/Content.html Thu Feb 24 13:54:11 2011 -0600
@@ -7,7 +7,7 @@
<div class="x-sender">%sender%</div>
</div>
<div class="x-message %messageDirection%">
- <div class="x-time" title="%time{dd MMM yyyy}%" onclick="style.display='none'">%time%</div>
+ <div class="x-time" title="%time{dd MMM yyyy}%">%time%</div>
<div class="x-text">%message%</div>
</div>
<div id="insert"></div>
diff -r 6489b31bd796 -r 8ae2aea0f3e3 Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html
--- a/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html Thu Feb 24 14:57:42 2011 +0100
+++ b/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Incoming/NextContent.html Thu Feb 24 13:54:11 2011 -0600
@@ -1,5 +1,5 @@
<div class="x-message %messageClasses% %service% %userIcons% %messageDirection%">
- <div class="x-time" title="%time{dd MMM yyyy}%" onclick="style.display='none'">%time%</div>
+ <div class="x-time" title="%time{dd MMM yyyy}%">%time%</div>
<div class="x-text">%message%</div>
</div>
<div id="insert"></div>
diff -r 6489b31bd796 -r 8ae2aea0f3e3 Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Mockup.html
--- a/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Mockup.html Thu Feb 24 14:57:42 2011 +0100
+++ b/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Mockup.html Thu Feb 24 13:54:11 2011 -0600
@@ -153,6 +153,10 @@
</div>
<div class="x-message ltr mention consecutive incoming message focus AIM showIcons">
<div class="x-time">12:22 PM</div>
+ <div class="x-text">3.14 1592 6535 8979 3238 4626 4338 3279 5028 8419 7169 3993 7510 5820 9749 4459 2307 8164 0628 6208 9986 2803 4825 3421 1706 7982 1480 8651 3282 3066 4709 3844 6095 5058 2231 7253 5940 8128 4811 1745 0284 1027 0193 8521 1055 5964 4622 9489 5493 0381 9644 28810975665933446128475648233786783165271201909145648566923460348610454326648213393607260249141273724587006606315588174881520920962829254091715364367892590360011330530548820466521384146951941511609…</div>
+ </div>
+ <div class="x-message ltr mention consecutive incoming message focus AIM showIcons">
+ <div class="x-time">12:22 PM</div>
<div class="x-text">3</div>
</div>
</div>
diff -r 6489b31bd796 -r 8ae2aea0f3e3 Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/main.css
--- a/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/main.css Thu Feb 24 14:57:42 2011 +0100
+++ b/Resources/Message Styles/Stockholm.AdiumMessageStyle/Contents/Resources/Styles/main.css Thu Feb 24 13:54:11 2011 -0600
@@ -227,37 +227,46 @@
{
visibility: hidden;
font-weight: bold;
- position: absolute;
+ //position: absolute;
+ margin-top: 0px;
padding-left: 4px;
+ padding-top: 0px;
+ padding-bottom: 1px;
-webkit-border-radius: 3px;
-webkit-box-shadow: 0px 1px 4px rgba(0, 0, 0, .5);
background-color: rgba(255, 255, 255, .8);
color: rgba(16, 16, 16, .8);
font-weight: bold;
- padding-top: 0px;
- padding-bottom: 1px;
- margin-top: 0px;
}
.message:not(.focus) .x-message.ltr .x-time,
.message .x-message.ltr:not(.focus) .x-time
{
- right: 1px;
+ //right: 1px;
padding-right: 5px;
+ float: right;
+ margin-right: -8px;
+ margin-left: 4px;
}
.message.focus .x-message.ltr .x-time,
.message .x-message.focus.ltr .x-time
{
- right: 1px;
+ //right: 1px;
padding-right: 9px;
+ float: right;
+ margin-right: -8px;
+ margin-left: 4px;
}
.message .x-message.rtl .x-time
{
- left: 2px;
+ //left: 2px;
padding-left: 4px;
padding-right: 4px;
+ float: left;
+ //margin-right: -8px;
+ margin-left: -4px;
}
.x-message:hover .x-time
diff -r 6489b31bd796 -r 8ae2aea0f3e3 Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/Mockup.html
--- a/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/Mockup.html Thu Feb 24 14:57:42 2011 +0100
+++ b/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/Mockup.html Thu Feb 24 13:54:11 2011 -0600
@@ -181,6 +181,33 @@
<span class="actionMessageBody">moos.</span>
</div>
</div>
+<div class="x-container action incoming message voice showIcons" style="background-color:;" src="Incoming/buddy_icon.png">
+ <img class="x-buddyicon" src="Incoming/buddy_icon.png">
+ <div class="x-time" title="16 Feb 2011">09:28:21</div>
+ <div class="x-sender" style="color: aqua;" title="+ LuX">LuX</div>
+ <div class="x-message" title="IRC 09:28:15">
+ <span class="actionMessageUserName">mathuaerknedam</span>
+ <span class="actionMessageBody">moos.</span>
+ </div>
+</div>
+<div class="x-container action outgoing consecutive message voice showIcons" style="background-color:;" src="file:///Users/mneedham/Library/Caches/Adium/Default/d2df6b79669c518bac33aa5fbb23b54615ea6b8c.png">
+ <img class="x-buddyicon" src="file:///Users/mneedham/Library/Caches/Adium/Default/d2df6b79669c518bac33aa5fbb23b54615ea6b8c.png">
+ <div class="x-time" title="16 Feb 2011">09:28:15</div>
+ <div class="x-sender" style="color: saddlebrown;" title="+ mathuaerknedam">mathuaerknedam</div>
+ <div class="x-message" title="IRC 09:28:15">
+ <span class="actionMessageUserName">mathuaerknedam</span>
+ <span class="actionMessageBody">moos.</span>
+ </div>
+</div>
+<div class="x-container action incoming message voice hideIcons" style="background-color:;" src="Incoming/buddy_icon.png">
+ <img class="x-buddyicon" src="Incoming/buddy_icon.png">
+ <div class="x-time" title="16 Feb 2011">09:28:21</div>
+ <div class="x-sender" style="color: aqua;" title="+ LuX">LuX</div>
+ <div class="x-message" title="IRC 09:28:15">
+ <span class="actionMessageUserName">mathuaerknedam</span>
+ <span class="actionMessageBody">moos.</span>
+ </div>
+</div>
<div class="x-container action outgoing consecutive message voice showIcons" style="background-color:;" src="file:///Users/mneedham/Library/Caches/Adium/Default/d2df6b79669c518bac33aa5fbb23b54615ea6b8c.png">
<img class="x-buddyicon" src="file:///Users/mneedham/Library/Caches/Adium/Default/d2df6b79669c518bac33aa5fbb23b54615ea6b8c.png">
<div class="x-time" title="16 Feb 2011">09:28:15</div>
diff -r 6489b31bd796 -r 8ae2aea0f3e3 Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/main.css
--- a/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/main.css Thu Feb 24 14:57:42 2011 +0100
+++ b/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/main.css Thu Feb 24 13:54:11 2011 -0600
@@ -100,9 +100,9 @@
border-top: 1px dotted rgba(0, 0, 0, .2);
}
-.showIcons.x-container.message:not([src*="buddy_icon.png"]):not(.consecutive),
-.message.action + .showIcons.x-container.message.consecutive:not([src*="buddy_icon.png"]),
-.message.action
+.x-container.message.showIcons:not([src*="buddy_icon.png"]):not(.consecutive),
+.message.action + .x-container.message.consecutive.showIcons:not([src*="buddy_icon.png"]),
+.message.action.showIcons:not([src*="buddy_icon.png"])
{
min-height: 29px;
}
More information about the commits
mailing list