From 43b40a182af1578e9f5bfd78e980ce9aea660d59 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 4 Feb 2016 07:20:11 +0200 Subject: Style updates for web --- common.css | 49 ++++++++++++++++++++++++++++++++++++++++--------- intro.css | 1 + man.css | 6 +++++- web-epilogue.xhtml | 7 +++++++ web-prologue.xhtml | 33 +++++++++++++++++++++++++++++++++ web.css | 28 +++++++++++++++++++++++++++- web.xhtml | 3 ++- 7 files changed, 115 insertions(+), 12 deletions(-) create mode 100644 web-epilogue.xhtml create mode 100644 web-prologue.xhtml diff --git a/common.css b/common.css index 483a50d..dc1cd16 100644 --- a/common.css +++ b/common.css @@ -34,17 +34,21 @@ body {min-width: 17em;} background: rgba(0, 0, 0, 0.04); border-bottom: 1px solid rgba(0, 0, 0, 0.2); - padding: .3em 0 .3em 0; + padding: .4em 0 .42em 0; margin: 0 0 1.4em 0; } #header { /* Same as in #content. */ - max-width: 40em; + max-width: 41em; margin: 0 auto 0 auto; padding: 0 .4em 0 .4em; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + width: 100%; display: table; border: none; @@ -62,9 +66,18 @@ body {min-width: 17em;} #header-logo {text-align: left;} #header-menu {text-align: right;} -/* These overlap with #header's padding when no margin left, FSR. */ -#header-logo {padding-left: .25em;} -#header-menu {padding-right: .25em;} +/* These overlap with #header's margin because of border collapsing. */ +#header-logo {padding-left: .4em;} +#header-menu {padding-right: .4em;} + +#header-logo a +{ + color: #000; + text-decoration: none; + outline: none; +} +#header-logo a:visited {color: #000;} +#header-logo a:hover, #header-logo a:active {color: #000;} #header-menu a { @@ -73,9 +86,14 @@ body {min-width: 17em;} text-align: right; margin-left: 1em; white-space: nowrap; + letter-spacing: 0; } -#header-menu a {color: #000;} +#header-menu a +{ + color: #000; + outline: none; +} #header-menu a:visited {color: #000;} #header-menu a:hover, #header-menu a:active { @@ -116,9 +134,13 @@ body {min-width: 17em;} #content { - max-width: 40em; + max-width: 41em; margin: 0 auto 0 auto; - padding: 0 .4em 0 .4em; /* Space between text and browser frame. */ + padding: 0 .4em 0 .4em; /* Space between text and browser frame. */ + + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } /* @@ -131,8 +153,16 @@ body {min-width: 17em;} font-size: 0.7223em; line-height: 1.3em; margin: 2.2em 0 1em 0; - text-align: center; + text-align: center; +} + +#footer a +{ + color: #767676; + text-decoration: underline; } +#footer a:visited {color: #767676;} +#footer a:hover, #footer a:active {color: #3870c0;} /* Screen size indicator in the footer. The before/after content is in case we don't have any content in the footer. Margin is to actually see the @@ -176,6 +206,7 @@ body {min-width: 17em;} */ p, li, dd {text-align: justify;} +pre {text-align: left;} /* If it is inside li/dd. */ a { diff --git a/intro.css b/intro.css index ebc4642..d0761e5 100644 --- a/intro.css +++ b/intro.css @@ -13,6 +13,7 @@ #content { + max-width: 43.6em; padding-left: 3em; /* Reserve for headings. */ } diff --git a/man.css b/man.css index 50daf6c..edce511 100644 --- a/man.css +++ b/man.css @@ -10,7 +10,11 @@ * */ -#content { padding-left: 1.5em; /* Reserve for the heading. */} +#content +{ + max-width: 42.1em; + padding-left: 1.5em; /* Reserve for the heading. */ +} h1 { diff --git a/web-epilogue.xhtml b/web-epilogue.xhtml new file mode 100644 index 0000000..831421d --- /dev/null +++ b/web-epilogue.xhtml @@ -0,0 +1,7 @@ + + + + + + diff --git a/web-prologue.xhtml b/web-prologue.xhtml new file mode 100644 index 0000000..e132fcb --- /dev/null +++ b/web-prologue.xhtml @@ -0,0 +1,33 @@ + + + + + + + $title$ + + + + + +
+ +
+ +
diff --git a/web.css b/web.css index 0d2fdf3..50d78a1 100644 --- a/web.css +++ b/web.css @@ -20,10 +20,36 @@ } } +#header-logo {font-size: 1.2em;} +#header-logo code {background-color: #fff; color: #333;} + h1 { font-weight: normal; font-size: 2em; line-height: 1.4em; - margin: 1.6em 0 .6em 0; + margin: 1.6em 0 1em 0; +} + +h1 code {font-size: 1em;} + +h2 +{ + font-weight: normal; + font-size: 1.556em; + line-height: 1.4em; + margin: 1.6em 0 1em 0; +} + +/* This one is used for FAQ questions. A hack to avoid separate style file. */ +h3 +{ + font-weight: normal; + font-size: 1.223em; + line-height: 1.4em; + letter-spacing: 0; + margin: 2.4em 0 1em 0; + + padding-left: .4em; + border-left: 3px solid #ccc; } diff --git a/web.xhtml b/web.xhtml index 12f4dff..e1d78c7 100644 --- a/web.xhtml +++ b/web.xhtml @@ -40,7 +40,8 @@
- + -- cgit v1.1