xtras/mathuaerknedam 493:8aebad65befa: SO: Compact variant, grou...

commits at adium.im commits at adium.im
Tue May 18 02:20:23 UTC 2010


details:	http://hg.adium.im/xtras/mathuaerknedam/rev/8aebad65befa
revision:	493:8aebad65befa
author:		mathuaerknedam
date:		Mon May 17 21:20:12 2010 -0500

SO: Compact variant, groupchat: the user icon now defaults to displaying above the topic, but hovering over the topic will temporarily raise it above the icon.

diffs (173 lines):

diff -r ccfd2260f122 -r 8aebad65befa Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Header.css
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Header.css	Thu May 13 23:52:50 2010 -0500
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Header.css	Mon May 17 21:20:12 2010 -0500
@@ -162,13 +162,11 @@
 	left: 4px;
 	width: 16px;
 	height: 16px;
-	z-index: 10;
 	cursor: default;
 	font-size: 21px !important;
 	font-family: "Apple Symbols";
 	z-index: 999;
 	cursor: pointer;
-	-webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, .2);
 	opacity: 0;
 	-webkit-transition: opacity .4s linear;
 
@@ -209,7 +207,6 @@
 
 #x-hide:active:before
 {
-	content: "\2297";
 	content: "\2299";
 }
 
@@ -228,6 +225,5 @@
 
 #x-show:active:before
 {
-	content: "\2297";
 	content: "\2299";
 }
diff -r ccfd2260f122 -r 8aebad65befa Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Mockup-SpecialCases.html
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Mockup-SpecialCases.html	Thu May 13 23:52:50 2010 -0500
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Mockup-SpecialCases.html	Mon May 17 21:20:12 2010 -0500
@@ -7,7 +7,7 @@
 	</title>
 
 	<style type="text/css">
-		@import url( "./Variants/Classic.css" );
+		@import url( "./Variants/Compact.css" );
 
 		body
 		{
@@ -24,6 +24,7 @@
 
 <body>
 
+<!--
 <div id="x-header">
 	<style type="text/css">
 		@import url(./Header.css);
@@ -45,8 +46,8 @@
 		<span class="x-color x-outgoing" style="background-color: seagreen"></span>
 	</div>
 </div>
+--!>
 
-<!--
 <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">
 	<div id="x-topic">
 		<style type="text/css">
@@ -61,7 +62,6 @@
 		</div>
 	</div>
 </div>
---!>
 
 <div id="Chat" class="groupchat">
 
diff -r ccfd2260f122 -r 8aebad65befa Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Topic.css
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Topic.css	Thu May 13 23:52:50 2010 -0500
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Topic.css	Mon May 17 21:20:12 2010 -0500
@@ -63,13 +63,10 @@
 	left: 4px;
 	width: 16px;
 	height: 16px;
-	z-index: 10;
-	cursor: default;
 	font-size: 21px !important;
 	font-family: "Apple Symbols";
 	z-index: 999;
 	cursor: pointer;
-	-webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, .2);
 	opacity: 0;
 	-webkit-transition: opacity .4s linear;
 
@@ -110,7 +107,6 @@
 
 #x-hide:active:before
 {
-	content: "\2297";
 	content: "\2299";
 }
 
@@ -129,6 +125,5 @@
 
 #x-show:active:before
 {
-	content: "\2297";
 	content: "\2299";
 }
diff -r ccfd2260f122 -r 8aebad65befa Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Compact.css
--- a/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Compact.css	Thu May 13 23:52:50 2010 -0500
+++ b/Smooth Operator ☿.AdiumMessageStyle/Contents/Resources/Variants/Compact.css	Mon May 17 21:20:12 2010 -0500
@@ -128,10 +128,9 @@
 	display: none;
 	position:fixed;
 	top: 8px;
-	right: 24px;
+	right: 18px;
 	width: auto;
 	height: auto;
-	z-index:99;
 	-webkit-user-drag: element;
 	max-width: 125px;
 	max-height: 125px;
@@ -142,8 +141,16 @@
 	display: inline;
 	padding: 4px;
 	background: -webkit-gradient(linear, left top, left bottom, from(rgba(255, 255, 255, 1)), to(rgba(240, 240, 240, 1)));
+	-webkit-border-radius: 5px;
+	z-index:101;
+	-webkit-transition: all .4s linear;
+	-webkit-box-shadow: 0px 4px 16px rgba(0, 0, 0, .75);
+}
+
+#topic:hover + #Chat > div:last-of-type.message.showIcons:not(.IRC) img.x-icon
+{
+	z-index: 91;
 	-webkit-box-shadow: 0px 2px 4px rgba(0, 0, 0, .4);
-	-webkit-border-radius: 5px;
 }
 
 #Chat > div:last-of-type.message.showIcons:not(.IRC) .x-color[src*="buddy_icon.png"]
@@ -153,12 +160,18 @@
 	-webkit-border-radius: 5px;
 	position:fixed;
 	top: 12px;
-	right: 28px;
-	z-index: 99;
+	right: 22px;
+	z-index: 102;
+	-webkit-transition: all .4s linear;
 	background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(255, 255, 255, .5)), to(rgba(255, 255, 255, .5)));
 	-webkit-mask-box-image: url(../adiumy-mask.png);
 }
 
+#topic:hover + #Chat > div:last-of-type.message.showIcons:not(.IRC) .x-color[src*="buddy_icon.png"]
+{
+	z-index: 92;
+}
+
 .consecutive.message img.x-icon
 {
 	display: none !important;
@@ -393,6 +406,16 @@
 	top: -11px !important;
 }
 
+#topic #x-wrap
+{
+	-webkit-box-shadow: 0px 2px 4px rgba(0, 0, 0, .4), 8px -8px 8px rgba(255, 255, 255, 1), -8px -8px 8px rgba(255, 255, 255, 1), -8px 16px 16px rgba(248, 248, 248, 1), 8px 16px 16px rgba(248, 248, 248, 1) !important;
+}
+
+#topic:hover #x-wrap
+{
+	-webkit-box-shadow: 0px 4px 16px rgba(0, 0, 0, .75), 8px -8px 8px rgba(255, 255, 255, 1), -8px -8px 8px rgba(255, 255, 255, 1), -8px 16px 16px rgba(248, 248, 248, 1), 8px 16px 16px rgba(248, 248, 248, 1) !important;
+}
+
 .actionMessageUserName
 {
 	display: none;


More information about the commits mailing list