From 4d8c8007e8f64583cf41ce7311e2c85476a9586b Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 11 Feb 2014 17:04:52 -0700 Subject: [PATCH] small and suggested adjustments to page content Also, allow navigation links in the right style without whole-page styles. --- .../new-plt-services/meta/new-web/www/all.rkt | 2 +- .../meta/new-web/www/community.rkt | 32 +++++++++++-------- .../meta/new-web/www/css/frontpage-style.css | 11 ++++--- .../meta/new-web/www/css/scribble.css | 2 -- .../meta/new-web/www/index.rkt | 8 ++++- .../meta/new-web/www/learning.rkt | 18 +++-------- .../meta/new-web/www/new-name.rkt | 7 ++-- .../meta/new-web/www/techreports.rkt | 6 ++-- .../plt-web-pkgs/plt-web-lib/layout.rkt | 3 +- .../plt-web-lib/resources/css/gumby-slice.css | 12 +++++-- .../plt-web-lib/resources/css/gumby.css | 3 +- 11 files changed, 59 insertions(+), 45 deletions(-) diff --git a/new-racket-web/new-plt-services/meta/new-web/www/all.rkt b/new-racket-web/new-plt-services/meta/new-web/www/all.rkt index e01393f6a6..58591e409d 100644 --- a/new-racket-web/new-plt-services/meta/new-web/www/all.rkt +++ b/new-racket-web/new-plt-services/meta/new-web/www/all.rkt @@ -1,5 +1,5 @@ #lang plt-web (require "index.rkt" "download.rkt" "community.rkt" "learning.rkt" "help.rkt" - "new-name.rkt" "web-copyright.rkt") + "new-name.rkt" "web-copyright.rkt" "techreports.rkt") (provide (rename-out [index main]) download community learning help) diff --git a/new-racket-web/new-plt-services/meta/new-web/www/community.rkt b/new-racket-web/new-plt-services/meta/new-web/www/community.rkt index e7b37ceb08..c01d940899 100644 --- a/new-racket-web/new-plt-services/meta/new-web/www/community.rkt +++ b/new-racket-web/new-plt-services/meta/new-web/www/community.rkt @@ -6,6 +6,23 @@ "../stubs/blog.rkt" "../stubs/git.rkt" (prefix-in pre: "../minis/pre.rkt")) +(provide thanks) +(define thanks + @text{ + Thanks to @a[href: "http://www.nsf.gov/"]{the NSF}, + @a[href: "http://www.darpa.mil/"]{DARPA}, + the + @a[href: "http://www.ed.gov/FIPSE/"]{ + Fund for the Improvement of Postsecondary Education (FIPSE)} + at the @a[href: "http://www.ed.gov/"]{US Department of Education}, + the @a[href: '("http://www.exxonmobil.com/Corporate/" + "community_foundation.aspx")]{Exxon Foundation}, + CORD, partners of the Academy of Information Technology, + @a[href: "http://microsoft.com"]{Microsoft}, + @a[href: "http://mozilla.org"]{Mozilla}, + and @a[href: "http://google.com"]{Google} + for their generous support over the years.}) + (provide community) (define community @page[#:site www-site @@ -34,17 +51,4 @@ @text{@pre:installers{Snapshot} — daily builds.} @text{@bug-reports — create and query existing reports.}] @parlist[@strong{Support} - @text{ - Thanks to @a[href: "http://www.nsf.gov/"]{the NSF}, - @a[href: "http://www.darpa.mil/"]{DARPA}, - the - @a[href: "http://www.ed.gov/FIPSE/"]{ - Fund for the Improvement of Postsecondary Education (FIPSE)} - at the @a[href: "http://www.ed.gov/"]{US Department of Education}, - the @a[href: '("http://www.exxonmobil.com/Corporate/" - "community_foundation.aspx")]{Exxon Foundation}, - CORD,partners of the Academy of Information Technology, - @a[href: "http://microsoft.com"]{Microsoft}, - @a[href: "http://mozilla.org"]{Mozilla}, - and @a[href: "http://google.com"]{Google} - for their generous support over the years.}]}}) + @thanks]}}) diff --git a/new-racket-web/new-plt-services/meta/new-web/www/css/frontpage-style.css b/new-racket-web/new-plt-services/meta/new-web/www/css/frontpage-style.css index 2d4d1f14f9..f44439ee0b 100644 --- a/new-racket-web/new-plt-services/meta/new-web/www/css/frontpage-style.css +++ b/new-racket-web/new-plt-services/meta/new-web/www/css/frontpage-style.css @@ -3,10 +3,7 @@ We highly recommend you use SASS and write your custom styles in sass/_custom.sc However, this blank file is available if you prefer */ - body { background: url(loud.png) center 60% no-repeat fixed; } - .modal h2, .modal .btn { margin: 10px 0 0px; } - .navbar div ul li a:hover { background: #292929; } b { font-weight: bold; } tt { font-family: "Inconsolata"; } @@ -24,4 +21,10 @@ However, this blank file is available if you prefer @media only screen and (max-width: 767px) { .wide_only { display: none; } .narrow_only { display: block; } -} \ No newline at end of file +} + +.thanks { + margin-top: 2em; + line-height: 1.5em; + font-size: small; + } diff --git a/new-racket-web/new-plt-services/meta/new-web/www/css/scribble.css b/new-racket-web/new-plt-services/meta/new-web/www/css/scribble.css index 23926c8286..1d74eb3141 100644 --- a/new-racket-web/new-plt-services/meta/new-web/www/css/scribble.css +++ b/new-racket-web/new-plt-services/meta/new-web/www/css/scribble.css @@ -15,14 +15,12 @@ color: blue; } .codeimportform { - font-weight: bold; } .codelinkimportid { color: blue; text-decoration: none; } .codelinkimportform { - font-weight: bold; color: black; text-decoration: none; } diff --git a/new-racket-web/new-plt-services/meta/new-web/www/index.rkt b/new-racket-web/new-plt-services/meta/new-web/www/index.rkt index b955d703e2..fa8547ae56 100644 --- a/new-racket-web/new-plt-services/meta/new-web/www/index.rkt +++ b/new-racket-web/new-plt-services/meta/new-web/www/index.rkt @@ -8,7 +8,8 @@ ;; -- use links ;; -- indentation -(require "resources.rkt" "code.rkt" "download.rkt" "learning.rkt" "people.rkt") +(require "resources.rkt" "code.rkt" "download.rkt" "learning.rkt" "people.rkt" + "community.rkt") (define-runtime-path img-dir "img") (define-runtime-path js-dir "js") @@ -445,6 +446,9 @@ discussion channel for all things related to Racket. @p{@people — The people behind Racket.} + +@p{@learning — +Publications and educational resources.} } @@ -507,6 +511,8 @@ File, query, and maybe fix existing reports.}}} @book-image{ @a[href: "http://redex.racket-lang.org/"]{@img[src: (copyfile #:site www-site (build-path img-dir "redex-cover.jpg"))]}} }} + +@columns[12 #:row? #t #:center? #t]{@div[class: "thanks"]{@thanks}} }) (define (slideshow-explain l1 l2) diff --git a/new-racket-web/new-plt-services/meta/new-web/www/learning.rkt b/new-racket-web/new-plt-services/meta/new-web/www/learning.rkt index 6b2bb268ac..d3adb0d013 100644 --- a/new-racket-web/new-plt-services/meta/new-web/www/learning.rkt +++ b/new-racket-web/new-plt-services/meta/new-web/www/learning.rkt @@ -6,22 +6,14 @@ (provide learning) (define learning @page[#:site www-site - #:window-title "Racket Learning" #:part-of 'learning #:width 'full + #:window-title "Racket Research" #:link-title "Research" + #:part-of 'learning #:width 'full #:description - '@{Racket-related learning resources. Introductions to Racket, @; - the Racket Guide, Computer Science textbooks that use Racket, @; - outreach programs, and graduate studies.}]{ + '@{Racket-related research and education: + outreach programs, publications, and graduate studies.}]{ @columns[10 #:row? #t]{ - @parlist[@strong{Resources for Learning} - (apply parlist @text{Documentation for getting started:} intros) - @text{@-htdp — a textbook for introductory programming, but also - worthwhile for experience programmers who are new to “functional - programming.”} - @text{@-plai — a textbook on programming languages.}] - @parlist[@strong{Videos} - @text{See the @-wiki["Videos"] page at the @|-wiki|.}] @parlist[ - @strong{Outreach} + @strong{Education and Outreach} @text{@-pbd — a workshop to train teachers using @-htdp in the classroom.} @text{@-bootstrap — a curriculum for middle-school students.}] diff --git a/new-racket-web/new-plt-services/meta/new-web/www/new-name.rkt b/new-racket-web/new-plt-services/meta/new-web/www/new-name.rkt index 212b7c13fa..acf144fd5b 100644 --- a/new-racket-web/new-plt-services/meta/new-web/www/new-name.rkt +++ b/new-racket-web/new-plt-services/meta/new-web/www/new-name.rkt @@ -1,6 +1,7 @@ #lang plt-web -(require "resources.rkt") +(require "resources.rkt" + plt-web/style) (define name i) @@ -48,6 +49,8 @@ #:title "From PLT Scheme to Racket"]{ @styles + @columns[9 #:row? #t]{ + @heading{PLT Scheme is a Racket} @nested{Sure, it has parentheses, uses the keyword @tt{lambda}, provides @@ -167,4 +170,4 @@ it has a vague connection to the word “scheme.” Mostly, though, we just like it.}} - }}) + }}}) diff --git a/new-racket-web/new-plt-services/meta/new-web/www/techreports.rkt b/new-racket-web/new-plt-services/meta/new-web/www/techreports.rkt index bf34a81ce8..96b68070d2 100644 --- a/new-racket-web/new-plt-services/meta/new-web/www/techreports.rkt +++ b/new-racket-web/new-plt-services/meta/new-web/www/techreports.rkt @@ -2,7 +2,8 @@ ;; New style TR entries -(require "resources.rkt" "people.rkt" "../download/data.rkt") +(require "resources.rkt" "people.rkt" "../download/data.rkt" + plt-web/style) (define (-all-techreports-) (list (TR 1 'reference "Reference: Racket" '(mflatt plt) @@ -93,6 +94,7 @@ (provide techreports) (define techreports @page[#:site www-site #:file "tr/" #:title "PLT Technical Reports" #:part-of 'learning]{ + @columns[10 #:row? #t]{ @p*{ @~ For citations of generic pieces of the Racket infrastructure, please use @TT{\cite{plt-tr1}}, @TT{\cite{plt-tr2}}, etc. in LaTeX, or @@ -102,4 +104,4 @@ @TT{\cite[Version M.N]{plt-tr1}} or @TT|{@cite[(in-bib plt-tr1 "Version M.N")]}| instead.} - @dl{@(add-newlines (-all-techreports-))}}) + @dl{@(add-newlines (-all-techreports-))}}}) diff --git a/new-racket-web/plt-web-pkgs/plt-web-lib/layout.rkt b/new-racket-web/plt-web-pkgs/plt-web-lib/layout.rkt index 134cb734b4..a0bfbfe531 100644 --- a/new-racket-web/plt-web-pkgs/plt-web-lib/layout.rkt +++ b/new-racket-web/plt-web-pkgs/plt-web-lib/layout.rkt @@ -304,8 +304,7 @@ #:site the-site content)) dir robots htaccess - (or page-style? - (pair? navigation)) + page-style? meta? (and sharing-site #t)) diff --git a/new-racket-web/plt-web-pkgs/plt-web-lib/resources/css/gumby-slice.css b/new-racket-web/plt-web-pkgs/plt-web-lib/resources/css/gumby-slice.css index 28721c8a46..fccf02379c 100644 --- a/new-racket-web/plt-web-pkgs/plt-web-lib/resources/css/gumby-slice.css +++ b/new-racket-web/plt-web-pkgs/plt-web-lib/resources/css/gumby-slice.css @@ -1,4 +1,5 @@ @charset "UTF-8"; +@import url(http://fonts.googleapis.com/css?family=Open+Sans:400); /* for navbar links */ /** * Gumby Framework * --------------- @@ -16,13 +17,18 @@ * Free to use under the MIT license. * http://www.opensource.org/licenses/mit-license.php * -* This file is just enough of "gumby.css" to make the navigationless -* header work. +* This file is just enough of "gumby.css" to make the header work +* without any buttons and without much size adaptation. */ -/* Banner needs 0 margin for body: */ +/* Navbar needs 0 margin for body: */ body { margin: 0px; padding: 0px; } +/* In case the navbar has links: */ +.gumby-content { font-family: "Open Sans"; font-weight: 400; } +.gumby-content a { color: #d04526; text-decoration: none; outline: 0; line-height: inherit; } +.navbar div ul li a:hover { background: #292929; } + .gumby-content { background: white; color: #1e1e1e; position: relative; -webkit-font-smoothing: antialiased; } @media only screen and (max-width: 767px) { .gumby-content { -webkit-text-size-adjust: none; -ms-text-size-adjust: none; width: 100%; min-width: 0; } } diff --git a/new-racket-web/plt-web-pkgs/plt-web-lib/resources/css/gumby.css b/new-racket-web/plt-web-pkgs/plt-web-lib/resources/css/gumby.css index 677cb2da9c..d0ff9db63d 100644 --- a/new-racket-web/plt-web-pkgs/plt-web-lib/resources/css/gumby.css +++ b/new-racket-web/plt-web-pkgs/plt-web-lib/resources/css/gumby.css @@ -98,7 +98,7 @@ p { font-family: "Open Sans"; font-weight: 400; color: black; font-size: 16px; f p.lead { font-size: 20px; font-size: 1.25rem; margin-bottom: 18px; } @media only screen and (max-width: 768px) { p { font-size: 17.6px; font-size: 1.1rem; line-height: 1.625em; } } -a { color: #d04526; text-decoration: none; outline: 0; line-height: inherit; } +a { color: rgba(44, 33, 206, 1); text-decoration: none; outline: 0; line-height: inherit; } a:hover { color: #c03d20; } /*===================================================== @@ -352,6 +352,7 @@ img { -ms-interpolation-mode: bicubic; } /*===================================================== Navigation (with dropdowns) ======================================================*/ +.navbar div ul li a:hover { background: #292929; } /* Racket customization */ .navbar { width: 100%; min-height: 60px; display: block; margin-bottom: 20px; background: black; } @media only screen and (max-width: 767px) { .navbar { position: relative; border: none; } .navbar .column, .navbar .columns { min-height: 0; } }