From 82a5103bccbc2ca45cff5a2ed6ae71aecc8af0c7 Mon Sep 17 00:00:00 2001 From: Levi Morrison Date: Mon, 2 Jul 2012 16:00:55 -0600 Subject: [PATCH] Aligned most elements to a typographic grid. Increased base font-size to 1em (16px, from 14px). Thinned the thick borders down a bit. General typographic improvements. Documentation pages benefit heavily from the changes. --- images/sprites.png | Bin 9633 -> 8985 bytes styles/doc.css | 174 +++++++++++++++++++++++++++------------------ styles/home.css | 128 +++++++++++++-------------------- styles/theme.css | 72 +++++++++---------- 4 files changed, 186 insertions(+), 188 deletions(-) diff --git a/images/sprites.png b/images/sprites.png index 9b3ff7532b24e2242440a9f1f0db6d5faa5067a2..9721fce0a0071b18d7d3b6fdc91f0dfcb7a0306f 100644 GIT binary patch delta 5356 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 aaX~$yuALI;I;wyjGBdF>zHR7q=Dz`oUMfHU diff --git a/styles/doc.css b/styles/doc.css index 62de94183..ab24f5ea5 100755 --- a/styles/doc.css +++ b/styles/doc.css @@ -39,6 +39,16 @@ aside#quicktoc { /* }}} */ +.docs .classsynopsis:before, +.docs div.refsect1:before, +.docs div.warning:before { + content:" "; + position:absolute; + top:0; + left:0; + right:0; + bottom:0; +} /* {{{ General styles (p, parameters, initializers, ...) */ .docs .methodname b, .docs .methodname strong { color: #000; @@ -47,6 +57,10 @@ aside#quicktoc { .docs .refsect1 .methodparam .parameter { cursor:pointer; } +.docs .refsect1 dt, +.docs .refsect1 p { + height:1.5em; +} .docs .parameter { color: #336; @@ -93,13 +107,16 @@ aside#quicktoc { .docs div.warning b.warning, .docs div.tip strong.tip, .docs div.warning strong.warning { - font-size: 1.7em; + font-size: 1.5em; + line-height: 2; + display:block; + text-align: center; } .docs div.tip p, .docs div.warning p { - padding-left: 60px; - text-align: justify; + padding-left: 1em; + text-align: left; } .docs div.warning div.example-contents { @@ -119,22 +136,31 @@ aside#quicktoc { .docs div.tip, .docs div.warning { - text-align: center; - margin: 20px 2% 20px 2%; - padding: 5px 15px 5px 45px; - min-height: 100px; + position: relative; + z-index:10; + margin: 1.5em; + padding: 1.5em 1.5em 1.5em 92px; + min-height: 96px; background-position: 16px; } +.docs div.tip:before, +.docs div.warning:before { + z-index:-1; + top:-.25em; + border-top:.25em solid; +} .docs div.warning { - border-top: 3px solid #9f8a8a; - border-bottom: 1px solid #9f8a8a; background: #f2e5f4 url('/images/dialog-warning.png') left center no-repeat; } +.docs div.warning:before { + border-color:#9f8a8a; +} .docs div.tip { - border-top: 3px solid #9999EE; - border-bottom: 1px solid #9999EE; background: #efefef url('/images/dialog-information.png') left center no-repeat; } +.docs div.tip:before { + border-color:#99e; +} .docs div.warning h1{ font-size: 1.4em; @@ -144,34 +170,47 @@ aside#quicktoc { .docs .refentry .methodsynopsis { color: #666; font-family: monospace; - font-size:1.167em; /* bumps it back up to the rest of the fonts because monospace is smaller */ + font-size:1.230769em; /* bumps it back up to the rest of the fonts because monospace is smaller */ } /* {{{ Parameter listing */ .docs .refentry .parameters dl { - margin-top: -10px; - margin-bottom: -10px; + margin-bottom:0; } -.docs .refentry .parameters dt { - font-size: 1.167em; + +.docs .refentry .parameters dl dd + dt { + margin-top:1.5em; +} + +.docs .refentry .parameters dl dt code.parameter { + font-size:1.23076em; +} +.docs .refentry .parameters dl, +.docs .refsect1.examples .title + p.para + * { + margin-top:-4.5em; /* there's a p tag that has whitespace (not :empty). This simply covers it up */ +} +.docs .refsect1.returnvalues .title + p.para { + margin-top:0; } /* }}} */ /* {{{ Examples (highlighting is in theme.css) */ -/*.docs blockquote.note, -.docs div.caution, -.docs div.tip -.docs .example-contents div pre,*/ -.docs .example-contents div.phpcode, +.docs .example-contents .phpcode code, +.docs .refentry .methodsynopsis, .docs .example-contents.screen, -.docs .refentry .methodsynopsis { - border: 1px solid #CCCCCC; +.docs .refentry .methodsynopsis { + border: 1px solid #ccc; background-color: #fff; - margin: 2px 0px; - font-weight: normal; - padding: .5em; + padding: 1.5em; +} +.docs .example-contents .phpcode code { + font-size:.923em; + line-height: 2; + display: block; + margin:-1px 0; + padding:2em; } /* }}} */ @@ -235,11 +274,6 @@ dl.qandaentry { } /* }}} */ -.docs div.refnamediv { - border-bottom: 3px solid #81939f; - position: relative; -} - .docs div.sect1, .docs div.partintro { position: relative; } @@ -251,43 +285,42 @@ dl.qandaentry { color: #999; } -.docs h1.refname { - font-size: 1.334em; - line-height: 1.049em; - margin-bottom:1.4em; - color:#444; - font-weight:bold; -} - +.docs h1.refname, .docs p.refpurpose { - color: #454e55; + color: #444; } -.docs div.refsect1 h3.title { - border: 0; - color: #454e55; +.docs div.refsect1 h3.title { + color: #444; position: absolute; - padding: 0; - margin:0; - line-height: 1em; - top:-1.4em; + top:-2em; left: 0; - font-size: 1.4em; } -.docs div.refsect1 { - margin-top: 50px; - color: #454e55; +.docs .refsect1 { + margin-top: 4.5em; + color: #444; +} + +.docs .refsect1 > p:last-child, +.docs .refsect1 > .warning:last-child, +.docs .refsect1 > .tip:last-child { + margin-bottom:0; } .docs .classsynopsis, .docs div.refsect1 { position: relative; background-color: #f5f5f5; - border: 1px solid #cacaca; - padding: 10px; + padding: 1.5em .75em; } +.docs .classsynopsis:before, +.docs div.refsect1:before { + top:-.25em; + border-top: .25em solid #cacaca; + z-index: -1; +} .docs .classsynopsis { color: #454e55; } @@ -342,51 +375,50 @@ dl.qandaentry { } .docs .layout-menu ul.parent-menu-list li { - padding: 3px 6px; - margin: 3px 0; + padding: 0 .5em; + margin: 1.5em 0; } +.docs .layout-menu ul.parent-menu-list > li:first-child { + margin-top:0; +} .docs .layout-menu ul.parent-menu-list a { - font-size: 14px; - line-height: 1.5; color: #444; margin: 0; - padding: 3px 7px; + padding:0 .5em; border: 0; - border-left: 6px solid #7F7FB2; + border-left: .25em solid #7F7FB2; } .docs .layout-menu ul.parent-menu-list a:hover, .docs .layout-menu ul.parent-menu-list li:last-child a { color: #000; - border-left: 6px solid #666699; + border-left: .25em solid #666699; } .docs .layout-menu ul.child-menu-list { margin: 0; - padding: 10px 5px 10px 12px; - border-top: 3px solid #fff; + padding:1.5em 0 1.5em .25em; border: 0; } .docs .layout-menu ul.child-menu-list li { - font-size: 14px; list-style-type: none; - margin: 0; - padding: 4px 8px; + margin: 0 .5em -1px; + padding:0; border: 0; border-bottom: 1px dotted #aaa; - background-color: transparent; } .docs .layout-menu ul.child-menu-list a { - font-size: 13px; - border: 0; + font-size: .75em; + line-height: 2; color: black; - line-height: 1; overflow: visible; - margin: 0; - padding: 0; +} + +.docs .layout-menu ul.child-menu-list .current a:before { + content:"\bb \20"; } .docs .layout-menu ul.child-menu-list a:hover, diff --git a/styles/home.css b/styles/home.css index 4ccc92ca8..908d82c6f 100644 --- a/styles/home.css +++ b/styles/home.css @@ -6,19 +6,20 @@ complimentary greens: 9FB553 7B8851 61761B C6DA82 CCDA99 #mega-drop-down div.what-is-php { color: #eee; - font-size: 1.334em; - line-height: 1.573em; + font-size: 1.125em; + line-height: 1.333em; width: 500px; float: left; - padding:1em 0 0; } -#mega-drop-down .what-is-php p { - margin-bottom: 1em; +#mega-drop-down div.what-is-php p { + margin:1.333em 0; } - #mega-drop-down .what-is-php .tutorial { text-align: center; + font-size: 1.111em; + line-height: 1.2; + margin:1.2em 0; } #mega-drop-down .what-is-php .tutorial a { background: #669; @@ -28,7 +29,8 @@ complimentary greens: 9FB553 7B8851 61761B C6DA82 CCDA99 -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; - padding: 0 2em .1em; + padding: .6em 1.2em; + margin-bottom:-3px; display: block; border: 1px solid rgba(0,0,0,.9); border-bottom-width:3px; @@ -48,33 +50,23 @@ complimentary greens: 9FB553 7B8851 61761B C6DA82 CCDA99 border-bottom-width:1px; margin-top:2px; } -#mega-drop-down .what-is-php .tutorial a:hover, -#mega-drop-down .what-is-php .tutorial a:focus, -#mega-drop-down .what-is-php .tutorial a:hover:active { -} #mega-drop-down div.download { color: #eee; width: 300px; display: block; float: right; - margin: 5px 20px 10px 0; - padding: 10px; - font-size: 11px; } #mega-drop-down div.download h2 { - font-size: 1.4em; + font-size:1em; + line-height: 3; color: #ddd; text-align: center; - letter-spacing: 2px; - word-spacing: 4px; - line-height: 1.0em; + letter-spacing: .2em; + word-spacing: .4em; text-transform: uppercase; - font-weight: normal; text-shadow: #000 -1px -1px 1px; - margin: 0; - padding: 5px 0 10px 0; } @@ -94,27 +86,21 @@ complimentary greens: 9FB553 7B8851 61761B C6DA82 CCDA99 } #mega-drop-down div.download li:first-child { - padding: 15px 0 15px 120px; - background-image: url('/images/sprites.png'); - background-position: 30px -195px; - background-repeat: no-repeat; + padding: 1em 0 1em 120px; + background: url('/images/sprites.png') no-repeat 10px -195px; margin-top: 0; } -#mega-drop-down div.download li:first-child a:first-child { - font-size: 2em; -} - #mega-drop-down div.download li { color: #eee; display: block; - padding: 15px 0 0 120px; - background-image: url('/images/sprites.png'); - background-position: 44px -280px; - background-repeat: no-repeat; + padding: 1em 0 0 120px; + background: url('/images/sprites.png') no-repeat 24px -273px; cursor: pointer; border-top: 1px solid #555; margin: 0; + font-size:.75em; + line-height: 1; } #mega-drop-down div.download a { @@ -122,17 +108,18 @@ complimentary greens: 9FB553 7B8851 61761B C6DA82 CCDA99 padding-left: 0; display: block; clear: right; - font-size: 1.0em; - line-height: 90%; font-weight: normal; - border-bottom: none; } - +#mega-drop-down div.download li:first-child a:first-child { + font-size: 1.5em; + line-height: 1; +} #mega-drop-down div.download a:first-child { - font-size: 1.6em; + font-size: 1.25em; + line-height: 1.2; font-weight: bold; - color: #FFF; - line-height: 120%; + color: #fff; + text-shadow:0 .1em .1em rgba(0,0,0,.666); } #head-beta-warning { @@ -208,21 +195,14 @@ div.home-content { display: table; width: 100%; background-color: #bfbfff; - padding: 15px; + padding: 1.5em; text-align: center; margin: 0 auto; - font-size: 1.2em; list-style: none; } - -.home .announcements .category { - padding: 1em 0.5em 0; +.home .announcements li + li { + margin-top:1.5em; } - -.home .announcements > li:first-child .category { - padding-top: 0; -} - .home .announcements ul, .home .announcements ul li { list-style: none; margin: 0; @@ -231,20 +211,19 @@ div.home-content { } /* 2x2 Featured Content Grid */ - +div.featured-content div.top-left, +div.featured-content div.top-right { + margin-top:-1.5em; +} div.featured-content div.feature { float: left; width: 270px; padding:0 20px; text-align: center; } -div.featured-content div.top-left, -div.featured-content div.top-right { - margin-top:-24px; /* This aligns the top of the images with the sidebar */ -} div.featured-content div.bottom-left, div.featured-content div.bottom-right { - padding-top:5px; + padding-top:1.5em; } div.featured-content span.graphic { @@ -252,15 +231,16 @@ div.featured-content span.graphic { width: 128px; height: 128px; margin:0 auto; + padding:8px 0; background-image: url('../images/home-sprites.png'); } div.featured-content div.top-left span.graphic { - background-position: 0 0; + background-position: 0 8px; } div.featured-content div.top-right span.graphic { - background-position: 0px -129px; + background-position: 0px -121px; } div.featured-content div.bottom-left span.graphic { @@ -272,8 +252,13 @@ div.featured-content div.bottom-right span.graphic { } .featured-content .feature h3 { - padding-bottom: .5em; text-align: center; + color:#000; + font-weight:bold; +} +.featured-content .feature p { + margin:1.5em 0 0; + color:#333; } /* Right-hand sidebar */ @@ -286,10 +271,9 @@ div.home-sidebar { } div.home-sidebar h3 { - border-bottom: 6px solid #99c; - font-weight: normal; - margin: 1em 0 .5em; - padding:.25em 0; + border-bottom: .25em solid #99c; + margin: 1.2em 0 .95em; + padding:0; } div.home-sidebar h3:first-child { @@ -314,28 +298,14 @@ div.home-sidebar a:hover { position: relative; margin-top:3em; } -.home-content .recentNewsEntries h1 { - color:#000; -} -.home-content a.newsArchiveLink { - position: absolute; - top:.5em; - right:0; - font-style:italic; - border-bottom: 1px solid transparent; - color:#666; -} -.home-content a.newsArchiveLink:hover, -.home-content a.newsArchiveLink:focus { - border-bottom: 1px solid #666; -} .clear-left { clear:left } .home-content .separator { clear: left; - height:3px; + height:.25em; margin-top:3em; + margin-bottom:-.25em; background:#669; } \ No newline at end of file diff --git a/styles/theme.css b/styles/theme.css index 8a5184425..ca517dd63 100755 --- a/styles/theme.css +++ b/styles/theme.css @@ -24,38 +24,35 @@ input { } body { - font-size: 0.9em; - line-height: 1.4em; + font-size: 1em; + line-height: 1.5em; background: url('/images/sprites.png') repeat-x 0px -990px #fff; } h1 { - font-size: 2.374em; - line-height: 1.179em; - margin:0; + font-size: 2em; + line-height: 1.5em; } h2 { - font-size: 1.78em; - line-height: 1.573em; - margin:0; + font-size: 1.5em; + line-height: 2em; } h3 { - font-size: 1.334em; - line-height: 1.049em; - margin: 0; + font-size: 1.25em; + line-height: 1.2em; } p, ul { - margin-top: 0; - margin-bottom: 1.4em; + margin:1.5em 0; } -p:last-child { - margin-bottom: 0; +p:empty { + margin:0; + height:0; + display:none; } small { font-size: 0.75em; } h1, h1 a, h1 a:visited, h1 a:link { - font-weight: normal; color: #666; border-color:#666; } @@ -66,7 +63,6 @@ h1 a:focus { } h2, h2 a, h2 a:visited, h2 a:link { - font-weight: normal; color: #222; border-color:#222; } @@ -79,14 +75,16 @@ h2 a:focus { h3.title { font-size: 1.5em; - border-top: 3px solid; - padding-top: 6px; - margin-top: 2em; + line-height: 2; } -h4 { font-size: 1.3em;} -h5 { font-size: 1.2em;} -h6 { font-size: 1.1em;} +h1, h2, h3, h4, h5, h6 { + font-weight:normal; +} +h4, h5, h6 { + font-size:1em; + color:#000; +} a:link, @@ -107,7 +105,7 @@ ul { #headnav { padding: 0 25px; - height: 72px; + height: 70px; line-height: 1; background: url('/images/sprites.png') repeat-x 0px -100px; } @@ -138,8 +136,8 @@ ul { #headnav #headhome a.menu-link, #headnav #headhome a.menu-link:hover { background: url(/images/sprites.png) 0 0; - width: 170px; - height: 14px; + width: 130px; + height: 16px; text-indent: -2000em; } @@ -160,7 +158,7 @@ ul { display: block; padding: 12px 15px 16px 15px; margin: 0; - border-bottom: 12px solid; + border-bottom: .5em solid; color: #444; border-color: #7F7FB2; font-weight: bold; @@ -337,8 +335,7 @@ ul { } #usernotes h3 { - border-color: #669; - padding:.8em 20px .5em 0; + border-top: 3px solid #669; } #usernotes .note { @@ -363,22 +360,20 @@ ul { /* Definition lists used on eg. the unsub page */ dl dd { - margin: 0.5em 0 0.5em 2em; - padding: 0.5em; + margin:0; + padding:0 1.5em; } dl dd p { - margin-bottom:0; - padding:0; + margin:0; } /* PHP source code highlighting ------------------------------------------- */ code { font-family: monospace; - font-size:1.167em; /* bumps it back up to the rest of the fonts because monospace is smaller */ + font-size:1.230769em; /* bumps it back up to the rest of the fonts because monospace is smaller */ } .phpcode, div.classsynopsis { - padding: 0.5em; text-align: left; } div.phpcode span.html { @@ -431,7 +426,7 @@ pre.info { } #mega-drop-down div.children { - border-bottom-width: 12px; + border-bottom-width: .5em; border-bottom-style: solid; padding-bottom: 1em; } @@ -711,10 +706,11 @@ table.standard td { } .newsItem { - margin:2em 0; + margin:1.5em 0; } .newsItem .published { display:block; - margin:.5em 0; color:#666; + font-size:.75em; + line-height: 2; } \ No newline at end of file