xtras/mathuaerknedam 49:43580a20b447: topic/header/mockup tweaks.
commits at adium.im
commits at adium.im
Tue Jun 9 21:39:19 UTC 2009
details: http://hg.adium.im/xtras/mathuaerknedam/rev/43580a20b447
revision: 49:43580a20b447
author: mathuaerknedam
date: Tue Jun 09 13:16:18 2009 -0500
topic/header/mockup tweaks.
Subject: xtras/mathuaerknedam 50:15c8a7381bdf: Fix sender/message/time getting aligned at the bottom of embedded DC images.
details: http://hg.adium.im/xtras/mathuaerknedam/rev/15c8a7381bdf
revision: 50:15c8a7381bdf
author: mathuaerknedam
date: Tue Jun 09 13:17:47 2009 -0500
Fix sender/message/time getting aligned at the bottom of embedded DC images.
Subject: xtras/mathuaerknedam 51:948de7a37d7e: Experimental change assigning consistent unique sendercolor to outgoing messages in XtraColor variants (white in Saturnine, black in Mercurial).
details: http://hg.adium.im/xtras/mathuaerknedam/rev/948de7a37d7e
revision: 51:948de7a37d7e
author: mathuaerknedam
date: Tue Jun 09 13:20:05 2009 -0500
Experimental change assigning consistent unique sendercolor to outgoing messages in XtraColor variants (white in Saturnine, black in Mercurial).
Subject: xtras/mathuaerknedam 52:f400da192501: Fix placement of css.
details: http://hg.adium.im/xtras/mathuaerknedam/rev/f400da192501
revision: 52:f400da192501
author: mathuaerknedam
date: Tue Jun 09 14:17:38 2009 -0500
Fix placement of css.
diffs (253 lines):
diff -r a05d3f548f70 -r f400da192501 yMous.AdiumMessageStyle/Contents/Resources/Header.css
--- a/yMous.AdiumMessageStyle/Contents/Resources/Header.css Fri Jun 05 09:50:14 2009 -0500
+++ b/yMous.AdiumMessageStyle/Contents/Resources/Header.css Tue Jun 09 14:17:38 2009 -0500
@@ -1,4 +1,5 @@
-
+@charset "utf-8";
+
.xxxhead
{
padding-bottom: 8px;
diff -r a05d3f548f70 -r f400da192501 yMous.AdiumMessageStyle/Contents/Resources/Header.html
--- a/yMous.AdiumMessageStyle/Contents/Resources/Header.html Fri Jun 05 09:50:14 2009 -0500
+++ b/yMous.AdiumMessageStyle/Contents/Resources/Header.html Tue Jun 09 14:17:38 2009 -0500
@@ -1,8 +1,3 @@
-<style id="mainStyle" type="text/css" media="screen,print">
+<style type="text/css">
@import url( "./Header.css" );
-
- .status:not(.date_separator):not(.purple)
- {
- display: none;
- }
</style>
diff -r a05d3f548f70 -r f400da192501 yMous.AdiumMessageStyle/Contents/Resources/Mockup.html
--- a/yMous.AdiumMessageStyle/Contents/Resources/Mockup.html Fri Jun 05 09:50:14 2009 -0500
+++ b/yMous.AdiumMessageStyle/Contents/Resources/Mockup.html Tue Jun 09 14:17:38 2009 -0500
@@ -6,8 +6,8 @@
yMous messagestyle sample
</title>
- <style type="text/css" media="screen,print">
- @import url( "./Variants/Saturnine Both.css" );
+ <style type="text/css">
+ @import url( "./Variants/Mercurial Both.css" );
body
{
@@ -39,10 +39,10 @@
<script type="text/ecmascript" defer="defer" encoding="utf-8" src="./roomTopicBanner.js"></script>
<style type="text/css">
- @import url(./Topic.css);
+ @import url( "./Topic.css" );
</style>
- <div id="toggleButton" onclick="toggleTopic( event )" style="display: block"></div>
+ <span id="toggleButton" style="display: block;" onclick="toggleTopic( event )"></span>
<span id="topicEdit" ondblclick="this.setAttribute('contentEditable', true); this.focus();">Adium development channel. For user help, go to <a href="irc://irc.freenode.net/#adium" title="irc://irc.freenode.net/#adium">#adium</a>. | 1.4b6: <a href="http://beta.adium.im" title="http://beta.adium.im">http://beta.adium.im</a> | 1.4hg nightly: <a href="http://nightly.adium.im" title="http://nightly.adium.im">http://nightly.adium.im</a></span>
</div>
@@ -59,7 +59,7 @@
<div class="xxxwrapper history outgoing message TekJew">
<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="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>
<span class="xxxtime">12:45:48</span>
</div>
@@ -67,7 +67,7 @@
<div class="xxxwrapper history incoming message fetchgreebledonx">
<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="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>
<span class="xxxtime">12:46:07</span>
</div>
@@ -75,7 +75,7 @@
<div class="xxxwrapper history consecutive incoming message fetchgreebledonx">
<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="xxxmark" style="background-color: blue; color: blue;">‣</span>
<span class="xxxmessage" title="AIM · Jeff · 12:46:32">So what happens next?</span>
<span class="xxxtime">12:46:32</span>
</div>
@@ -83,7 +83,7 @@
<div class="xxxwrapper outgoing message TekJew">
<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="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>
<span class="xxxtime">12:46:50</span>
</div>
@@ -91,7 +91,7 @@
<div class="mention xxxwrapper consecutive outgoing message TekJew">
<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="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>
<span class="xxxtime">12:47:00</span>
</div>
@@ -99,7 +99,7 @@
<div class="xxxwrapper incoming message fetchgreebledonx">
<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="xxxmark" style="background-color: blue; color: blue;">‣</span>
<span class="xxxmessage" title="AIM · Jeff · 12:47:06">…thus negating all existence!</span>
<span class="xxxtime">12:47:06</span>
</div>
@@ -107,7 +107,7 @@
<div class="xxxwrapper outgoing message TekJew">
<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="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>
<span class="xxxtime">12:47:51</span>
</div>
@@ -131,7 +131,7 @@
<div class="xxxwrapper incoming message auto_reply fetchgreebledonx">
<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="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>
<span class="xxxtime">12:47:51</span>
</div>
@@ -139,7 +139,7 @@
<div class="xxxwrapper outgoing message TekJew">
<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="xxxmark" style="background-color: seagreen; color: seagreen;">‣</span>
<span class="xxxmessage" title="AIM · Evan · 12:48:02">Gotta run; catch ya later ;)</span>
<span class="xxxtime">12:48:02</span>
</div>
diff -r a05d3f548f70 -r f400da192501 yMous.AdiumMessageStyle/Contents/Resources/Topic.css
--- a/yMous.AdiumMessageStyle/Contents/Resources/Topic.css Fri Jun 05 09:50:14 2009 -0500
+++ b/yMous.AdiumMessageStyle/Contents/Resources/Topic.css Tue Jun 09 14:17:38 2009 -0500
@@ -11,6 +11,7 @@
width: 100%;
z-index: 999;
display: table-row;
+ -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, .2);
}
#topicEdit
diff -r a05d3f548f70 -r f400da192501 yMous.AdiumMessageStyle/Contents/Resources/Topic.html
--- a/yMous.AdiumMessageStyle/Contents/Resources/Topic.html Fri Jun 05 09:50:14 2009 -0500
+++ b/yMous.AdiumMessageStyle/Contents/Resources/Topic.html Tue Jun 09 14:17:38 2009 -0500
@@ -1,9 +1,9 @@
<script type="text/ecmascript" defer="defer" encoding="utf-8" src="./roomTopicBanner.js"></script>
<style type="text/css">
- @import url(./Topic.css);
+ @import url( "./Topic.css" );
</style>
-<div id="toggleButton" onclick="toggleTopic( event )" style="display: none"></div>
+<span id="toggleButton" style="display: none;" onclick="toggleTopic( event )"></span>
%topic%
diff -r a05d3f548f70 -r f400da192501 yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_Base.css
--- a/yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_Base.css Fri Jun 05 09:50:14 2009 -0500
+++ b/yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_Base.css Tue Jun 09 14:17:38 2009 -0500
@@ -8,6 +8,7 @@
font-weight: normal !important;
//border-bottom: 1px solid green !important;
//text-decoration: line-through !important;
+ vertical-align: text-top;
}
body
diff -r a05d3f548f70 -r f400da192501 yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorM.css
--- a/yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorM.css Fri Jun 05 09:50:14 2009 -0500
+++ b/yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorM.css Tue Jun 09 14:17:38 2009 -0500
@@ -25,6 +25,18 @@
color: hsla(0, 0%, 60%, .8);
}
+.groupchat .outgoing:not(.xxxhover):not(:hover) .xxxmark
+{
+ background-color: hsla(0, 0%, 0%, 1) !important;
+ color: hsla(0, 0%, 0%, 1) !important;
+}
+
+.groupchat .outgoing:hover .xxxmark,
+.groupchat .outgoing.xxxhover .xxxmark
+{
+ color: hsla(0, 0%, 0%, 1) !important;
+}
+
.status .xxxmark,
.event .xxxmark
{
@@ -60,7 +72,6 @@
.status.history.xxxhover .xxxmark,
.event.history.xxxhover .xxxmark
{
- //background-color: hsla(0, 0%, 80%, 1);
color: hsla(0, 0%, 45%, 1) !important;
}
diff -r a05d3f548f70 -r f400da192501 yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorS.css
--- a/yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorS.css Fri Jun 05 09:50:14 2009 -0500
+++ b/yMous.AdiumMessageStyle/Contents/Resources/Variants/_Themes/_XtraColorS.css Tue Jun 09 14:17:38 2009 -0500
@@ -25,6 +25,18 @@
color: hsla(0, 0%, 40%, .8);
}
+.groupchat .outgoing:not(.xxxhover):not(:hover) .xxxmark
+{
+ background-color: hsla(0, 0%, 100%, 1) !important;
+ color: hsla(0, 0%, 100%, 1) !important;
+}
+
+.groupchat .outgoing:hover .xxxmark,
+.groupchat .outgoing.xxxhover .xxxmark
+{
+ color: hsla(0, 0%, 100%, 1) !important;
+}
+
.status .xxxmark,
.event .xxxmark
{
@@ -48,8 +60,8 @@
color: hsla(0, 0%, 65%, 1) !important;
}
-.history.status .xxxmark,
-.history.event .xxxmark
+.status.history .xxxmark,
+.event.history .xxxmark
{
background-color: hsla(0, 0%, 12.5%, 1) !important;
color: hsla(0, 0%, 12.5%, 1) !important;
@@ -60,7 +72,6 @@
.status.history.xxxhover .xxxmark,
.event.history.xxxhover .xxxmark
{
- //background-color: hsla(0, 0%, 20%, 1);
color: hsla(0, 0%, 55%, 1) !important;
}
diff -r a05d3f548f70 -r f400da192501 yMous.AdiumMessageStyle/Contents/Resources/roomTopicBanner.js
--- a/yMous.AdiumMessageStyle/Contents/Resources/roomTopicBanner.js Fri Jun 05 09:50:14 2009 -0500
+++ b/yMous.AdiumMessageStyle/Contents/Resources/roomTopicBanner.js Tue Jun 09 14:17:38 2009 -0500
@@ -1,8 +1,8 @@
var topicSize = 0;
var topicToggled = false;
-function toggleTopic( e ) {
- if( e && e.altKey ) {
+function toggleTopic( event ) {
+ if( event && event.altKey ) {
topicSize++;
if( topicSize > 6 ) topicSize = 0;
topicAreaSize = ( ! topicSize ? 17 : ( topicSize == 1 ? 32 : ( topicSize == 2 ? 47 : ( topicSize == 3 ? 62 : ( topicSize == 4 ? 77 : ( topicSize == 5 ? 92 : 107 ) ) ) ) ) );
More information about the commits
mailing list