diff --git a/sites/scrapy.org/static/style/style.css b/sites/scrapy.org/static/style/style.css index 426cedb7f..c03edb5b3 100644 --- a/sites/scrapy.org/static/style/style.css +++ b/sites/scrapy.org/static/style/style.css @@ -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; } diff --git a/sites/scrapy.org/templates/base.html b/sites/scrapy.org/templates/base.html index 7a6e79309..67cf3c2a8 100644 --- a/sites/scrapy.org/templates/base.html +++ b/sites/scrapy.org/templates/base.html @@ -1,28 +1,35 @@ - - {% block title %}Scrapy.org. Scraping framework{% endblock %} - + + {% block title %}Scrapy.org. Scraping framework{% endblock %} + - - {% block extrastyles %}{% endblock %} - - + + {% block extrastyles %}{% endblock %} + + - {% block extrascripts %}{% endblock %} - - -
-
- {% block content %}{% endblock %} -
- -
- {% include "footer.html" %} -
- + {% block extrascripts %}{% endblock %} + + +
+ {% include "header.html" %} +
+
+
+ {% block main-content %}{% endblock %} +
+
+ +
+
+ {% include "footer.html" %} +
+ diff --git a/sites/scrapy.org/templates/base_doc.html b/sites/scrapy.org/templates/base_doc.html index 3fd77433e..5efcbdb9f 100644 --- a/sites/scrapy.org/templates/base_doc.html +++ b/sites/scrapy.org/templates/base_doc.html @@ -27,16 +27,3 @@ a.headerlink:hover { {% endblock %} - -{% block content %} -{% include "header.html" %} -
-
- {% block main-content %}{% endblock %} -
- -
- {% block extra-content %}{% endblock %} -
-
-{% endblock %} diff --git a/sites/scrapy.org/templates/base_home.html b/sites/scrapy.org/templates/base_home.html index a211da71d..f5a5e5dd6 100644 --- a/sites/scrapy.org/templates/base_home.html +++ b/sites/scrapy.org/templates/base_home.html @@ -1,14 +1,6 @@ {% extends "base.html" %} -{% block content %} -{% include "header.html" %} - -
-
- {% block main-content %}{% endblock %} -
- -
+{% block extra-content %} {% load download_tags %} {% load_download_links as "download_links" %} @@ -41,6 +33,4 @@
{% endif %} {% endcomment %} -
- {% endblock %} diff --git a/sites/scrapy.org/templates/footer.html b/sites/scrapy.org/templates/footer.html index 6f7d445fd..71887f528 100644 --- a/sites/scrapy.org/templates/footer.html +++ b/sites/scrapy.org/templates/footer.html @@ -1,14 +1,11 @@ - + diff --git a/sites/scrapy.org/templates/header.html b/sites/scrapy.org/templates/header.html index 6a2ac9730..ab5c63100 100644 --- a/sites/scrapy.org/templates/header.html +++ b/sites/scrapy.org/templates/header.html @@ -1,3 +1,4 @@ +