From a34ce4ac7de39d334b9dcc43a4d394723ab9447a Mon Sep 17 00:00:00 2001 From: Nate Goldman Date: Fri, 1 Sep 2017 23:25:39 -0700 Subject: [PATCH] 1.0.0-beta --- package.json | 2 +- serif.css | 59 +++++++++++++++++++++++---------------------------- style.css | 60 +++++++++++++++++++++++----------------------------- 3 files changed, 53 insertions(+), 68 deletions(-) diff --git a/package.json b/package.json index 5cda8f6..59c0ccf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "style.css", "description": "Classless stylesheet for markdown documents.", - "version": "1.0.0-alpha-8", + "version": "1.0.0-beta", "author": "Nate Goldman ", "bugs": { "url": "https://github.com/ungoldman/style.css/issues" diff --git a/serif.css b/serif.css index e1cadc2..2e28c54 100644 --- a/serif.css +++ b/serif.css @@ -1,10 +1,10 @@ -/*! style.css v1.0.0-alpha-8 | ISC License | https://github.com/ungoldman/style.css */ +/*! style.css v1.0.0-beta | ISC License | https://github.com/ungoldman/style.css */ html { color: #303030; background-color: white; box-sizing: border-box; font-family: charter, constantia, "lucida bright", lucidabright, "lucida serif", lucida, "dejavu serif", "bitstream vera serif", "liberation serif", georgia, serif; - font-size: calc(16px + 0.25vw); + font-size: calc(14px + 0.25vw); line-height: 1.55; font-kerning: normal; text-rendering: optimizeLegibility; @@ -35,22 +35,6 @@ main { box-sizing: inherit; } -main { - max-width: 42em; - margin: 2em auto; - padding: 0 1em; - overflow: hidden; - word-wrap: break-word; -} - -main > *:first-child { - margin-top: 0 !important; -} - -main > *:last-child { - margin-bottom: 0 !important; -} - p, blockquote, ul, @@ -59,7 +43,7 @@ dl, table, pre { margin-top: 0; - margin-bottom: 1em; + margin-bottom: 1.25em; } small { @@ -74,8 +58,8 @@ h5, h6 { line-height: 1.25em; margin-top: 2rem; - margin-bottom: 1rem; - font-weight: 600; + margin-bottom: 1.25rem; + font-weight: 400; position: relative; } @@ -85,34 +69,43 @@ h3 small, h4 small, h5 small, h6 small { - font-weight: 400; + font-weight: 300; font-size: 0.7em; margin-left: 0.5em; color: #777; } +h1 code, +h2 code, +h3 code, +h4 code, +h5 code, +h6 code { + font-size: 90%; +} + h1 { - font-size: 2.02729em; + font-size: 3em; } h2 { - font-size: 1.80203em; + font-size: 2.25em; } h3 { - font-size: 1.60181em; + font-size: 1.75em; } h4 { - font-size: 1.42383em; + font-size: 1.5em; } h5 { - font-size: 1.26562em; + font-size: 1.25em; } h6 { - font-size: 1.125em; + font-size: 1.15em; color: #575757; } @@ -123,7 +116,7 @@ p { a { background-color: transparent; -webkit-text-decoration-skip: objects; - color: steelblue; + color: #0074d9; text-decoration: none; } @@ -213,7 +206,7 @@ pre, kbd, samp { font-family: menlo, inconsolata, consolas, "fira mono", "noto mono", "droid sans mono", "liberation mono", "dejavu sans mono", "ubuntu mono", monaco, "courier new", monospace; - font-size: calc(12px + 0.25vw); + font-size: 0.75em; } pre, code { @@ -242,6 +235,7 @@ pre code::before, pre code::after { pre > code { border: 0; + font-size: 1em; white-space: pre; word-break: normal; } @@ -265,7 +259,6 @@ kbd { box-shadow: 0 1px 0 #d6d6d6; color: #303030; display: inline-block; - font-size: 0.75em; line-height: 0.95em; margin: 0 1px; padding: 5px 5px 1px; @@ -377,12 +370,12 @@ dl dt { margin-top: 1em; font-size: 1em; font-style: italic; - font-weight: bold; + font-weight: 600; } dl dd { padding: 0 1em; - margin-bottom: 1em; + margin-bottom: 1.25em; } audio, diff --git a/style.css b/style.css index 2fcf50b..c5b8ddf 100644 --- a/style.css +++ b/style.css @@ -1,10 +1,10 @@ -/*! style.css v1.0.0-alpha-8 | ISC License | https://github.com/ungoldman/style.css */ +/*! style.css v1.0.0-beta | ISC License | https://github.com/ungoldman/style.css */ html { color: #303030; background-color: white; box-sizing: border-box; font-family: -apple-system, BlinkMacSystemFont, "avenir next", avenir, "segoe ui", "fira sans", roboto, noto, "droid sans", "liberation sans", "lucida grande", "helvetica neue", helvetica, "franklin gothic medium", "century gothic", cantarell, oxygen, ubuntu, sans-serif; - font-size: calc(16px + 0.25vw); + font-size: calc(14px + 0.25vw); line-height: 1.55; -webkit-font-kerning: normal; font-kerning: normal; @@ -37,22 +37,6 @@ main { box-sizing: inherit; } -main { - max-width: 42em; - margin: 2em auto; - padding: 0 1em; - overflow: hidden; - word-wrap: break-word; -} - -main > *:first-child { - margin-top: 0 !important; -} - -main > *:last-child { - margin-bottom: 0 !important; -} - p, blockquote, ul, @@ -61,7 +45,7 @@ dl, table, pre { margin-top: 0; - margin-bottom: 1em; + margin-bottom: 1.25em; } small { @@ -76,8 +60,8 @@ h5, h6 { line-height: 1.25em; margin-top: 2rem; - margin-bottom: 1rem; - font-weight: 600; + margin-bottom: 1.25rem; + font-weight: 400; position: relative; } @@ -87,34 +71,43 @@ h3 small, h4 small, h5 small, h6 small { - font-weight: 400; + font-weight: 300; font-size: 0.7em; margin-left: 0.5em; color: #777; } +h1 code, +h2 code, +h3 code, +h4 code, +h5 code, +h6 code { + font-size: 90%; +} + h1 { - font-size: 2.02729em; + font-size: 3em; } h2 { - font-size: 1.80203em; + font-size: 2.25em; } h3 { - font-size: 1.60181em; + font-size: 1.75em; } h4 { - font-size: 1.42383em; + font-size: 1.5em; } h5 { - font-size: 1.26562em; + font-size: 1.25em; } h6 { - font-size: 1.125em; + font-size: 1.15em; color: #575757; } @@ -125,7 +118,7 @@ p { a { background-color: transparent; -webkit-text-decoration-skip: objects; - color: steelblue; + color: #0074d9; text-decoration: none; } @@ -215,7 +208,7 @@ pre, kbd, samp { font-family: menlo, inconsolata, consolas, "fira mono", "noto mono", "droid sans mono", "liberation mono", "dejavu sans mono", "ubuntu mono", monaco, "courier new", monospace; - font-size: calc(12px + 0.25vw); + font-size: 0.75em; } pre, code { @@ -244,6 +237,7 @@ pre code::before, pre code::after { pre > code { border: 0; + font-size: 1em; white-space: pre; word-break: normal; } @@ -260,7 +254,6 @@ code::before, code::after { kbd { background-color: #e6e6e6; - background-image: -webkit-linear-gradient(#fafafa, #e6e6e6); background-image: linear-gradient(#fafafa, #e6e6e6); background-repeat: repeat-x; border: 1px solid #d6d6d6; @@ -268,7 +261,6 @@ kbd { box-shadow: 0 1px 0 #d6d6d6; color: #303030; display: inline-block; - font-size: 0.75em; line-height: 0.95em; margin: 0 1px; padding: 5px 5px 1px; @@ -380,12 +372,12 @@ dl dt { margin-top: 1em; font-size: 1em; font-style: italic; - font-weight: bold; + font-weight: 600; } dl dd { padding: 0 1em; - margin-bottom: 1em; + margin-bottom: 1.25em; } audio,