diff --git a/Makefile b/Makefile index ef9e603..072fda0 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ thoughts: -t "Mike Gerwitz's Thoughts and Ramblings" \ -d 'The miscellaneous thoughts and ramblings of a free software hacker' \ -c 'Mike Gerwitz' \ - -l 'Verbatim redistribution of this document in its entirety is permitted so long as this copyright notice is preserved.' \ + -l 'Verbatim redistribution of this document in its entirety is permitted provided that this copyright notice is preserved.' \ -C '/style.css' \ -T "$(PWD)/tpl" \ -E \ @@ -44,8 +44,8 @@ thoughts: # mgify script %.html: %.txt asciidoc -fasciidoc.conf -v \ - -a stylesdir=$(PWD)/asciidoc-themes/ \ - -a themedir=$(PWD)/asciidoc-themes/ \ + -a stylesdir= \ + -a themedir=$(PWD)/ \ $< ./tools/mgify "$@" diff --git a/asciidoc-themes/mg.css b/asciidoc-themes/mg.css deleted file mode 100644 index b67ead9..0000000 --- a/asciidoc-themes/mg.css +++ /dev/null @@ -1,86 +0,0 @@ - -body { - margin: 0px 5em; - text-align: justify; -} - -#header, #footer, #footnotes { - position: relative; - left: -3em; - margin-right: -3em; -} - -body p { - line-height: 1.5em; -} - -h2 { - position: relative; - - border-bottom: 2px solid #babdb6; - left: -2em; - - margin-right: -2em; -} - -h3 { - border-bottom: 1px solid #babdb6; -} - -h2, h3, h4 { - margin-bottom: 0.5em; -} - -dt { - font-weight: bold; -} -dd > p:first-child { - margin-top: 0; -} - -tt { - background-color: #eeeeec; - color: #000055; -} - -#author { - font-size: 1.1em; -} - -.listingblock { - background-color: #eeeeec; - padding: 0.5em; -} - -#gnuinside { - position: absolute; - display: block; - - top: 0px; - right: 0px; - width: 50px; - height: 50px; -} - -#copyright { - text-align: center; - margin-top: -1.4em; - font-size: small; -} - -.footnote { - font-size: small; -} - -.exampleblock { - margin-left: 2em; - padding-left: 1em; - border-left: 5px solid #eeeeec; -} - -#footer { - border-top: 2px solid #babdb6; - padding-top: 0.5em; - - font-size: small; -} diff --git a/asciidoc.conf b/asciidoc.conf index c055811..fa5576b 100644 --- a/asciidoc.conf +++ b/asciidoc.conf @@ -6,7 +6,7 @@ textwidth=80 newline=\n [attributes] -theme=mg +theme=style stylesdir=./stylesheets linkcss=1 disable-javascript=1 diff --git a/images/cross_scratches.png b/images/cross_scratches.png new file mode 100644 index 0000000..fb63f12 Binary files /dev/null and b/images/cross_scratches.png differ diff --git a/style.css b/style.css index 2e42508..2041174 100644 --- a/style.css +++ b/style.css @@ -7,9 +7,11 @@ body { a { color: #0066cc; } a:visited { color: #6666cc; } -/* hanging */ -header, footer { +/* hanging; ids for asciidoc styling */ +header, footer, +#header, #footer, .article #copyright { margin: 0em -3em; + text-align: left; } h1, h2, h3 { @@ -28,10 +30,13 @@ h2.date { margin-bottom: 1.5em; } -h1.title { +/* latter for asciidoc-generated output */ +h1.title, +#header h1 { font-size: 2em; margin-bottom: 0.1em; } + h2.desc { font-size: 0.8em; text-transform: uppercase; @@ -50,6 +55,29 @@ p.ref { font-size: 0.9em; } +dt { + letter-spacing: 0.1em; +} + +tt { + background-color: #eeeeec; + color: #000055; +} + +.listingblock { + background-color: #eeeeec; + background-image: url('images/cross_scratches.png'); + padding: 0.5em; + border: 1px solid #babdb6; + border-radius: 0.25em +} + +.exampleblock { + margin-left: 2em; + padding-left: 1em; + border-left: 5px solid #eeeeec; +} + #gnuinside { position: absolute; display: block; @@ -60,7 +88,7 @@ p.ref { height: 50px; } -footer { +footer, #footer, .article #copyright { font-size: 0.9em; margin-top: 2em; } @@ -88,3 +116,32 @@ footer .commit-id { .bimgs img:first-child { margin-left: 0em; } + + +/** exclusively asciidoc-generated content styling **/ +body.article h2 { + position: relative; + + border-bottom: 2px solid #babdb6; + left: -2em; + + margin-right: -2em; +} + +body.article h3 { + border-bottom: 1px solid #babdb6; +} + +#author { + font-size: 1.1em; + letter-spacing: 0.1em; +} + +#footer { + border-top: 2px solid #babdb6; + padding-top: 0.5em; +} + +.article #copyright { + margin-top: 0; +} diff --git a/tools/footer.tpl b/tools/footer.tpl index 0130e2c..0bdf172 100644 --- a/tools/footer.tpl +++ b/tools/footer.tpl @@ -3,9 +3,8 @@