diff --git a/collects/meta/web/common/resources.rkt b/collects/meta/web/common/resources.rkt index c7a173ca65..4d19540964 100644 --- a/collects/meta/web/common/resources.rkt +++ b/collects/meta/web/common/resources.rkt @@ -8,7 +8,8 @@ (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) (copyfile-resource (in-here file) (web-path dir file))) @@ -22,13 +23,13 @@ (lambda (url) (link rel: "stylesheet" type: "text/css" href: url title: "default")))) -(define page-style +(define page-sizes @text{ margin-left: auto; margin-right: auto; width: 45em; }) -(define font-style +(define font-family @text{ font-family: Optima, Arial, Verdana, Helvetica, sans-serif; }) @@ -49,8 +50,8 @@ text-decoration: none; } .racketnav .navcontent { - @page-style - @font-style + @page-sizes + @font-family } .racketnav .navtitle { font-size: xx-large; @@ -93,7 +94,7 @@ body { color: black; background-color: white; - @font-style + @font-family margin: 0px; padding: 0px; } @@ -105,7 +106,7 @@ } @; ---- content styles ---- .bodycontent { - @page-style + @page-sizes } @; ---- styles for the navbar ---- @navbar-style diff --git a/collects/meta/web/stubs/blog.rkt b/collects/meta/web/stubs/blog.rkt index 48075a9537..47f53508bf 100644 --- a/collects/meta/web/stubs/blog.rkt +++ b/collects/meta/web/stubs/blog.rkt @@ -16,7 +16,7 @@ ;} #navbar-iframe { position: absolute; - top: 154px; right: 0px; + top: 160px; right: 0px; opacity: 0.33; filter: alpha(opacity=33); } #navbar-iframe:hover { @@ -27,8 +27,10 @@ }) (define (racket-navbar) - (with-output-to-string - (lambda () (output-xml (www:the-resources 'navbar #f))))) + (regexp-replace* #rx" " + (with-output-to-string + (lambda () (output-xml (www:the-resources 'navbar #f)))) + "\\ ")) (provide blog) (define blog @@ -36,8 +38,8 @@ #:referrer (lambda (u) @a[href: u]{Blog}) ;; #:part-of community <-- TODO: is doing this a good idea ]{ -@; This is the blogger style template file a little customized by soegaard and -@; then by eli, with one hole for the CSS, and one for the navbar +@; This is the blogger style template file, with one hole for the CSS and one +@; for the navbar, and a few more tweaks (first by soegaard and then by eli). @; @@ -111,27 +113,27 @@ Updated by: Blogger Team description="Text Font" type="font" default="normal normal 100% Georgia, Serif" - value="normal normal 100% Georgia, Serif"> + value="normal normal 100% @font-family"> + value="normal normal 78% @font-family"> + value="normal normal 256% @font-family"> + value="normal normal 78% @font-family"> + value="normal normal 78% @font-family"> */ /* Use this with templates/template-twocol.html */ @@ -140,10 +142,11 @@ body { background: $bgcolor; margin: 0; color: $textcolor; - font: x-small Georgia Serif; - font-size/* */:/**/small; - font-size: /**/small; - text-align: center; + // ELI: I don't know why this was here, it was butchering the whole layout + // font: x-small Georgia Serif; + // font-size/* */:/**/small; + // font-size: /**/small; + // text-align: center; } a:link { color: $linkcolor; @@ -162,11 +165,12 @@ a img { } /* Header ------------------------------------------------ -*/ +----------------------------------------------- */ + +/* ELI: seems like this has no effect on anything */ #header-wrapper { - width: 800px; /* this used to be 660 [soegaard,eli] */ + width: 800px; /* this used to be 660 [soegaard] */ margin: 0 auto 10px; border: 1px solid $bordercolor; } @@ -218,31 +222,37 @@ a img { margin-right: auto; } -/* Outer-Wrapper +/* Wrappers ----------------------------------------------- */ + +/* The whole main area */ #outer-wrapper { - width: 800px; /* used to be 660 [soegaard] */ - margin: 0 auto; + // ELI: + margin-top: 0; + margin-bottom: 0; + @page-sizes padding: 10px; text-align: left; font: $bodyfont; } +/* The text area */ #main-wrapper { - width: 550px; /* used to be 410 [soegaard] */ + width: 63%; /* used to be 410px [soegaard,ELI] */ float: left; 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 { - width: 220px; + width: 33%; /* used to be 220px [ELI] */ + font-size: 87.5%; /* ELI */ float: right; 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 */ } - /* Headings ----------------------------------------------- */ @@ -257,8 +267,7 @@ h2 { /* Posts ------------------------------------------------ - */ +----------------------------------------------- */ h2.date-header { margin: 1.5em 0 .5em; }