all repos — h3rald @ 2a60817b3e59bd0560863d98e124afb21d710523

The sources of https://h3rald.com

Updated stylesheets, regenerated PDFs.
h3rald h3rald@h3rald.com
Fri, 02 Nov 2012 09:26:49 +0100
commit

2a60817b3e59bd0560863d98e124afb21d710523

parent

de2127b672c9e406042b14c8f761a90461ed1c85

M RulesRules

@@ -62,10 +62,12 @@ when 'bbcode' then

filter :bbcode layout 'default' when 'glyph' then - pdf_file = Pathname.new "#{Dir.pwd}/output#{item.identifier.gsub(/\/$/, '')}.pdf" glyph_config @item - glyph_pdf_for @item unless pdf_file.exist? glyph_article_for @item + if item[:pdf] then + pdf_file = Pathname.new "#{Dir.pwd}/output#{item.identifier.gsub(/\/$/, '')}.pdf" + glyph_pdf_for @item unless pdf_file.exist? + end Glyph.reset end end
M content/articles/glyph-020-released.glyphcontent/articles/glyph-020-released.glyph

@@ -8,7 +8,6 @@ :permalink: glyph-020-released

:title: "Glyph 0.2.0 Released" :subtitle: Featuring single-file compilation, programmatic usage and auto-regeneration, and more :toc: true -:pdf: true :date: 2010-05-09 17:00:00.099000 +02:00 :intro: | I am very pleased to announce the second release of the "Glyph Document Authoring Framework":/glyph/. For those who don't know, Glyph is a pure-Ruby, extensible solution to author documents like books or articles using a simple, fully-customizable markup language.
M content/articles/glyph-030-released.glyphcontent/articles/glyph-030-released.glyph

@@ -8,7 +8,6 @@ :permalink: glyph-030-released

:title: "Glyph 0.3.0 Released" :subtitle: The third release of the Glyph Authoring Framework features dramatic speed improvements, and much more :toc: true -:pdf: true :date: 2010-06-13 14:10:00.000000 +02:00 :intro: | The third release of "Glyph":/glyph/ is out!
M content/articles/glyph-040-released.glyphcontent/articles/glyph-040-released.glyph

@@ -8,7 +8,6 @@ :permalink: glyph-040-released

:title: "Glyph 0.4.0 Released" :subtitle: Featuring web output, HTML5 support, stats, wkhtmltopdf, and much more :toc: true -:pdf: true :date: 2010-09-03 19:45:00.000000 +02:00 :intro: This new release of Glyph introduces an unusually large number of features, improvements and bugfixes. Not so much in terms of new macros maybe (no index or bibliography support for now, but it will come, don't worry!), but rather... pretty much everything else! -----
M content/articles/h3rald-81.glyphcontent/articles/h3rald-81.glyph

@@ -5,7 +5,6 @@ :type: article

:toc: true :date: 2010-09-23 14:04:25.052000 +02:00 :permalink: h3rald-81 -:pdf: true :tags: - website - webdevelopment

@@ -47,7 +46,7 @@ I made a point out of improving the old stylesheet to make the site easier to read and generally prettier. Beauty is in the eye of the beholder, but still, I think the new stylesheet brings some improvements, especially concerning text (the "Gentium":http://scripts.sil.org/gentium font is used throughout the site) and syntax highlighting.

Moreover, I worked on streamlining navigations across different sections of the site, in particular on article pages: -!=\/$[site.root]/img/pictures/h3rald_81_article.png! +image[\/$[site.root]/img/pictures/h3rald_81_article.png] ] ] section[
M content/styles/_content.scsscontent/styles/_content.scss

@@ -142,11 +142,11 @@ }

#body-text section section section section section header h1, #body-text h6 { - font-size: 1em; + font-size: 1.2em; } #main-content h1, #secondary-content h1{ - line-height: 1em; + line-height: 1.2em; } /* Text */

@@ -431,17 +431,6 @@ a:hover {

color: $link-hover-color; } -a[href^="http"]:after { - content: " ➚"; -} - -a.read:after { - content: ""; -} -.social a[href^="http"]:after{ - content: ""; -} - sup { vertical-align: super; font-size: 80%;

@@ -481,3 +470,4 @@ display: block;

font-size: 110%; text-align: center; font-weight: bold; } +
M content/styles/_fonts.scsscontent/styles/_fonts.scss

@@ -1,34 +1,4 @@

/* Fonts */ -@font-face { - font-family: 'Crimson Text'; - src: url('../fonts/CrimsonText-Roman.otf') format('opentype'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'Cardo'; - font-style: normal; - font-weight: 400; - src: url('../fonts/Cardo.woff') format('woff'); -} - -@font-face { - font-family: 'Crimson Text'; - src: url('../fonts/CrimsonText-Italic.otf') format('opentype'); - font-weight: normal; - font-style: italic; -} -@font-face { - font-family: 'Crimson Text'; - src: url('../fonts/CrimsonText-Bold.otf') format('opentype'); - font-weight: bold; - font-style: normal; -} -@font-face { - font-family: 'Crimson Text'; - src: url('../fonts/CrimsonText-BoldItalic.otf') format('opentype'); - font-weight: bold; - font-style: italic; -} +@import url(http://fonts.googleapis.com/css?family=Crimson+Text:400,400italic,700,700italic&subset=latin,latin-ext); +@import url(http://fonts.googleapis.com/css?family=Cardo);
M content/styles/_layout.scsscontent/styles/_layout.scss

@@ -17,93 +17,24 @@ }

/* Logos */ +.logo { font-weight: normal; font-family: "Cardo", "Georgia", serif; margin-bottom: 2px;} +.hrald { display: block; margin-top: 10px; font-size: 50px; } +.h, .rald { font-size: 50px; } +.three { display: block; margin-top: -15px; margin-left: -105px; font-size: 60px; } -.logo { - font-weight: normal; - font-family: "Cardo", "Georgia", serif; -} +h1 .logo { display: block; margin-top: 20px; color: #333333; } +h1 .hrald { display: block; margin-top: 10px; font-size: 75px; } +h1 .h, h1 .rald { font-size: 75px; } +h1 .three { display: block; margin-top: -12px; margin-left: -155px; font-size: 90px; } -.hrald { - display: block; - margin-top: 10px; - font-size: 50px; -} -.h, .rald { - font-size: 50px; -} -.three { - display: block; - margin-top: -15px; - margin-left: -105px; - font-size: 60px; -} +h1 .h_line { border-bottom: 2px solid #333333; margin-top: 3px; margin-left: -4px; width: 52px; display: block;} +h1 .rald_line {border-bottom: 2px solid #333333; margin-top: -2px; margin-left: 87px; width: 209px; display: block;} -h1 { - - .logo { - display: block; - margin-top: 20px; - color: $text-color; - } - - .hrald { - display: block; - margin-top: 10px; - font-size: 75px; - } - - .h, .rald { - font-size: 75px; - } - .three { - display: block; - margin-top: -12px; - margin-left: -155px; - font-size: 90px; - } - - .h_line { - display: block; - border: 1px solid $text-color; - margin-top: 8px; - margin-left: -4px; - width: 52px; - } - - .rald_line { - float: left; - display: block; - border: 1px solid $text-color; - margin-top: -1px; - margin-left: 87px; - width: 209px; - } - - .established { - display: block; - font-weight: bold; - margin:auto; - text-align: center; - font-size: 85%; - .d { - vertical-align: super; - font-size: 72%; - text-decoration: underline; - } - .year { - font-size: 110%; - } - &:before, &:after { - content: "~"; - vertical-align: middle; - font-size: 120%; - } - } - -} - - +h1 .established { display: block; font-weight: bold; margin: auto; text-align: center; margin-top: -4px; font-size: 85%; } +h1 .established .d { vertical-align: super; font-size: 72%; text-decoration: underline; } +h1 .established .year { font-size: 110%; } +h1 .established:before, h1 .established:after { content: "~"; vertical-align: middle; font-size: 120%; } /* Navigation */
M lib/data.glyphlib/data.glyph

@@ -4,55 +4,49 @@ --[-------------------- Macros --------------------------]

def:[h3rald.article| article[ @head[ - style[default.css] style[pagination.css] - <style> - h1 { - font-size: 24px; - } - h2{ - margin-top: 0.2em; - padding-top: 0; - } - q, blockquote { - font-style: italic; - color: #8F6B17; - } - .contents { - text-align:justify; - margin-bottom: 2em; - padding-bottom: 2em; - border-bottom: 1px solid #000; - } - div.caption { - color: #8F6B17; - font-style: italic; - padding: 0; - margin: 0 0.6em; - } + style[../styles/style.css] + <style> +.halftitlepage { + margin: auto; + text-align: center; } - .figure { - padding: 0; - border: 1px solid #ccc; - display: block; - } - .figure img { - margin-bottom: 0; - } - .left { float: left; } - .right { float: right; } - .right, img\[style="float:right;"\], .figure\[style="float:right;"\] { - margin: 1em 0 1em 1em; - } - .left, img\[style="float:left;"\], .figure\[style="float:left;"\] { - margin: 1em 1em 1em 0; - } - @page { - @top { - content: string(book-title); - } - } - </style> + +.halftitlepage h1 { + padding-top: 0; + font-size: 2em; + font-weight: normal; + line-height: 1.2em; + margin-bottom: 0.2em; } +.halftitlepage h2 { + padding-top: 0; + font-style: italic; + font-size: 1.1em; + font-weight: normal; + line-height: 1.2em; + prince-bookmark-level: none; } + +#toc { + display: none; +} + +.author { + font-size: 1em; } + +.pubdate { + font-size: 0.8em; } + +.contents { + page-break-after: always; + } + +h3.toc, h4.toc, h5.toc { + font-weight: normal; + font-size: 150%; + margin-bottom: 1em; + margin-top: 1.5em; +} + </style> ] @pre-title[ =>[http://www.h3rald.com/archives/|image[@width[25%]@height[25%]$[site.root]/images/logo.svg]]