Fix the blog style to match other pages.

This commit is contained in:
Eli Barzilay 2010-06-15 12:18:42 -04:00
parent b644ec7be4
commit 5c027b6973
2 changed files with 43 additions and 33 deletions

View File

@ -8,7 +8,8 @@
(require "utils.ss") (require "utils.ss")
(provide make-logo make-icon make-style navbar-style) (provide make-logo make-icon make-style
navbar-style page-sizes font-family) ; needed for the blog template
(define ((make-file-copier file) dir) (define ((make-file-copier file) dir)
(copyfile-resource (in-here file) (web-path dir file))) (copyfile-resource (in-here file) (web-path dir file)))
@ -22,13 +23,13 @@
(lambda (url) (link rel: "stylesheet" type: "text/css" (lambda (url) (link rel: "stylesheet" type: "text/css"
href: url title: "default")))) href: url title: "default"))))
(define page-style (define page-sizes
@text{ @text{
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
width: 45em; width: 45em;
}) })
(define font-style (define font-family
@text{ @text{
font-family: Optima, Arial, Verdana, Helvetica, sans-serif; font-family: Optima, Arial, Verdana, Helvetica, sans-serif;
}) })
@ -49,8 +50,8 @@
text-decoration: none; text-decoration: none;
} }
.racketnav .navcontent { .racketnav .navcontent {
@page-style @page-sizes
@font-style @font-family
} }
.racketnav .navtitle { .racketnav .navtitle {
font-size: xx-large; font-size: xx-large;
@ -93,7 +94,7 @@
body { body {
color: black; color: black;
background-color: white; background-color: white;
@font-style @font-family
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
} }
@ -105,7 +106,7 @@
} }
@; ---- content styles ---- @; ---- content styles ----
.bodycontent { .bodycontent {
@page-style @page-sizes
} }
@; ---- styles for the navbar ---- @; ---- styles for the navbar ----
@navbar-style @navbar-style

View File

@ -16,7 +16,7 @@
;} ;}
#navbar-iframe { #navbar-iframe {
position: absolute; position: absolute;
top: 154px; right: 0px; top: 160px; right: 0px;
opacity: 0.33; filter: alpha(opacity=33); opacity: 0.33; filter: alpha(opacity=33);
} }
#navbar-iframe:hover { #navbar-iframe:hover {
@ -27,8 +27,10 @@
}) })
(define (racket-navbar) (define (racket-navbar)
(with-output-to-string (regexp-replace* #rx" "
(lambda () (output-xml (www:the-resources 'navbar #f))))) (with-output-to-string
(lambda () (output-xml (www:the-resources 'navbar #f))))
"\\ "))
(provide blog) (provide blog)
(define blog (define blog
@ -36,8 +38,8 @@
#:referrer (lambda (u) @a[href: u]{Blog}) #:referrer (lambda (u) @a[href: u]{Blog})
;; #:part-of community <-- TODO: is doing this a good idea ;; #:part-of community <-- TODO: is doing this a good idea
]{ ]{
@; This is the blogger style template file a little customized by soegaard and @; This is the blogger style template file, with one hole for the CSS and one
@; then by eli, with one hole for the CSS, and one for the navbar @; for the navbar, and a few more tweaks (first by soegaard and then by eli).
@; @;
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@ -111,27 +113,27 @@ Updated by: Blogger Team
description="Text Font" description="Text Font"
type="font" type="font"
default="normal normal 100% Georgia, Serif" default="normal normal 100% Georgia, Serif"
value="normal normal 100% Georgia, Serif"> value="normal normal 100% @font-family">
<Variable name="headerfont" <Variable name="headerfont"
description="Sidebar Title Font" description="Sidebar Title Font"
type="font" type="font"
default="normal normal 78% 'Trebuchet MS',Trebuchet,Arial,Verdana,Sans-serif" default="normal normal 78% 'Trebuchet MS',Trebuchet,Arial,Verdana,Sans-serif"
value="normal normal 78% 'Trebuchet MS',Trebuchet,Arial,Verdana,Sans-serif"> value="normal normal 78% @font-family">
<Variable name="pagetitlefont" <Variable name="pagetitlefont"
description="Blog Title Font" description="Blog Title Font"
type="font" type="font"
default="normal normal 200% Georgia, Serif" default="normal normal 200% Georgia, Serif"
value="normal normal 256% Verdana, sans-serif"> value="normal normal 256% @font-family">
<Variable name="descriptionfont" <Variable name="descriptionfont"
description="Blog Description Font" description="Blog Description Font"
type="font" type="font"
default="normal normal 78% 'Trebuchet MS', Trebuchet, Arial, Verdana, Sans-serif" default="normal normal 78% 'Trebuchet MS', Trebuchet, Arial, Verdana, Sans-serif"
value="normal normal 78% 'Trebuchet MS', Trebuchet, Arial, Verdana, Sans-serif"> value="normal normal 78% @font-family">
<Variable name="postfooterfont" <Variable name="postfooterfont"
description="Post Footer Font" description="Post Footer Font"
type="font" type="font"
default="normal normal 78% 'Trebuchet MS', Trebuchet, Arial, Verdana, Sans-serif" default="normal normal 78% 'Trebuchet MS', Trebuchet, Arial, Verdana, Sans-serif"
value="normal normal 78% 'Trebuchet MS', Trebuchet, Arial, Verdana, Sans-serif"> value="normal normal 78% @font-family">
*/ */
/* Use this with templates/template-twocol.html */ /* Use this with templates/template-twocol.html */
@ -140,10 +142,11 @@ body {
background: $bgcolor; background: $bgcolor;
margin: 0; margin: 0;
color: $textcolor; color: $textcolor;
font: x-small Georgia Serif; // ELI: I don't know why this was here, it was butchering the whole layout
font-size/* */:/**/small; // font: x-small Georgia Serif;
font-size: /**/small; // font-size/* */:/**/small;
text-align: center; // font-size: /**/small;
// text-align: center;
} }
a:link { a:link {
color: $linkcolor; color: $linkcolor;
@ -162,11 +165,12 @@ a img {
} }
/* Header /* Header
----------------------------------------------- ----------------------------------------------- */
*/
/* ELI: seems like this has no effect on anything */
#header-wrapper { #header-wrapper {
width: 800px; /* this used to be 660 [soegaard,eli] */ width: 800px; /* this used to be 660 [soegaard] */
margin: 0 auto 10px; margin: 0 auto 10px;
border: 1px solid $bordercolor; border: 1px solid $bordercolor;
} }
@ -218,31 +222,37 @@ a img {
margin-right: auto; margin-right: auto;
} }
/* Outer-Wrapper /* Wrappers
----------------------------------------------- */ ----------------------------------------------- */
/* The whole main area */
#outer-wrapper { #outer-wrapper {
width: 800px; /* used to be 660 [soegaard] */ // ELI:
margin: 0 auto; margin-top: 0;
margin-bottom: 0;
@page-sizes
padding: 10px; padding: 10px;
text-align: left; text-align: left;
font: $bodyfont; font: $bodyfont;
} }
/* The text area */
#main-wrapper { #main-wrapper {
width: 550px; /* used to be 410 [soegaard] */ width: 63%; /* used to be 410px [soegaard,ELI] */
float: left; float: left;
word-wrap: break-word; /* fix for long text breaking sidebar float in IE */ word-wrap: break-word; /* fix for long text breaking sidebar float in IE */
overflow: hidden; /* fix for long non-text content breaking IE sidebar float */ overflow: hidden; /* fix for long non-text content breaking IE sidebar float */
} }
/* Sidebar stuff */
#sidebar-wrapper { #sidebar-wrapper {
width: 220px; width: 33%; /* used to be 220px [ELI] */
font-size: 87.5%; /* ELI */
float: right; float: right;
word-wrap: break-word; /* fix for long text breaking sidebar float in IE */ word-wrap: break-word; /* fix for long text breaking sidebar float in IE */
overflow: hidden; /* fix for long non-text content breaking IE sidebar float */ overflow: hidden; /* fix for long non-text content breaking IE sidebar float */
} }
/* Headings /* Headings
----------------------------------------------- */ ----------------------------------------------- */
@ -257,8 +267,7 @@ h2 {
/* Posts /* Posts
----------------------------------------------- ----------------------------------------------- */
*/
h2.date-header { h2.date-header {
margin: 1.5em 0 .5em; margin: 1.5em 0 .5em;
} }