xtras/mathuaerknedam 323:737200d18a97: Renkoo: Put the header sp...

[commits at adium.im]

details:	http://hg.adium.im/xtras/mathuaerknedam/rev/737200d18a97
revision:	323:737200d18a97
author:		mathuaerknedam
date:		Mon Feb 08 22:27:24 2010 -0600

Renkoo: Put the header specific styling into header.css (loaded from header.html) so that the header-sized body{margin-top} is only applied when the header is being displayed.

diffs (172 lines):

diff -r de7a3430360a -r 737200d18a97 Renkoo ☿.AdiumMessageStyle/Contents/Resources/Header.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Renkoo ☿.AdiumMessageStyle/Contents/Resources/Header.css	Mon Feb 08 22:27:24 2010 -0600
@@ -0,0 +1,69 @@
+#x-header1
+{
+	position: fixed;
+	top: 0px;
+	left: 0px;
+	right: 0px;
+	margin: 0;
+	padding: 10px;
+	overflow: auto;
+	color: white;
+	font-family: Lucida Grande;
+	text-align: center;
+	font-size: 10px;
+	font-weight: regular;
+	background: rgba(0,0,0,.65);
+	z-index: 999;
+}
+
+#x-heading
+{
+	position: fixed;
+	top: 0px;
+	left: 0px;
+	margin: 0;
+	padding: 5px;
+	font-weight: regular;
+	background-color: #fbfbed;
+	z-index: 999;
+	width: 100%;
+	height: 45px;
+	border-bottom: 2px solid #d5d5d5;
+	background: url("./images/steelHeading.jpg") repeat-x top left;
+}
+
+#x-heading .x-conversationIncomingIcon
+{
+	position: absolute;
+	left: 5px;
+	top: 5px;
+}
+
+#x-heading .x-conversationIncomingIcon img
+{
+	width: 48px;
+	height: 48px;
+}
+
+#x-heading .x-conversationWith
+{
+	position: relative;
+	left: 60px;
+	margin: 5px 0 0 0;
+	font: bold 16px Myriad Pro, Myriad, Lucida Grande, Trebuchet MS, Arial;
+	overflow: hide;
+}
+
+#x-heading .x-conversationTime
+{
+	position: relative;
+	left: 60px;
+	color: #6d6d6d;
+	font: bold 10px Myriad Pro, Myriad, Lucida Grande, Trebuchet MS, Arial;
+}
+
+body
+{
+	margin-top: 65px;
+}
+
diff -r de7a3430360a -r 737200d18a97 Renkoo ☿.AdiumMessageStyle/Contents/Resources/Header.html
--- a/Renkoo ☿.AdiumMessageStyle/Contents/Resources/Header.html	Mon Feb 08 21:42:21 2010 -0600
+++ b/Renkoo ☿.AdiumMessageStyle/Contents/Resources/Header.html	Mon Feb 08 22:27:24 2010 -0600
@@ -1,3 +1,6 @@
+	<style type="text/css">
+		@import url(./Header.css);
+	</style>
 <div id="x-heading">
 	<div class="x-conversationIncomingIcon"><img src="%incomingIconPath%" /></div>
 	<div class="x-conversationWith">%chatName%</div>
diff -r de7a3430360a -r 737200d18a97 Renkoo ☿.AdiumMessageStyle/Contents/Resources/Styles/main.css
--- a/Renkoo ☿.AdiumMessageStyle/Contents/Resources/Styles/main.css	Mon Feb 08 21:42:21 2010 -0600
+++ b/Renkoo ☿.AdiumMessageStyle/Contents/Resources/Styles/main.css	Mon Feb 08 22:27:24 2010 -0600
@@ -4,73 +4,8 @@
 	word-break: break-word;
 }
 
-#x-header1
-{
-	position: fixed;
-	top: 0px;
-	left: 0px;
-	right: 0px;
-	margin: 0;
-	padding: 10px;
-	overflow: auto;
-	color: white;
-	font-family: Lucida Grande;
-	text-align: center;
-	font-size: 10px;
-	font-weight: regular;
-	background: rgba(0,0,0,.65);
-	z-index: 999;
-}
-
-#x-heading
-{
-	position: fixed;
-	top: 0px;
-	left: 0px;
-	margin: 0;
-	padding: 5px;
-	font-weight: regular;
-	background-color: #fbfbed;
-	z-index: 999;
-	width: 100%;
-	height: 45px;
-	border-bottom: 2px solid #d5d5d5;
-	background: url("../images/steelHeading.jpg") repeat-x top left;
-}
-
-#x-heading .x-conversationIncomingIcon
-{
-	position: absolute;
-	left: 5px;
-	top: 5px;
-}
-
-#x-heading .x-conversationIncomingIcon img
-{
-	width: 48px;
-	height: 48px;
-}
-
-#x-heading .x-conversationWith
-{
-	position: relative;
-	left: 60px;
-	margin: 5px 0 0 0;
-	font: bold 16px Myriad Pro, Myriad, Lucida Grande, Trebuchet MS, Arial;
-	overflow: hide;
-}
-
-#x-heading .x-conversationTime
-{
-	position: relative;
-	left: 60px;
-	color: #6d6d6d;
-	font: bold 10px Myriad Pro, Myriad, Lucida Grande, Trebuchet MS, Arial;
-}
-
 body
 {
-	margin-top: 65px;
 	background-color: white;
 	color: black;
 }
@@ -80,11 +15,6 @@
 	font: 10px Myriad, Lucida Grande, Arial;
 }
 
-
-body
-{
-}
-
 .x-followUp
 {
 	clear: right;