xtras/mathuaerknedam 294:6b3b8e2885fc: Stockholm: fix mention +f...
commits at adium.im
commits at adium.im
Tue Dec 8 18:20:08 UTC 2009
details: http://hg.adium.im/xtras/mathuaerknedam/rev/6b3b8e2885fc
revision: 294:6b3b8e2885fc
author: mathuaerknedam
date: Tue Dec 08 12:20:03 2009 -0600
Stockholm: fix mention +focus in updated variants.
diffs (257 lines):
diff -r 67a7a566e86c -r 6b3b8e2885fc Stockholm ☿.AdiumMessageStyle/Contents/Resources/Mockup.html
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Mockup.html Tue Dec 08 12:03:41 2009 -0600
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Mockup.html Tue Dec 08 12:20:03 2009 -0600
@@ -6,7 +6,7 @@
<style type="text/css">
@import url( "./Main.css" );
- @import url( "./Variants/Alt Blue - Green - Plus.css" );
+ @import url( "./Variants/Alt green - blue.css" );
</style>
</head>
@@ -110,7 +110,46 @@
<HR>
-INCOMING CONTENT MENTION (no icon)
+INCOMING CONTENT MENTION FOCUS (no icon)
+
+<HR>
+
+<div class="x-container mention focus incoming message voice">
+ <div class="x-iconsubstitute" background="Incoming/buddy_icon.png">
+ <div class="x-contents_left">
+ <img class="x-buddyicon" src="Incoming/buddy_icon.png">
+ <div class="x-iconoverlay"></div>
+ </div>
+ </div>
+ <div class="x-contents_right" background="Incoming/buddy_icon.png">
+ <div class="x-message_top">
+ <div class="x-header">
+ <div class="x-incomingheader_left"></div>
+ <div class="x-incomingheader_center">
+ <div class="x-sender">LuX</div>
+ <div class="x-time">8:34 AM</div>
+ </div>
+ <div class="x-incomingheader_right"></div>
+ </div>
+ <div class="x-message">
+ <div class="x-message_left"></div>
+ <div class="x-message_right"></div>
+ <div class="x-text">
+ <p> (__) </p>
+ </div>
+ </div>
+ </div>
+ <div class="x-message_bottom">
+ <div class="x-message_bottomleft"></div>
+ <div class="x-message_bottomcenter"></div>
+ <div class="x-message_bottomright"></div>
+ </div>
+ </div>
+ </div>
+
+<HR>
+
+INCOMING CONTENT (no icon)
<HR>
@@ -149,6 +188,10 @@
<HR>
+INCOMING CONTENT MENTION (no icon)
+
+<HR>
+
<div class="x-container mention incoming message voice">
<div class="x-iconsubstitute" background="Incoming/buddy_icon.png">
<div class="x-contents_left">
diff -r 67a7a566e86c -r 6b3b8e2885fc Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Blue - Green.css
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Blue - Green.css Tue Dec 08 12:03:41 2009 -0600
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Blue - Green.css Tue Dec 08 12:20:03 2009 -0600
@@ -120,7 +120,7 @@
color: white;
}
-.focus:not(.history) .x-contents_right .x-message_top
+.focus:not(.history):not(.mention) .x-contents_right .x-message_top
{
background:
-webkit-gradient(linear, left top, left bottom, from(rgba(202, 202, 202, 1)), to(rgba(187, 187, 187, 1))) right bottom no-repeat,
@@ -150,7 +150,7 @@
-webkit-border-bottom-right-radius: 5px;
}
-.focus:not(.history) .x-outgoing_right .x-message_top
+.focus:not(.history):not(.mention) .x-outgoing_right .x-message_top
{
background:
-webkit-gradient(linear, left top, left bottom, from(rgba(202, 202, 202, 1)), to(rgba(187, 187, 187, 1))) left bottom no-repeat,
@@ -180,7 +180,7 @@
-webkit-border-bottom-left-radius: 5px;
}
-.focus:not(.history) .x-message_top
+.focus:not(.history):not(.mention) .x-message_top
{
-webkit-background-size:
2px 3px,
@@ -258,21 +258,21 @@
.mention .x-message_bottomright,
.mention .x-header_ctx_left,
.mention .x-header_ctx_right,
-.focus:not(.history) .x-incomingheader_left,
-.focus:not(.history) .x-incomingheader_right,
-.focus:not(.history) .x-outgoingheader_left,
-.focus:not(.history) .x-outgoingheader_right,
-.focus:not(.history) .x-outgoingmessage_right,
-.focus:not(.history) .x-outgoingmessage_left,
-.focus:not(.history) .x-outgoingmessage_bottomleft,
-.focus:not(.history) .x-outgoingmessage_bottomright,
-.focus:not(.history) .x-outgoingmessage_bottomcenter,
-.focus:not(.history) .x-message_left,
-.focus:not(.history) .x-message_right,
-.focus:not(.history) .x-message_bottom,
-.focus:not(.history) .x-message_bottomleft,
-.focus:not(.history) .x-message_bottomcenter,
-.focus:not(.history) .x-message_bottomright
+.focus:not(.history):not(.mention) .x-incomingheader_left,
+.focus:not(.history):not(.mention) .x-incomingheader_right,
+.focus:not(.history):not(.mention) .x-outgoingheader_left,
+.focus:not(.history):not(.mention) .x-outgoingheader_right,
+.focus:not(.history):not(.mention) .x-outgoingmessage_right,
+.focus:not(.history):not(.mention) .x-outgoingmessage_left,
+.focus:not(.history):not(.mention) .x-outgoingmessage_bottomleft,
+.focus:not(.history):not(.mention) .x-outgoingmessage_bottomright,
+.focus:not(.history):not(.mention) .x-outgoingmessage_bottomcenter,
+.focus:not(.history):not(.mention) .x-message_left,
+.focus:not(.history):not(.mention) .x-message_right,
+.focus:not(.history):not(.mention) .x-message_bottom,
+.focus:not(.history):not(.mention) .x-message_bottomleft,
+.focus:not(.history):not(.mention) .x-message_bottomcenter,
+.focus:not(.history):not(.mention) .x-message_bottomright
{
display: none;
}
@@ -281,10 +281,10 @@
.mention .x-header_ctx_center,
.mention .x-incomingheader_center,
.mention .x-message,
-.focus:not(.history) .x-incomingheader_center,
-.focus:not(.history) .x-outgoingheader_center,
-.focus:not(.history) .x-header_center,
-.focus:not(.history) .x-message
+.focus:not(.history):not(.mention) .x-incomingheader_center,
+.focus:not(.history):not(.mention) .x-outgoingheader_center,
+.focus:not(.history):not(.mention) .x-header_center,
+.focus:not(.history):not(.mention) .x-message
{
background: none;
}
@@ -310,8 +310,8 @@
border-top: 1px solid rgba(255, 255, 255, .2);
}
-.focus:not(.history) .x-sender,
-.focus:not(.history) .x-time
+.focus:not(.history):not(.mention) .x-sender,
+.focus:not(.history):not(.mention) .x-time
{
text-shadow: none;
margin-top: 2px;
diff -r 67a7a566e86c -r 6b3b8e2885fc Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Green - Blue.css
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Green - Blue.css Tue Dec 08 12:03:41 2009 -0600
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/Variants/Alt Green - Blue.css Tue Dec 08 12:20:03 2009 -0600
@@ -120,7 +120,7 @@
color: white;
}
-.focus:not(.history) .x-contents_right .x-message_top
+.focus:not(.history):not(.mention) .x-contents_right .x-message_top
{
background:
-webkit-gradient(linear, left top, left bottom, from(rgba(202, 202, 202, 1)), to(rgba(187, 187, 187, 1))) right bottom no-repeat,
@@ -150,7 +150,7 @@
-webkit-border-bottom-right-radius: 5px;
}
-.focus:not(.history) .x-outgoing_right .x-message_top
+.focus:not(.history):not(.mention) .x-outgoing_right .x-message_top
{
background:
-webkit-gradient(linear, left top, left bottom, from(rgba(202, 202, 202, 1)), to(rgba(187, 187, 187, 1))) left bottom no-repeat,
@@ -180,7 +180,7 @@
-webkit-border-bottom-left-radius: 5px;
}
-.focus:not(.history) .x-message_top
+.focus:not(.history):not(.mention) .x-message_top
{
-webkit-background-size:
2px 3px,
@@ -258,21 +258,21 @@
.mention .x-message_bottomright,
.mention .x-header_ctx_left,
.mention .x-header_ctx_right,
-.focus:not(.history) .x-incomingheader_left,
-.focus:not(.history) .x-incomingheader_right,
-.focus:not(.history) .x-outgoingheader_left,
-.focus:not(.history) .x-outgoingheader_right,
-.focus:not(.history) .x-outgoingmessage_right,
-.focus:not(.history) .x-outgoingmessage_left,
-.focus:not(.history) .x-outgoingmessage_bottomleft,
-.focus:not(.history) .x-outgoingmessage_bottomright,
-.focus:not(.history) .x-outgoingmessage_bottomcenter,
-.focus:not(.history) .x-message_left,
-.focus:not(.history) .x-message_right,
-.focus:not(.history) .x-message_bottom,
-.focus:not(.history) .x-message_bottomleft,
-.focus:not(.history) .x-message_bottomcenter,
-.focus:not(.history) .x-message_bottomright
+.focus:not(.history):not(.mention) .x-incomingheader_left,
+.focus:not(.history):not(.mention) .x-incomingheader_right,
+.focus:not(.history):not(.mention) .x-outgoingheader_left,
+.focus:not(.history):not(.mention) .x-outgoingheader_right,
+.focus:not(.history):not(.mention) .x-outgoingmessage_right,
+.focus:not(.history):not(.mention) .x-outgoingmessage_left,
+.focus:not(.history):not(.mention) .x-outgoingmessage_bottomleft,
+.focus:not(.history):not(.mention) .x-outgoingmessage_bottomright,
+.focus:not(.history):not(.mention) .x-outgoingmessage_bottomcenter,
+.focus:not(.history):not(.mention) .x-message_left,
+.focus:not(.history):not(.mention) .x-message_right,
+.focus:not(.history):not(.mention) .x-message_bottom,
+.focus:not(.history):not(.mention) .x-message_bottomleft,
+.focus:not(.history):not(.mention) .x-message_bottomcenter,
+.focus:not(.history):not(.mention) .x-message_bottomright
{
display: none;
}
@@ -281,10 +281,10 @@
.mention .x-header_ctx_center,
.mention .x-incomingheader_center,
.mention .x-message,
-.focus:not(.history) .x-incomingheader_center,
-.focus:not(.history) .x-outgoingheader_center,
-.focus:not(.history) .x-header_center,
-.focus:not(.history) .x-message
+.focus:not(.history):not(.mention) .x-incomingheader_center,
+.focus:not(.history):not(.mention) .x-outgoingheader_center,
+.focus:not(.history):not(.mention) .x-header_center,
+.focus:not(.history):not(.mention) .x-message
{
background: none;
}
@@ -310,8 +310,8 @@
border-top: 1px solid rgba(255, 255, 255, .2);
}
-.focus:not(.history) .x-sender,
-.focus:not(.history) .x-time
+.focus:not(.history):not(.mention) .x-sender,
+.focus:not(.history):not(.mention) .x-time
{
text-shadow: none;
margin-top: 2px;
More information about the commits
mailing list