xtras/mathuaerknedam 263:357078001bcd: Stockholm: sender, time, ...

commits at adium.im commits at adium.im
Mon Nov 23 03:41:04 UTC 2009


details:	http://hg.adium.im/xtras/mathuaerknedam/rev/357078001bcd
revision:	263:357078001bcd
author:		mathuaerknedam
date:		Fri Nov 20 23:03:17 2009 -0600

Stockholm: sender, time, andmessage text all seemed a bit close to the top, so this shifts them down 2px.
Subject: xtras/mathuaerknedam 264:d360ac7810b0: Stockholm: main.css is loaded automatically, but alternating.css and regular.css were also loading it.

details:	http://hg.adium.im/xtras/mathuaerknedam/rev/d360ac7810b0
revision:	264:d360ac7810b0
author:		mathuaerknedam
date:		Fri Nov 20 23:04:44 2009 -0600

Stockholm: main.css is loaded automatically, but alternating.css and regular.css were also loading it.
Subject: xtras/mathuaerknedam 265:8e3960deefa2: Mockie: simplify css loading.

details:	http://hg.adium.im/xtras/mathuaerknedam/rev/8e3960deefa2
revision:	265:8e3960deefa2
author:		mathuaerknedam
date:		Sun Nov 22 20:59:15 2009 -0600

Mockie: simplify css loading.
Subject: xtras/mathuaerknedam 266:9c00f00aafcb: Mockie: focus indicators.

details:	http://hg.adium.im/xtras/mathuaerknedam/rev/9c00f00aafcb
revision:	266:9c00f00aafcb
author:		mathuaerknedam
date:		Sun Nov 22 21:40:10 2009 -0600

Mockie: focus indicators.

diffs (761 lines):

diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Brown - Icon Alternate.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Brown - Icon Alternate.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Brown - Icon Alternate.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,2 +1,3 @@
+ at import url(../styles/basestyle.css);
 @import url(../styles/colors_brown_olive.css);
 @import url(../styles/icon_alternate.css);
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Brown - Icon Hidden.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Brown - Icon Hidden.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Brown - Icon Hidden.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,2 +1,3 @@
+ at import url(../styles/basestyle.css);
 @import url(../styles/colors_brown_olive.css);
 @import url(../styles/icon_hidden.css);
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Brown - Icon Left.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Brown - Icon Left.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Brown - Icon Left.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,2 +1,3 @@
+ at import url(../styles/basestyle.css);
 @import url(../styles/colors_brown_olive.css);
 @import url(../styles/icon_left.css);
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Brown - Icon Right.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Brown - Icon Right.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Brown - Icon Right.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,2 +1,3 @@
+ at import url(../styles/basestyle.css);
 @import url(../styles/colors_brown_olive.css);
 @import url(../styles/icon_right.css);
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Indigo - Icon Alternate.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Indigo - Icon Alternate.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Indigo - Icon Alternate.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,2 +1,3 @@
+ at import url(../styles/basestyle.css);
 @import url(../styles/colors_indigo_maroon.css);
 @import url(../styles/icon_alternate.css);
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Indigo - Icon Hidden.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Indigo - Icon Hidden.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Indigo - Icon Hidden.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,2 +1,3 @@
+ at import url(../styles/basestyle.css);
 @import url(../styles/colors_indigo_maroon.css);
 @import url(../styles/icon_hidden.css);
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Indigo - Icon Left.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Indigo - Icon Left.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Indigo - Icon Left.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,2 +1,3 @@
+ at import url(../styles/basestyle.css);
 @import url(../styles/colors_indigo_maroon.css);
 @import url(../styles/icon_left.css);
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Indigo - Icon Right.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Indigo - Icon Right.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Indigo - Icon Right.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,2 +1,3 @@
+ at import url(../styles/basestyle.css);
 @import url(../styles/colors_indigo_maroon.css);
 @import url(../styles/icon_right.css);
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Orange - Icon Alternate.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Orange - Icon Alternate.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Orange - Icon Alternate.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,2 +1,3 @@
+ at import url(../styles/basestyle.css);
 @import url(../styles/colors_orange_green.css);
 @import url(../styles/icon_alternate.css);
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Orange - Icon Hidden.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Orange - Icon Hidden.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Orange - Icon Hidden.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,2 +1,3 @@
+ at import url(../styles/basestyle.css);
 @import url(../styles/colors_orange_green.css);
 @import url(../styles/icon_hidden.css);
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Orange - Icon Left.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Orange - Icon Left.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Orange - Icon Left.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,2 +1,3 @@
+ at import url(../styles/basestyle.css);
 @import url(../styles/colors_orange_green.css);
 @import url(../styles/icon_left.css);
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Orange - Icon Right.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Orange - Icon Right.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Orange - Icon Right.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,2 +1,3 @@
+ at import url(../styles/basestyle.css);
 @import url(../styles/colors_orange_green.css);
 @import url(../styles/icon_right.css);
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Red - Icon Alternate.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Red - Icon Alternate.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Red - Icon Alternate.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,2 +1,3 @@
+ at import url(../styles/basestyle.css);
 @import url(../styles/colors_red_blue.css);
 @import url(../styles/icon_alternate.css);
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Red - Icon Hidden.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Red - Icon Hidden.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Red - Icon Hidden.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,2 +1,3 @@
+ at import url(../styles/basestyle.css);
 @import url(../styles/colors_red_blue.css);
 @import url(../styles/icon_hidden.css);
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Red - Icon Left.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Red - Icon Left.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Red - Icon Left.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,2 +1,3 @@
+ at import url(../styles/basestyle.css);
 @import url(../styles/colors_red_blue.css);
 @import url(../styles/icon_left.css);
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Red - Icon Right.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Red - Icon Right.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/Variants/Red - Icon Right.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,2 +1,3 @@
+ at import url(../styles/basestyle.css);
 @import url(../styles/colors_red_blue.css);
 @import url(../styles/icon_right.css);
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/main.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/main.css	Fri Nov 20 20:03:59 2009 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
- at import url(styles/layout.css);
- at import url(styles/basestyle.css);
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/basestyle.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/basestyle.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/basestyle.css	Sun Nov 22 21:40:10 2009 -0600
@@ -13,6 +13,12 @@
 	color: black;
 }
 
+.x-incoming a:hover,
+.x-outgoing a:hover
+{
+	color: white;
+}
+
 .x-sender
 {
 	color: white;
@@ -43,7 +49,9 @@
 }
 
 .mention .x-time_consecutive,
-.mention .x-time_initial
+.mention .x-time_initial,
+.focus .x-time_consecutive,
+.focus .x-time_initial
 {
 	color: rgba(255, 255, 255, .7) !important;
 }
@@ -76,11 +84,6 @@
 	color: rgba(0, 0, 0, .6);
 }
 
-.x-context .x-time_consecutive + div
-{
-	border-top: 1px solid rgba(0, 0, 0, .2);
-}
-
 .x-context .x-buddyicon
 {
 	background: rgba(0, 0, 0, .2);
@@ -117,3 +120,123 @@
 	color: rgba(255, 255, 255, .8);
 }
 
+body
+{
+	margin: 0px 0px 0px 0px;
+}
+
+#Chat
+{
+	overflow: hidden;
+	padding: 5px 10px 0px 10px;
+}
+
+.x-incoming
+{
+	margin-top: 5px;
+	margin-bottom: 5px;
+	clear: both;
+}
+
+.x-outgoing
+{
+	margin-top: 5px;
+	margin-bottom: 5px;
+	clear: both;
+}
+
+.x-topleft
+{
+	height: 14px;
+	float: left;
+	width: 4px;
+}
+
+.x-sender
+{
+	height: 14px;
+	margin-right: 4px;
+	overflow: hidden;
+	padding-right: 30px;
+}
+
+.x-buddyicon
+{
+	display: block;
+	width: 32px;
+	height: 32px;
+	padding: 0px;
+	text-align: center;
+}
+
+.x-mask
+{
+	width: 32px;
+	height: 32px;
+	padding: 0px;
+}
+
+.x-protocol
+{
+	float: right;
+	position: relative;
+	height: 14px;
+	top: -14px;
+	padding-right: 4px;
+	right: 0px;
+	margin-bottom: -14px;
+	word-wrap: normal;
+}
+
+.x-time_initial,
+.x-time_consecutive
+{
+	float: right;
+	padding-top: 2px;
+	padding-bottom: 2px;
+	padding-right: 4px;
+	padding-left: 4px;
+}
+
+.x-message
+{
+	overflow: auto;
+	margin: 0;
+	padding: 0;
+}
+
+.x-text
+{
+	padding-top: 2px;
+	padding-right: 4px;
+	padding-bottom: 2px;
+	padding-left: 4px;
+}
+
+.x-status_container
+{
+	clear: both;
+	margin-bottom: 5px;
+}
+
+.x-status_container + .x-status_container
+{
+	margin-top: -5px;
+	padding-top: 5px;
+}
+
+.x-status_time
+{
+	float: right;
+	margin: 2px 4px 0 2px;
+}
+
+.x-bottomdivider
+{
+	width: 100%;
+	position: fixed;
+	bottom: 0px;
+	margin: 0px;
+	padding: 0px;
+	left: 0px;
+}
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/colors_brown_olive.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/colors_brown_olive.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/colors_brown_olive.css	Sun Nov 22 21:40:10 2009 -0600
@@ -29,6 +29,12 @@
 	color: #b27d4b;
 }
 
+.focus .x-incoming .x-time_consecutive,
+.focus .x-incoming .x-time_initial
+{
+	background: #b27d4b;
+}
+
 .x-incoming .x-message
 {
 	background: rgba(226, 219, 203, .9);
@@ -39,7 +45,7 @@
 	background: rgba(185, 135, 93, .9);
 }
 
-.x-incoming .x-time_consecutive + div
+.x-incoming .x-message-next
 {
 	border-top: 1px solid rgba(178, 125, 75, .4);
 }
@@ -47,7 +53,6 @@
 .x-incoming a:hover
 {
 	background: #b27d4b;
-	color: white;
 }
 
 .x-incoming a,
@@ -87,12 +92,18 @@
 	color: #749d5f;
 }
 
+.focus .x-outgoing .x-time_consecutive,
+.focus .x-outgoing .x-time_initial
+{
+	background: #749d5f;
+}
+
 .x-outgoing .x-message
 {
 	background: rgba(213, 225, 207, .9);
 }
 
-.x-outgoing .x-time_consecutive + div
+.x-outgoing .x-message-next
 {
 	border-top: 1px solid rgba(116, 157, 95, .4);
 }
@@ -105,7 +116,6 @@
 .x-outgoing a:hover
 {
 	background: #749d5f;
-	color: white;
 }
 
 .x-status_container
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/colors_indigo_maroon.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/colors_indigo_maroon.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/colors_indigo_maroon.css	Sun Nov 22 21:40:10 2009 -0600
@@ -34,6 +34,12 @@
 	color: #4b5db2;
 }
 
+.focus .x-incoming .x-time_consecutive,
+.focus .x-incoming .x-time_initial
+{
+	background: #4b5db2;
+}
+
 .x-incoming .x-message
 {
 	background: rgba(213, 211, 228, .9);
@@ -44,7 +50,7 @@
 	background: rgba(84, 110, 187, .9);
 }
 
-.x-incoming .x-time_consecutive + div
+.x-incoming .x-message-next
 {
 	border-top: 1px solid rgba(75, 93, 178, .4);
 }
@@ -52,7 +58,6 @@
 .x-incoming a:hover
 {
 	background: #4b5db2;
-	color: white;
 }
 
 .x-incoming a,
@@ -92,12 +97,18 @@
 	color: #b14a4b;
 }
 
+.focus .x-outgoing .x-time_consecutive,
+.focus .x-outgoing .x-time_initial
+{
+	background: #b14a4b;
+}
+
 .x-outgoing .x-message
 {
 	background: rgba(233, 207, 207, .9);
 }
 
-.x-outgoing .x-time_consecutive + div
+.x-outgoing .x-message-next
 {
 	border-top: 1px solid rgba(177, 74, 75,x-4);
 }
@@ -110,7 +121,6 @@
 .x-outgoing a:hover
 {
 	background: #b14a4b;
-	color: white;
 }
 
 .x-status_container
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/colors_orange_green.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/colors_orange_green.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/colors_orange_green.css	Sun Nov 22 21:40:10 2009 -0600
@@ -34,6 +34,12 @@
 	color: #FF7C00;
 }
 
+.focus .x-incoming .x-time_consecutive,
+.focus .x-incoming .x-time_initial
+{
+	background: #FF7C00;
+}
+
 .x-incoming .x-message
 {
 	background: rgba(244, 225, 190, .9);
@@ -44,7 +50,7 @@
 	background: rgba(255, 150, 51, .9);
 }
 
-.x-incoming .x-time_consecutive + div
+.x-incoming .x-message-next
 {
 	border-top: 1px solid rgba(255, 124, 0, .4);
 }
@@ -52,7 +58,6 @@
 .x-incoming a:hover
 {
 	background: #FF7C00;
-	color: white;
 }
 
 .x-incoming a,
@@ -92,12 +97,18 @@
 	color: #66CC32;
 }
 
+.focus .x-outgoing .x-time_consecutive,
+.focus .x-outgoing .x-time_initial
+{
+	background: #66CC32;
+}
+
 .x-outgoing .x-message
 {
 	background: rgba(213, 241, 200, .9);
 }
 
-.x-outgoing .x-time_consecutive + div
+.x-outgoing .x-message-next
 {
 	border-top: 1px solid rgba(102, 204, 50, .4);
 }
@@ -110,7 +121,6 @@
 .x-outgoing a:hover
 {
 	background: #66CC32;
-	color: white;
 }
 
 .x-status_container
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/colors_red_blue.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/colors_red_blue.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/colors_red_blue.css	Sun Nov 22 21:40:10 2009 -0600
@@ -34,6 +34,12 @@
 	color: #002cff;
 }
 
+.focus .x-incoming .x-time_consecutive,
+.focus .x-incoming .x-time_initial
+{
+	background: #002CFF;
+}
+
 .x-incoming .x-message
 {
 	background: rgba(204, 204, 246, .9);
@@ -44,7 +50,7 @@
 	background: rgba(49, 104, 246, .9);
 }
 
-.x-incoming .x-time_consecutive + div
+.x-incoming .x-message-next
 {
 	border-top: 1px solid rgba(0, 45, 255, .4);
 }
@@ -52,7 +58,6 @@
 .x-incoming a:hover
 {
 	background: #002CFF;
-	color: white;
 }
 
 .x-incoming a,
@@ -92,12 +97,18 @@
 	color: #FF0001;
 }
 
+.focus .x-outgoing .x-time_consecutive,
+.focus .x-outgoing .x-time_initial
+{
+	background: #FF0001;
+}
+
 .x-outgoing .x-message
 {
 	background: rgba(255, 195, 195, .9);
 }
 
-.x-outgoing .x-time_consecutive + div
+.x-outgoing .x-message-next
 {
 	border-top: 1px solid rgba(255, 0, 1, .4);
 }
@@ -110,7 +121,6 @@
 .x-outgoing a:hover
 {
 	background: #FF0001;
-	color: white;
 }
 
 .x-status_container
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/icon_alternate.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/icon_alternate.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/icon_alternate.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,13 +1,15 @@
 .x-incoming .x-buddyicon
 {
 	float: right;
-	margin: 0px 0px 5px 5px;
+	margin-bottom: 5px;
+	margin-left: 5px;
 }
 
 .x-outgoing .x-buddyicon
 {
 	float: left;
-	margin: 0px 5px 5px 0px;
+	margin-right: 5px;
+	margin-bottom: 5px;
 }
 
 .x-incoming .x-mask
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/icon_left.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/icon_left.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/icon_left.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,7 +1,8 @@
 .x-buddyicon
 {
 	float: left;
-	margin: 0px 5px 5px 0px;
+	margin-right: 5px;
+	margin-bottom: 5px;
 }
 
 .x-mask
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/icon_right.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/icon_right.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/icon_right.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,7 +1,8 @@
 .x-buddyicon
 {
 	float: right;
-	margin: 0px 0px 5px 5px;
+	margin-bottom: 5px;
+	margin-left: 5px;
 }
 
 .x-mask
diff -r 076d6367e8c2 -r 9c00f00aafcb Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/layout.css
--- a/Mockie ☿.AdiumMessageStyle/Contents/Resources/styles/layout.css	Fri Nov 20 20:03:59 2009 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-body
-{
-	margin: 0px 0px 0px 0px;
-}
-
-#Chat
-{
-	overflow: hidden;
-	padding: 5px 10px 0px 10px;
-}
-
-.x-incoming
-{
-	margin-top: 5px;
-	margin-bottom: 5px;
-	clear: both;
-}
-
-.x-outgoing
-{
-	margin-top: 5px;
-	margin-bottom: 5px;
-	clear: both;
-}
-
-.x-topleft
-{
-	height: 14px;
-	float: left;
-	width: 4px;
-}
-
-.x-sender
-{
-	height: 14px;
-	margin-right: 4px;
-	overflow: hidden;
-	padding-right: 30px;
-}
-
-.x-buddyicon
-{
-	display: block;
-	width: 32px;
-	height: 32px;
-	padding: 0px;
-	text-align: center;
-}
-
-.x-mask
-{
-	width: 32px;
-	height: 32px;
-	padding: 0px;
-}
-
-.x-protocol
-{
-	float: right;
-	position: relative;
-	height: 14px;
-	top: -14px;
-	padding-right: 4px;
-	right: 0px;
-	margin-bottom: -14px;
-	word-wrap: normal;
-}
-
-.x-time_initial,
-.x-time_consecutive
-{
-	float: right;
-	padding-top: 2px;
-	padding-bottom: 2px;
-	padding-right: 4px;
-}
-
-.x-message
-{
-	overflow: auto;
-	margin: 0;
-	padding: 0;
-}
-
-.x-text
-{
-	padding: 2px 4px;
-}
-
-.x-status_container
-{
-	clear: both;
-	margin-bottom: 5px;
-}
-
-.x-status_container + .x-status_container
-{
-	margin-top: -5px;
-	padding-top: 5px;
-}
-
-.x-status_time
-{
-	float: right;
-	margin: 2px 4px 0 2px;
-}
-
-.x-bottomdivider
-{
-	width: 100%;
-	position: fixed;
-	bottom: 0px;
-	margin: 0px;
-	padding: 0px;
-	left: 0px;
-}
diff -r 076d6367e8c2 -r 9c00f00aafcb Stockholm ☿.AdiumMessageStyle/Contents/Resources/alternating.css
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/alternating.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/alternating.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,4 +1,4 @@
- at import url("../main.css");
+/*@import url("../main.css");*/
 
 /* HEADER */
 .x-outgoingheader_ctx_left
diff -r 076d6367e8c2 -r 9c00f00aafcb Stockholm ☿.AdiumMessageStyle/Contents/Resources/main.css
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/main.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/main.css	Sun Nov 22 21:40:10 2009 -0600
@@ -19,6 +19,8 @@
 p
 {
 	margin: 0;
+	margin-top: 2px;
+	margin-bottom: -2px;
 	padding: 0px;
 	overflow: auto;
 }
@@ -109,7 +111,7 @@
 
 .x-sender
 {
-	padding:2px 30px 0 6px;
+	padding:4px 30px 0 6px;
 	overflow:hidden;
 	height:15px;
 }
@@ -118,17 +120,9 @@
 {
 	position: absolute;
 	right:5px;
-	top:2px;
+	top:4px;
 }
 
-.x-time
-{
-	position: absolute;
-	right:5px;
-	top:2px;
-}
-
-
 /* MESSAGE */
 
 .x-message
@@ -366,8 +360,9 @@
 .x-combine
 {
 	margin-top: 3px;
-	padding-top: 2px;
+	padding-top: 4px;
 	border-top: 1px solid #DDDDDD;
+	margin-bottom: -2px;
 }
 
 .x-combine:hover .x-ctime
diff -r 076d6367e8c2 -r 9c00f00aafcb Stockholm ☿.AdiumMessageStyle/Contents/Resources/regular.css
--- a/Stockholm ☿.AdiumMessageStyle/Contents/Resources/regular.css	Fri Nov 20 20:03:59 2009 -0600
+++ b/Stockholm ☿.AdiumMessageStyle/Contents/Resources/regular.css	Sun Nov 22 21:40:10 2009 -0600
@@ -1,4 +1,4 @@
- at import url("../main.css");
+/*@import url("../main.css");*/
 
 /* HEADER */
 .x-incomingheader_left


More information about the commits mailing list