replaced header image. added left_column background image. some css modifications

author: hukl <contact@smyck.org> 2009-07-18 16:39:16 +0200
committer: hukl <contact@smyck.org> 2009-07-18 16:39:16 +0200
commit: aab86f2d2a0258a1347f39c1ee4081cd06bac56b (patch)
tree: c0d7fbc5ce9eb4f81a46388662574b843693d369
parent: 6c7fd57a37d48973bc513ceb7a98865b9e9d2365 (diff)
4 files changed, 39 insertions, 7 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 292c58d..93146d8 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -5,17 +5,17 @@
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
  
-    <title>untitled</title>
+    <title><%= page_title %></title>
    <%= stylesheet_link_tag "ccc" %>
  </head>
  
  <body>
    <div id="wrapper">
      <div id="header">
-        <%= image_tag "header.jpg" %>
+        <%= image_tag "header.png" %>
      </div>
      <div id="left_column">
-        
+        <%= main_menu %>
      </div>
      <div id="center_column">
        <%= yield :layout %>
diff --git a/public/images/header.png b/public/images/header.png
new file mode 100644
index 0000000..6ae179a
--- /dev/null
+++ b/public/images/header.png
Binary files differ
diff --git a/public/images/left_column.png b/public/images/left_column.png
new file mode 100644
index 0000000..bc687bd
--- /dev/null
+++ b/public/images/left_column.png
Binary files differ
diff --git a/public/stylesheets/ccc.css b/public/stylesheets/ccc.css
index ff0044d..bacdbd6 100644
--- a/public/stylesheets/ccc.css
+++ b/public/stylesheets/ccc.css
@@ -29,22 +29,43 @@ div#header {
  height: 224px;
 }
+div#main_navigation li {
+  list-style-type: none;
+}
+div#main_navigation a {
+  text-decoration: none;
+  font-size: 18px;
+  color: #d1d1d1;
+}
+div#main_navigation a:hover {
+  color: #535353;
+}
+div#main_navigation a.active {
+  color: #535353;
+  font-size: 22px;
+}
 div.author_and_date {
  font-style: italic;
 }
 div#left_column {
  position: absolute;
-  background-color: #f1f1f1;
+  background-image: url(/images/left_column.png);
+  background-position: top right;
+  background-repeat: no-repeat;
  left: 0px;
-  width: 177px;
+  width: 185px;
-  height: 100px;
+  min-height: 100px;
 }
 div#center_column {
  position: absolute;
  background-color: #ffffff;
-  left: 177px;
+  left: 185px;
  width: 528px;
  padding-left: 15px;
  padding-right: 15px; 
@@ -60,4 +81,15 @@ div#right_column {
  left: 735px;
  width: 174px; 
  height: 100px;
+}
+div.teaser_ruler {
+  border-top: 2px solid #000000;
+  border-bottom: 2px dashed #000000;
+  height: 3px;
+  margin-top: 30px;
+}
+div.article_partial p.excerpt {
+  color: #404040;
 }
 \ No newline at end of file
author	hukl <contact@smyck.org>	2009-07-18 16:39:16 +0200
committer	hukl <contact@smyck.org>	2009-07-18 16:39:16 +0200
commit	aab86f2d2a0258a1347f39c1ee4081cd06bac56b (patch)
tree	c0d7fbc5ce9eb4f81a46388662574b843693d369
parent	6c7fd57a37d48973bc513ceb7a98865b9e9d2365 (diff)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 292c58d..93146d8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb
@@ -5,17 +5,17 @@
5	<head>	5	<head>
6	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>	6	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
7		7
8	<title>untitled</title>	8	<title><%= page_title %></title>
9	<%= stylesheet_link_tag "ccc" %>	9	<%= stylesheet_link_tag "ccc" %>
10	</head>	10	</head>
11		11
12	<body>	12	<body>
13	<div id="wrapper">	13	<div id="wrapper">
14	<div id="header">	14	<div id="header">
15	<%= image_tag "header.jpg" %>	15	<%= image_tag "header.png" %>
16	</div>	16	</div>
17	<div id="left_column">	17	<div id="left_column">
18		18	<%= main_menu %>
19	</div>	19	</div>
20	<div id="center_column">	20	<div id="center_column">
21	<%= yield :layout %>	21	<%= yield :layout %>


diff --git a/public/images/header.png b/public/images/header.png new file mode 100644 index 0000000..6ae179a --- /dev/null +++ b/public/images/header.png
Binary files differ


diff --git a/public/images/left_column.png b/public/images/left_column.png new file mode 100644 index 0000000..bc687bd --- /dev/null +++ b/public/images/left_column.png
Binary files differ


diff --git a/public/stylesheets/ccc.css b/public/stylesheets/ccc.css index ff0044d..bacdbd6 100644 --- a/public/stylesheets/ccc.css +++ b/public/stylesheets/ccc.css
@@ -29,22 +29,43 @@ div#header {
29	height: 224px;	29	height: 224px;
30	}	30	}
31		31
		32	div#main_navigation li {
		33	list-style-type: none;
		34	}
		35
		36	div#main_navigation a {
		37	text-decoration: none;
		38	font-size: 18px;
		39	color: #d1d1d1;
		40	}
		41
		42	div#main_navigation a:hover {
		43	color: #535353;
		44	}
		45
		46	div#main_navigation a.active {
		47	color: #535353;
		48	font-size: 22px;
		49	}
		50
32	div.author_and_date {	51	div.author_and_date {
33	font-style: italic;	52	font-style: italic;
34	}	53	}
35		54
36	div#left_column {	55	div#left_column {
37	position: absolute;	56	position: absolute;
38	background-color: #f1f1f1;	57	background-image: url(/images/left_column.png);
		58	background-position: top right;
		59	background-repeat: no-repeat;
39	left: 0px;	60	left: 0px;
40	width: 177px;	61	width: 185px;
41	height: 100px;	62	min-height: 100px;
42	}	63	}
43		64
44	div#center_column {	65	div#center_column {
45	position: absolute;	66	position: absolute;
46	background-color: #ffffff;	67	background-color: #ffffff;
47	left: 177px;	68	left: 185px;
48	width: 528px;	69	width: 528px;
49	padding-left: 15px;	70	padding-left: 15px;
50	padding-right: 15px;	71	padding-right: 15px;
@@ -60,4 +81,15 @@ div#right_column {
60	left: 735px;	81	left: 735px;
61	width: 174px;	82	width: 174px;
62	height: 100px;	83	height: 100px;
		84	}
		85
		86	div.teaser_ruler {
		87	border-top: 2px solid #000000;
		88	border-bottom: 2px dashed #000000;
		89	height: 3px;
		90	margin-top: 30px;
		91	}
		92
		93	div.article_partial p.excerpt {
		94	color: #404040;
63	} \ No newline at end of file	95	} \ No newline at end of file