adium 3664:97eae82200e4: Smooth Operator: Tweak the header toggl...
commits at adium.im
commits at adium.im
Thu Feb 17 22:23:13 UTC 2011
details: http://hg.adium.im/adium/rev/97eae82200e4
revision: 3664:97eae82200e4
author: mathuaerknedam
date: Tue Feb 15 18:55:41 2011 -0600
Smooth Operator: Tweak the header toggle button in the Dark variant.
(transplanted from 2bafabd36d12c81155f354ce32162821321e2e5f)
Subject: adium 3665:3d50eb4c8083: minimal_mod: create basic mockup file.
details: http://hg.adium.im/adium/rev/3d50eb4c8083
revision: 3665:3d50eb4c8083
author: mathuaerknedam
date: Wed Feb 16 12:22:39 2011 -0600
minimal_mod: create basic mockup file.
(transplanted from d8bca25a0ed08f2ef7c29acf0e50d39877427161)
Subject: adium 3666:5b1d53041b60: minimal_mod: fix text wrap alignment issues on actions.
details: http://hg.adium.im/adium/rev/5b1d53041b60
revision: 3666:5b1d53041b60
author: mathuaerknedam
date: Wed Feb 16 08:46:17 2011 -0600
minimal_mod: fix text wrap alignment issues on actions.
(transplanted from 1870fe7332e457cd2c5a928644e1ac97723ba2ae)
Subject: adium 3667:c4d67ecd95e2: minimal_mod: disable consecutivization of actions so that we don't end up with overlapping icons (if we don't force a min-height) or with gaps between actions and consecutivized messages (if we do force a min-height).
details: http://hg.adium.im/adium/rev/c4d67ecd95e2
revision: 3667:c4d67ecd95e2
author: mathuaerknedam
date: Wed Feb 16 12:27:13 2011 -0600
minimal_mod: disable consecutivization of actions so that we don't end up with overlapping icons (if we don't force a min-height) or with gaps between actions and consecutivized messages (if we do force a min-height).
(transplanted from 81fdeebe7f60a5d46e905df09bde1346d2b67dde)
Subject: adium 3668:de2988cbfbb0: minimal_mod: All actions shold have a min-height, not just consecutive actions.
details: http://hg.adium.im/adium/rev/de2988cbfbb0
revision: 3668:de2988cbfbb0
author: mathuaerknedam
date: Thu Feb 17 16:10:59 2011 -0600
minimal_mod: All actions shold have a min-height, not just consecutive actions.
(transplanted from 1244043e49e91479bb2cb96ff22d8f2a4c22eb3a)
diffs (322 lines):
diff -r ffae91fa6b57 -r de2988cbfbb0 Resources/Message Styles/Smooth Operator.AdiumMessageStyle/Contents/Resources/Variants/Dark.css
--- a/Resources/Message Styles/Smooth Operator.AdiumMessageStyle/Contents/Resources/Variants/Dark.css Thu Feb 17 21:56:45 2011 +0100
+++ b/Resources/Message Styles/Smooth Operator.AdiumMessageStyle/Contents/Resources/Variants/Dark.css Thu Feb 17 16:10:59 2011 -0600
@@ -721,7 +721,7 @@
.x-toggle
{
background:
- -webkit-gradient(linear, left top, left bottom, from(rgba(160, 160, 160, 1)), to(rgba(144, 144, 144, 1))) 0px 0px no-repeat !important;
+ -webkit-gradient(linear, left top, left bottom, from(rgba(224, 224, 224, 1)), color-stop( .4, rgba(208, 208, 208, 1)), color-stop( .6, rgba(160, 160, 160, 1)), to(rgba(128, 128, 128, 1))) 0px 0px no-repeat !important;
-webkit-box-shadow: 0px -1px 1px rgba(255, 255, 255, .6), 0px 4px 16px rgba(0, 0, 0, .5) !important;
color: rgba(64, 64, 64, 1) !important;
}
@@ -729,5 +729,5 @@
.x-toggle:active
{
background:
- -webkit-gradient(linear, left top, left bottom, from(rgba(144, 144, 144, 1)), to(rgba(160, 160, 160, 1))) 0px 0px no-repeat !important;
+ -webkit-gradient(linear, left top, left bottom, from(rgba(208, 208, 208, 1)), to(rgba(160, 160, 160, 1))) 0px 0px no-repeat !important;
}
diff -r ffae91fa6b57 -r de2988cbfbb0 Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/Mockup.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/Mockup.html Thu Feb 17 16:10:59 2011 -0600
@@ -0,0 +1,199 @@
+<html>
+
+<head>
+ <title>
+ minimal_mod message style mockup
+ </title>
+
+ <style type="text/css" media="screen,print">
+ @import url( "./main.css" );
+ @import url( "./Variants/SenderColor.css" );
+
+ body
+ {
+ font: 7.5pt "Lucida Grande" !important;
+ border-bottom: 1px solid yellow !important;
+ }
+
+ </style>
+</head>
+
+<body onload="initStyle();" style="">
+
+<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>
+ <div id="x-header">
+ <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>
+
+<div id="Chat" style="top: 438px; position: static; " class=" groupchat">
+<div class="x-container history date_separator event showIcons" style="background-color:%textbackgroundcolor{.75}%;" src="Incoming/buddy_icon.png">
+ <img class="x-buddyicon" src="Incoming/buddy_icon.png">
+ <div class="x-time" title="18 May 2010">08:46:43</div>
+ <div class="x-sender" style="color: aqua;" title=" "></div>
+ <div class="x-message" title="Jabber 08:46:43">Tuesday, May 18, 2010</div>
+</div>
+<div class="x-container incoming message history showIcons" style="background-color:;" src="Incoming/buddy_icon.png">
+ <img class="x-buddyicon" src="Incoming/buddy_icon.png">
+ <div class="x-time" title="18 May 2010">08:46:43</div>
+ <div class="x-sender" style="color: indigo;" title=" Zemfira">Zemfira</div>
+ <div class="x-message" title="Jabber 08:46:43">Lёlya*: привет *CHERRY* </div>
+</div>
+<div class="x-container date_separator event showIcons" style="background-color:%textbackgroundcolor{.75}%;" src="Incoming/buddy_icon.png">
+ <img class="x-buddyicon" src="Incoming/buddy_icon.png">
+ <div class="x-time" title="16 Feb 2011">09:28:05</div>
+ <div class="x-sender" style="color: aqua;" title=" "></div>
+ <div class="x-message" title="IRC 09:28:05">Wednesday, February 16, 2011</div>
+</div>
+<div class="x-container purple event showIcons" style="background-color:%textbackgroundcolor{.75}%;" src="Incoming/buddy_icon.png">
+ <img class="x-buddyicon" src="Incoming/buddy_icon.png">
+ <div class="x-time" title="16 Feb 2011">09:28:05</div>
+ <div class="x-sender" style="color: aqua;" title=" "></div>
+ <div class="x-message" title="IRC 09:28:05">The topic for <a href="irc://irc.freenode.net:6667/#test" title="irc://irc.freenode.net:6667/#test">#test</a> is: Welcome to freenode's test channel | Note: This is NOT <a href="irc://irc.freenode.net:6667/#flood" title="irc://irc.freenode.net:6667/#flood">#flood</a>! Be nice, do NOT spam and do NOT paste senseless crap here. Try to be nice and helpful. If you need a response for a test, type '#say foobar' or '#moo' and '#test' for query tests. Test your bot in channel <a href="irc://irc.freenode.net:6667/#botwar" title="irc://irc.freenode.net:6667/#botwar">#botwar</a>.</div>
+</div>
+<div class="x-container consecutive purple event showIcons" style="background-color:%textbackgroundcolor{.75}%;" src="Incoming/buddy_icon.png">
+ <img class="x-buddyicon" src="Incoming/buddy_icon.png">
+ <div class="x-time" title="16 Feb 2011">09:28:05</div>
+ <div class="x-sender" style="color: aqua;" title=" "></div>
+ <div class="x-message" title="IRC 09:28:05">mode (+v mathuaerknedam) by ChanServ</div>
+</div>
+<div class="x-container action outgoing 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 and moos and moos and moos and moos and moos and moos and moos and moos and moos and moos and moos and moos.</span>
+ </div>
+</div>
+<div class="x-container consecutive outgoing 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:18</div>
+ <div class="x-sender" style="color: saddlebrown;" title="+ mathuaerknedam">mathuaerknedam</div>
+ <div class="x-message" title="IRC 09:28:18">moo</div>
+</div>
+<div class="x-container consecutive outgoing 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:21</div>
+ <div class="x-sender" style="color: saddlebrown;" title="+ mathuaerknedam">mathuaerknedam</div>
+ <div class="x-message" title="IRC 09:28:21"><a href="irc://irc.freenode.net:6667/#moo" title="irc://irc.freenode.net:6667/#moo">#moo</a></div>
+</div>
+<div class="x-container 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:21"> (__) </div>
+</div>
+<div class="x-container action outgoing 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 mention 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:24</div>
+ <div class="x-sender" style="color: aqua;" title="+ LuX">LuX</div>
+ <div class="x-message" title="IRC 09:28:24"> (oo) </div>
+</div>
+<div class="x-container action outgoing 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 consecutive outgoing 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:18</div>
+ <div class="x-sender" style="color: saddlebrown;" title="+ mathuaerknedam">mathuaerknedam</div>
+ <div class="x-message" title="IRC 09:28:18">moo</div>
+</div>
+<div class="x-container 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:27</div>
+ <div class="x-sender" style="color: aqua;" title="+ LuX">LuX</div>
+ <div class="x-message" title="IRC 09:28:27"> /------\/ </div>
+</div>
+<div class="x-container consecutive 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:30</div>
+ <div class="x-sender" style="color: aqua;" title="+ LuX">LuX</div>
+ <div class="x-message" title="IRC 09:28:30"> / | || </div>
+</div>
+<div class="x-container consecutive 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:33</div>
+ <div class="x-sender" style="color: aqua;" title="+ LuX">LuX</div>
+ <div class="x-message" title="IRC 09:28:33"> * /\---/\ </div>
+</div>
+<div class="x-container consecutive 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:36</div>
+ <div class="x-sender" style="color: aqua;" title="+ LuX">LuX</div>
+ <div class="x-message" title="IRC 09:28:36"> ~~ ~~ </div>
+</div>
+<div class="x-container consecutive 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:39</div>
+ <div class="x-sender" style="color: aqua;" title="+ LuX">LuX</div>
+ <div class="x-message" title="IRC 09:28:39">...."Have you mooed today?"...</div>
+</div>
+<div class="x-container outgoing 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:48</div>
+ <div class="x-sender" style="color: saddlebrown;" title="+ mathuaerknedam">mathuaerknedam</div>
+ <div class="x-message" title="IRC 09:28:48">moo.</div>
+</div>
+<div class="x-container consecutive action outgoing 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:54</div>
+ <div class="x-sender" style="color: saddlebrown;" title="+ mathuaerknedam">mathuaerknedam</div>
+ <div class="x-message" title="IRC 09:28:54">
+ <span class="actionMessageUserName">mathuaerknedam</span>
+ <span class="actionMessageBody">moos and moos and moos and moos and moos and moos and moos and moos and moos and moos and moos and moos and moos and moos again.</span>
+ </div>
+</div>
+
+<div class="x-container action outgoing 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 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 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 id="insert"></div>
+</div>
+
+</body>
+</html>
diff -r ffae91fa6b57 -r de2988cbfbb0 Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/main.css
--- a/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/main.css Thu Feb 17 21:56:45 2011 +0100
+++ b/Resources/Message Styles/minimal_mod.AdiumMessageStyle/Contents/Resources/main.css Thu Feb 17 16:10:59 2011 -0600
@@ -92,12 +92,21 @@
border-bottom: 1px solid;
}
-.x-container:not(.consecutive)
+.x-container:not(.consecutive),
+.message.action + .x-container.consecutive,
+.message.action
{
padding-top: 4px;
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
+{
+ min-height: 29px;
+}
+
.x-container
{
padding-left: 16px;
@@ -105,17 +114,18 @@
padding-bottom: 2px;
}
-.message:not(.consecutive) .x-message
+.message:not(.consecutive) .x-message,
+.message.action + .message.consecutive .x-message
{
padding-top: 4px;
}
-.message.consecutive .x-message
+.message:not(.action) + .message.consecutive:not(.action) .x-message
{
padding-top: 2px;
}
-.consecutive.message.showIcons img[src*="buddy_icon.png"] + .x-message
+.message:not(.action) + .consecutive.message.showIcons:not(.action) img[src*="buddy_icon.png"] + .x-message
{
margin-left: 30px;
}
@@ -155,6 +165,7 @@
img.x-buddyicon
{
position: absolute;
+ left: 16px;
margin-top: 2px;
margin-right: 6px;
padding-bottom: 8px;
@@ -233,7 +244,8 @@
background: url("./images/vert.png") repeat;
}
-.focus:not(.consecutive)
+.focus:not(.consecutive),
+.message.action + .focus.consecutive
{
border-top: none !important;
margin-top: 1px;
@@ -268,9 +280,9 @@
.status .x-sender,
.event .x-buddyicon,
.event .x-sender,
-.consecutive .x-buddyicon,
-.consecutive .x-sender,
-.consecutive .x-time,
+.message:not(.action) + .consecutive:not(.action) .x-buddyicon,
+.message:not(.action) + .consecutive:not(.action) .x-sender,
+.message:not(.action) + .consecutive:not(.action) .x-time,
img[src*="buddy_icon.png"]
{
display: none;
@@ -279,15 +291,16 @@
/* ACTION */
+.showIcons.x-container.action:not([src*="buddy_icon.png"])
+{
+ padding-left: 46px;
+}
+
.action .x-sender,
.action .x-message
{
display: inline;
font-style: italic !important;
-}
-
-.action .x-message
-{
margin-left: 0px !important;
}
More information about the commits
mailing list