diff --git a/Makefile b/Makefile index 7c99090e..e99be87a 100644 --- a/Makefile +++ b/Makefile @@ -319,7 +319,9 @@ css: mkdir -p $(TMPDIR)/images cp -f $(DXSL)/$(MANUAL).css $(TMPDIR)/$(MANUAL).css echo "AddCharset UTF-8 .txt" > $(TMPDIR)/.htaccess - cd $(DIMG) ; cp caution.png home.gif important.png next.gif note.png prev.gif tip.png up.gif warning.png $(TMPDIR)/images + #cd $(DIMG) ; cp caution.png home.png important.png next.png note.png prev.png tip.png up.gif warning.png $(TMPDIR)/images + cd $(DIMG) ; cp caution.png important.png note.png tip.png up.gif warning.png $(TMPDIR)/images + cd png ; cp home.png next.png prev.png $(TMPDIR)/images ####################################################################### # $ make html # update all HTML in $(TMPDIR) diff --git a/debian/changelog b/debian/changelog index 21cb6844..df99df37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,13 @@ -debian-reference (2.55) UNRELEASED; urgency=medium +debian-reference (2.55) unstable; urgency=medium * Fix listing. Closes: #764994 * Typo fixes and rephrases by Holger Wansing (fixed in 2.54) but missed. Closes: #733151, #736997, #737660, #738570, #750501, #756236 + * Update CSS matching other Debian pages. Thanks, Stéphane + Blondon reporting #761611. - -- Osamu Aoki Mon, 13 Oct 2014 15:14:03 +0900 + -- Osamu Aoki Tue, 14 Oct 2014 21:44:38 +0900 debian-reference (2.54) unstable; urgency=medium diff --git a/png/home.png b/png/home.png new file mode 100644 index 00000000..b4889283 Binary files /dev/null and b/png/home.png differ diff --git a/png/next.png b/png/next.png new file mode 100644 index 00000000..52ffbc32 Binary files /dev/null and b/png/next.png differ diff --git a/png/prev.png b/png/prev.png new file mode 100644 index 00000000..83c9aac7 Binary files /dev/null and b/png/prev.png differ diff --git a/xslt/debian-reference.css b/xslt/debian-reference.css index 285864ac..597517c5 100644 --- a/xslt/debian-reference.css +++ b/xslt/debian-reference.css @@ -1,10 +1,117 @@ /* Cascading stylesheet for the Debian Installer Installation Guide */ -/* Use grey background for examples */ -pre.screen { - background-color : #E0E0E0; +/* global style of the page */ +body { + background-color: #EEEEEE; + border: 40px solid #EEEEEE; + margin: 0; + padding: 0 10px; + font-family: "liberation sans", "Myriad ", "Bitstream Vera Sans", "Lucida Grande", "Luxi Sans", "Trebuchet MS", helvetica, verdana, arial, sans-serif; + line-height: 1.2em; } -code.literal { - background-color : #E0E0E0; +body > div.book, body > div.article, body > div.set, body > div.preface, body > div.chapter, body > div.section, body > div.appendix, body > div.part { + margin-top: 0; + padding: 2em 6em 6em; } +body > div.book, body > div.article, body > div.set, body > div.preface, body > div.chapter, body > div.section, body > div.appendix, body > div.part { + padding: 2em; +} + +body > div.book, body > div.article, body > div.set, body > div.preface, body > div.chapter, body > div.section, body > div.appendix, body > div.part, body > div.index { + background-color: #FFFFFF; + margin: 40px auto 4em; + padding: 1px 40px 20px 30px; +} + +@media (max-width: 1024px) { + body > div.book, body > div.article, body > div.set, body > div.preface, body > div.chapter, body > div.section, body > div.appendix, body > div.part, body > div.index { + max-width: 45em; + } +} +@media (min-width: 1025px) { + body > div.book, body > div.article, body > div.set, body > div.preface, body > div.chapter, body > div.section, body > div.appendix, body > div.part, body > div.index { + max-width: 70em; + } +} + +hr { + border-top: 1px dotted #808080; + margin: 0; +} + +a:link { + color: #0035C7; + text-decoration: none; +} +a:visited { + color: #00207A; + text-decoration: none; +} +a:link:hover { + color: #00207A; + text-decoration: underline; +} + +code { + font-family: "liberation mono","bitstream vera mono","dejavu mono",monospace; + font-weight: bold; + word-wrap: break-word; +} + +h1 { + color: #C70036; +} + +h2, h3, h4, h5, h6 { + color: #C70036; +} + + +/* for first page */ +.book > .titlepage h1.title { + text-align: center; +} +.titlepage h1.title { + text-align: left; +} + +.authorgroup div { + text-align: center; +} + + +/* table in content */ + +.informaltable table { + border: 1px solid #AAAAAA; +} + +.informaltable table th { + border-width: 0; + background-color: #CC0000; +} + +.informaltable table td { + border-width: 0; +} + + +/* Terminal examples */ +pre.screen { + -moz-tab-size: 4; + background-color: #F5F5F5; + border-radius: 11px 11px 11px 11px; + border-style: none; + box-shadow: 0 2px 5px #AAAAAA inset; + color: #000000; + display: block; + font-family: "liberation mono","bitstream vera mono","dejavu mono",monospace; + font-size: 0.9em; + margin-bottom: 1em; + padding: 0.5em 1em; + page-break-inside: avoid; + white-space: pre-wrap; + word-wrap: break-word; +} + diff --git a/xslt/style-html.xsl b/xslt/style-html.xsl index 67bf6e81..6e3eb4ad 100644 --- a/xslt/style-html.xsl +++ b/xslt/style-html.xsl @@ -27,6 +27,7 @@ +.png 4