Index: tags-html.rkt ================================================================== --- tags-html.rkt +++ tags-html.rkt @@ -86,11 +86,11 @@ (define html-item (default-tag-function 'li)) (define html-section (default-tag-function 'h2)) (define html-subsection (default-tag-function 'h3)) (define html-newthought (default-tag-function 'span #:class "newthought")) -(define (html-sep) '(hr)) +(define (html-sep) '(hr [[class "sep"]])) (define html-caps (default-tag-function 'span #:class "caps")) (define html-center (default-tag-function 'div #:style "text-align: center")) (define html-strike (default-tag-function 'span #:style "text-decoration: line-through")) (define html-dialogue (default-tag-function 'dl #:class "dialogue")) (define html-mono (default-tag-function 'samp)) Index: web-extra/martin.css.pp ================================================================== --- web-extra/martin.css.pp +++ web-extra/martin.css.pp @@ -431,21 +431,24 @@ p + p { text-indent: 1em; } -section.entry-content blockquote { +.entry-content blockquote, +.content-block-main blockquote { font-size: ◊x-lineheight[0.7]; line-height: ◊derive-lineheight[7 #:per-lines 6]; margin: ◊x-lineheight[1.0] 2em; } -section.entry-content blockquote:first-child { +.entry-content blockquote:first-child, +.content-block-main blockquote:first-child { margin-top: 0; } -section.entry-content blockquote footer { +.entry-content blockquote footer, +.content-block-main blockquote footer { margin-top: ◊x-lineheight[0.5]; text-align: right; width: calc(100% + 2em); } @@ -452,11 +455,11 @@ .entry-content h2, .content-block-main h2 { font-size: 1rem; font-weight: normal; font-feature-settings: "smcp" on; text-transform: lowercase; - text-align: right; + text-align: left; padding-top: 0.2rem; border-top: dotted #ccc 2px; color: #666; line-height: ◊x-lineheight[0.96]; } @@ -463,23 +466,24 @@ @media(min-width: 667px) { .entry-content h2, .content-block-main h2 { float: left; margin-left: -8rem; + text-align: right; width: 7rem; - margin-top: -0.2rem; + margin-top: -0.25rem; } } -.entry-content hr, .content-block-main hr { +hr.sep { border: 0; background: none; margin: ◊x-lineheight[1] 0; height: ◊x-lineheight[1]; } -.entry-content hr:after, .content-block-main hr:after { +hr.sep:after { display: block; text-align: center; content: '❧'; font-size: ◊x-lineheight[1]; } @@ -497,21 +501,36 @@ p.pause-before { margin-top: ◊x-lineheight[2]; text-indent: 0; } -section.entry-content ul, -section.entry-content ol { - margin: ◊x-lineheight[0.5] 0 ◊x-lineheight[0.5] 0; +.entry-content ul, +.entry-content ol, +.content-block-main ul, +.content-block-main ol { + margin: ◊x-lineheight[0.5] 0 ◊x-lineheight[0.5] 0.6rem; padding: 0; } -section.entry-content li { +.entry-content li, +.content-block-main li { margin: 0 0 ◊x-lineheight[0.5] 0; padding: 0; text-indent: 0; } + +.entry-content ul, +.content-block-main ul { + list-style: none; +} + +.entry-content ul li:before, +.content-block-main ul li:before { + content: '•'; + margin-left: -0.4rem; + margin-right: 0.2rem; +} code { font-size: 0.75rem; font-family: ◊mono-font; background: #ddd; @@ -565,11 +584,12 @@ font-size: .8rem; margin-top: -◊x-lineheight[0.5]; margin-bottom: ◊x-lineheight[1]; } -section.entry-content figure { +.entry-content figure, +.content-block-main figure { margin: ◊x-lineheight[1] 0; padding: 0; } figure>a { @@ -655,10 +675,15 @@ div.further-notes>h2 { font-style: normal; font-feature-settings: "smcp" on; border-top: solid 2px ◊color-bodytext; text-transform: lowercase; + + color: ◊color-bodytext; + margin-top: 0; + float: none; + text-align: left; } div.note h3 { margin-top: 0; font-size: 1rem;