massive rework of templates and styles

--HG--
extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40534
This commit is contained in:
Ismael Carnales 2008-12-18 16:22:09 +00:00
parent bda22a539c
commit cf8b5fae37
6 changed files with 131 additions and 97 deletions

View File

@ -2,68 +2,89 @@
/* main elements */
html, body {
height: 100%;
margin:0;
padding:0;
height: 100%;
}
body {
margin:0;
padding:0;
background: url('../images/main-bg.jpg') repeat-x left top;
font-family: "Lucida Sans", Verdana, Helvetica, sans-serif;
font-size:small;
color:#333;
background-color:#FFF;
}
a { color:#6e0909; text-decoration:none; border-bottom:1px solid #d78888;}
a:hover { color:#f99800; border-bottom:1px solid #f7b7b7; }
.clear { clear:both; overflow:hidden; }
a img {
border: none;
}
h1, h2 { color:#331f0a; font-weight:normal;}
h1 {
font-size: 200%;
margin: 0 0 .6em 0;
}
h2 {
font-size: 150%;
margin: .6em 0;
}
blockquote { padding:0px 15px; color:#5b1111; font-size:125%; margin:0;}
p { line-height:1.5em; }
/* structure */
#mainwrap {
position: relative;
min-height: 100%; }
#container {
float: left;
width: 100%;
max-width: 974px;
margin: 42px 20px 66px;
.clear {
clear:both;
height: 0;
}
#content { clear:left; margin-top:10px; }
#left-column {
float:left;
margin: 25px 274px 0 0;
}
#right-column {
width:274px;
float:right;
margin: 25px 0 0 -274px;
#wrapper {
position: relative;
min-height: 100%;
}
#header {
float: left;
padding-top: 42px;
margin: 0 20px;
}
#body {
padding-bottom: 80px;
}
#content-wrapper {
width: 100%;
height: 65px;
float: left;
margin-right: -250px;
}
#content {
margin: 0 270px 0 20px;
}
#sidebar {
width: 250px;
float: right;
}
#footer {
position: absolute;
bottom: 0;
width: 100%;
height: 80px;
border-top: 1px solid #b5331a;
background: url('../images/footer-bg.jpg') repeat-x left top #5b2a16;
}
#header h1 {
float: left;
margin: 0;
}
#header h1 a {
@ -72,10 +93,11 @@ p { line-height:1.5em; }
#navigation {
float: right;
margin: 35px 0 0;
margin: 0;
padding: 0;
list-style-type: none;
}
#navigation li { float:left; padding:0 10px; font-size:120%; border-right:1px solid #e57919; }
#navigation li.last { border-right:none; }
#navigation li a { text-decoration:none; border-bottom:1px solid #ffca9b; color:#e57919;}
@ -85,6 +107,43 @@ p { line-height:1.5em; }
border-bottom: none;
}
#footer ul {
list-style-type: none;
margin: 15px 10px;
padding: 0;
}
#footer ul li {
display: inline;
padding: 0 10px;
border-right: 1px solid #b2c0c9;
}
#footer ul li.last {
border-right:none;
}
#footer li a {
text-decoration: none;
border-bottom: 1px solid #884a2b;
color: #fff;
}
#footer li a:hover, #footer p a:hover { i
color:#ffe114;
}
#footer p {
margin: 0 20px;
line-height: 1.1em;
font-size: .8em;
color: #fff;
}
#footer p a {
color:#fff;
}
.box { margin-bottom:15px; background:url('../images/box-borders-bottom.gif') no-repeat left bottom #4d271c; padding-bottom:5px; }
.box.download {background-color:#5b1111; }
.box.download p { color:#d18c59; }
@ -104,12 +163,3 @@ padding:0pt 0px 5px; border-bottom:4px solid #462217;}
.box .post h4 a {color:#ffe114; border-bottom:1px solid #957020; font-size:0.9em}
.box .post a.more { font-size:0.8em; color:#ffe114; border-bottom:none;}
.box .post a:hover.more { color:#FFF;}
#footer { margin: 45px 0 0; color:#FFF; padding: 15px 0px 0px 26px; background:url('../images/footer-bg.jpg') repeat-x left top #5b2a16; border-top:1px solid #b5331a; position:absolute; width:98%; bottom:0;}
#footer ul { list-style-type:none; margin:0 0 0 -10px; padding: 0;}
#footer ul li { display: inline; padding:0 10px; border-right:1px solid #b2c0c9; }
#footer ul li.last { border-right:none;}
#footer li a { text-decoration:none; border-bottom:1px solid #884a2b; color:#FFF;}
#footer li a:hover, #footer p a:hover { color:#ffe114; }
#footer p {line-height:1.1em; font-size: .8em;}
#footer p a { color:#fff; }

View File

@ -1,28 +1,35 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>{% block title %}Scrapy.org. Scraping framework{% endblock %}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<head>
<title>{% block title %}Scrapy.org. Scraping framework{% endblock %}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<link href="{{ MEDIA_URL }}/style/style.css" rel="stylesheet" type="text/css" media="screen" />
{% block extrastyles %}{% endblock %}
<!--[if IE 6]>
<link href="/style/ie60.css" rel="stylesheet" type="text/css" media="screen" />
<![endif]-->
<!--[if IE 7]>
<link href="/style/ie70.css" rel="stylesheet" type="text/css" media="screen" />
<![endif]-->
<link href="{{ MEDIA_URL }}/style/style.css" rel="stylesheet" type="text/css" media="screen" />
{% block extrastyles %}{% endblock %}
<!--[if IE 6]>
<link href="/style/ie60.css" rel="stylesheet" type="text/css" media="screen" />
<![endif]-->
<!--[if IE 7]>
<link href="/style/ie70.css" rel="stylesheet" type="text/css" media="screen" />
<![endif]-->
{% block extrascripts %}{% endblock %}
</head>
<body>
<div id="mainwrap">
<div id="container">
{% block content %}{% endblock %}
</div>
<div class="clear"></div>
{% include "footer.html" %}
</div>
</body>
{% block extrascripts %}{% endblock %}
</head>
<body>
<div id="wrapper">
{% include "header.html" %}
<div id="body">
<div id="content-wrapper">
<div id="content">
{% block main-content %}{% endblock %}
</div>
</div>
<div id="sidebar">
{% block extra-content %}{% endblock %}
</div>
<br class="clear"/>
</div>
{% include "footer.html" %}
</div>
</body>
</html>

View File

@ -27,16 +27,3 @@ a.headerlink:hover {
</style>
<link href="{{ MEDIA_URL }}/style/pygments.css" rel="stylesheet" type="text/css" media="screen" />
{% endblock %}
{% block content %}
{% include "header.html" %}
<div id="content">
<div id="left-column">
{% block main-content %}{% endblock %}
</div>
<div id="right-column">
{% block extra-content %}{% endblock %}
</div>
</div>
{% endblock %}

View File

@ -1,14 +1,6 @@
{% extends "base.html" %}
{% block content %}
{% include "header.html" %}
<div id="content">
<div id="left-column">
{% block main-content %}{% endblock %}
</div>
<div id="right-column">
{% block extra-content %}
{% load download_tags %}
{% load_download_links as "download_links" %}
@ -41,6 +33,4 @@
</div>
{% endif %}
{% endcomment %}
</div>
</div>
{% endblock %}

View File

@ -1,14 +1,11 @@
<div id="footer">
{% block footer %}
<ul>
<li><a href="/">Home</a></li>
<li><a href="/download/">Download</a></li>
<li><a href="/doc/">Documentation</a></li>
<li><a href="/community/">Community</a></li>
<li><a href="http://dev.scrapy.org">Development</a></li>
<li class="last"><a href="/blog/">Blog</a></li>
</ul>
<div class="clear"></div>
<p>&copy; 2007-2008 <a href="http://insophia.com/">Insophia</a>, <a href="http://mydeco.com/the-magazine/style/mydeco-about-us">By Design UK</a></p>
{% endblock %}
</div>
<div id="footer">
<ul>
<li><a href="/">Home</a></li>
<li><a href="/download/">Download</a></li>
<li><a href="/doc/">Documentation</a></li>
<li><a href="/community/">Community</a></li>
<li><a href="http://dev.scrapy.org">Development</a></li>
<li class="last"><a href="/blog/">Blog</a></li>
</ul>
<p>&copy; 2007-2008 <a href="http://insophia.com/">Insophia</a>, <a href="http://mydeco.com/the-magazine/style/mydeco-about-us">By Design UK</a></p>
</div>

View File

@ -1,3 +1,4 @@
<div id="header-wrap">
<div id="header">
<h1><a href="/"><img src="{{ MEDIA_URL }}/images/logo.jpg" width="150" height="65" alt="Scrapy"/></a></h1>
<ul id="navigation">
@ -8,4 +9,6 @@
<li><a href="http://dev.scrapy.org">Development</a></li>
<li class="last"><a href="/blog/">Blog</a></li>
</ul>
<br class="clear"/>
</div>
</div>