[geeklog-cvs] geeklog: Denim: modified header style. now you can choose two ty...

[geeklog-cvs at lists.geeklog.net]

changeset 8695:e816c374fabb
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/e816c374fabb
user: dengen
date: Sun May 13 15:47:24 2012 +0900
description:
Denim: modified header style. now you can choose two types of header styles.
type1 is text base header title. (default)
type2 is logo image base header title.

diffstat:

 public_html/layout/denim/css_ltr/style.css |   54 ++++++++++++++++++++++++--
 public_html/layout/denim/css_rtl/style.css |   58 +++++++++++++++++++++++++---
 public_html/layout/denim/header.thtml      |    4 +-
 public_html/layout/denim/images/logo.png   |  Bin 
 4 files changed, 102 insertions(+), 14 deletions(-)

diffs (198 lines):

diff -r 99c5e993f4f3 -r e816c374fabb public_html/layout/denim/css_ltr/style.css
--- a/public_html/layout/denim/css_ltr/style.css	Sun May 13 01:08:23 2012 +0900
+++ b/public_html/layout/denim/css_ltr/style.css	Sun May 13 15:47:24 2012 +0900
@@ -1062,7 +1062,7 @@
 #header {
   width: 100%;  /* Container Width */
   height: 80px;
-  background: transparent url(../images/css/bg_header.gif) repeat-x 0 0;
+  background: transparent url(../images/css/bg_header.gif) repeat-x bottom left;
 }
 
 #header-content {
@@ -1072,10 +1072,34 @@
 }
 
 /* Site Name */
-.site_name {
+.type1 .site_name {
+  margin: 20px 0 0 8px; /* rtl */
+  padding: 0;
+  float: left; /* rtl */
+  font-size: 2.3em;
+  font-weight: bold;
+  text-shadow: 0 2px 2px rgba(0, 0, 0, 0.5);
+}
+
+.type1 .site_name a:link,
+.type1 .site_name a:visited,
+.type1 .site_name a:hover {
+  color: #EEEEEE;
+  text-decoration: none;
+}
+
+.type2 .site_name {
   margin: 12px 0 0 16px; /* rtl */
   padding: 0;
   float: left; /* rtl */
+  background: url(../images/logo.png) 0 0 no-repeat;
+}
+
+.type2 .site_name a {
+  text-indent: -3000px;
+  display: block;
+  width: 151px;
+  height: 56px;
 }
 
 /* Slogan */
@@ -3237,18 +3261,38 @@
 	  Header Container
 	--------------------------------------*/
 
+	#header {
+	  height: 60px;
+	}
+
 	/*  Site Name */
-	.site_name {
-	  margin: 20px 0 0 7px; /* rtl */
+	.type1 .site_name {
+	  margin: 6px 0 0 8px; /* rtl */
+	  font-size: 1.6em;
 	}
-	.site_name img {
+
+	.type2 .site_name {
+	  margin: 9px 0 0 7px; /* rtl */
+	  background: url(../images/logo.png) -152px 0 no-repeat;
+	}
+
+	.type2 .site_name a {
 	  width:113px;
 	  height:42px;
 	}
+
+	/* Slogan */
 	.site_slogan {
 	  font-size: 75%;
 	}
 
+	.type1 .site_slogan {
+	  clear: both;
+	  padding: 0px 10px 0;
+	  text-align: left; /* rtl */
+	  line-height: 1.2em;
+	}
+
 	/*--------------------------------------
 	  Gloval Navigation Container
 	--------------------------------------*/
diff -r 99c5e993f4f3 -r e816c374fabb public_html/layout/denim/css_rtl/style.css
--- a/public_html/layout/denim/css_rtl/style.css	Sun May 13 01:08:23 2012 +0900
+++ b/public_html/layout/denim/css_rtl/style.css	Sun May 13 15:47:24 2012 +0900
@@ -1062,7 +1062,7 @@
 #header {
   width: 100%;  /* Container Width */
   height: 80px;
-  background: transparent url(../images/css/bg_header.gif) repeat-x 0 0;
+  background: transparent url(../images/css/bg_header.gif) repeat-x bottom left;
 }
 
 #header-content {
@@ -1072,10 +1072,34 @@
 }
 
 /* Site Name */
-.site_name {
+.type1 .site_name {
+  margin: 20px 8px 0 0; /* rtl */
+  padding: 0;
+  float: right; /* rtl */
+  font-size: 2.3em;
+  font-weight: bold;
+  text-shadow: 0 2px 2px rgba(0, 0, 0, 0.5);
+}
+
+.type1 .site_name a:link,
+.type1 .site_name a:visited,
+.type1 .site_name a:hover {
+  color: #EEEEEE;
+  text-decoration: none;
+}
+
+.type2 .site_name {
   margin: 12px 16px 0 0; /* rtl */
   padding: 0;
   float: right; /* rtl */
+  background: url(../images/logo.png) 0 0 no-repeat;
+}
+
+.type2 .site_name a {
+  text-indent: -3000px;
+  display: block;
+  width: 151px;
+  height: 56px;
 }
 
 /* Slogan */
@@ -3237,18 +3261,38 @@
 	  Header Container
 	--------------------------------------*/
 
+	#header {
+	  height: 60px;
+	}
+
 	/*  Site Name */
-	.site_name {
-	  margin: 20px 7px 0 0; /* rtl */
+	.type1 .site_name {
+	  margin: 6px 8px 0 0; /* rtl */
+	  font-size: 1.6em;
 	}
-	.site_name img {
-	  width:113px;
-	  height:42px;
+
+	.type2 .site_name {
+	  margin: 9px 7px 0 0; /* rtl */
+	  background: url(../images/logo.png) -152px 0 no-repeat;
 	}
+
+	.type2 .site_name a {
+	  width: 113px;
+	  height: 42px;
+	}
+
+	/* Slogan */
 	.site_slogan {
 	  font-size: 75%;
 	}
 
+	.type1 .site_slogan {
+	  clear: both;
+	  padding: 0px 10px 0;
+	  text-align: right; /* rtl */
+	  line-height: 1.2em;
+	}
+
 	/*--------------------------------------
 	  Gloval Navigation Container
 	--------------------------------------*/
diff -r 99c5e993f4f3 -r e816c374fabb public_html/layout/denim/header.thtml
--- a/public_html/layout/denim/header.thtml	Sun May 13 01:08:23 2012 +0900
+++ b/public_html/layout/denim/header.thtml	Sun May 13 15:47:24 2012 +0900
@@ -34,8 +34,8 @@
 
     <!-- #header { -->
     <div id="header">
-      <div id="header-content">
-        <h1 class="site_name"><a href="{site_url}"><img src="{site_logo}" width="151" height="56" alt="{site_name}"{xhtml}></a></h1>
+      <div id="header-content" class="type1">
+        <h1 class="site_name"><a href="{site_url}" title="{site_name}">{site_name}</a></h1>
         <p class="site_slogan">{site_slogan}</p>
       </div>
     </div>
diff -r 99c5e993f4f3 -r e816c374fabb public_html/layout/denim/images/logo.png
Binary file public_html/layout/denim/images/logo.png has changed