diff --git a/Makefile b/Makefile index 1949703..806e894 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ THEMES=$(filter-out scss/_main.scss, $(wildcard scss/*.scss)) all: python3 -mscss -C scss/sakura.scss > css/sakura.css python3 -mscss -C scss/sakura-dark.scss > css/sakura-dark.css - python3 -mscss -C scss/sakura-light.scss > css/sakura-light.css + python3 -mscss -C scss/sakura-earthly.scss > css/sakura-earthly.css python3 -mscss -C scss/sakura-vader.scss > css/sakura-vader.css # python3 -mscss scss/sakura.scss > css/sakura.min.css diff --git a/css/sakura-dark.css b/css/sakura-dark.css index 98879e4..d4868d2 100644 --- a/css/sakura-dark.css +++ b/css/sakura-dark.css @@ -1,41 +1,60 @@ html { + font-size: 62.5%; font-family: serif; - font-size: 18px; } body { + font-size: 1.8rem; line-height: 1.618; - max-width: 684px; + max-width: 38em; margin: auto; color: #c9c9c9; background-color: #222222; } +@media (max-width: 684px) { + body { + font-size: 1.53rem; + } +} +@media (max-width: 382px) { + body { + font-size: 1.35rem; + } +} h1, h2, h3, h4, h5, h6 { - line-height: 1.41; + line-height: 1.15; + margin-bottom: 0em; font-family: sans-serif; - margin-bottom: 14.4px; - margin-top: 39.6px; font-weight: 500; + letter-spacing: -0.9px; + overflow-wrap: break-word; + word-wrap: break-word; + -ms-word-break: break-all; + word-break: break-word; + -ms-hyphens: auto; + -moz-hyphens: auto; + -webkit-hyphens: auto; + hyphens: auto; } h1 { - font-size: 45px; + font-size: 2.35em; } h2 { - font-size: 38.7px; + font-size: 2em; } h3 { - font-size: 31.5px; + font-size: 1.75em; } h4 { - font-size: 27px; + font-size: 1.5em; } h5 { - font-size: 22.5px; + font-size: 1.25em; } h6 { - font-size: 18px; + font-size: 1em; } small, sub, sup { - font-size: 65%; + font-size: 75%; } hr { border-color: #ffffff; @@ -56,6 +75,7 @@ li { } blockquote { font-style: italic; + margin-left: 1.5em; padding-left: 1em; border-left: 3px solid #ffffff; } @@ -69,7 +89,7 @@ pre { overflow-x: scroll; } code { - font-size: 90%; + font-size: 0.9em; padding: 0 0.5em; background-color: #4a4a4a; white-space: pre-wrap; @@ -85,7 +105,7 @@ table { border-collapse: collapse; } td, th { - padding: 8px; + padding: 0.5em; border-bottom: 1px solid #4a4a4a; } input, textarea { diff --git a/css/sakura-earthly.css b/css/sakura-earthly.css new file mode 100644 index 0000000..bccc009 --- /dev/null +++ b/css/sakura-earthly.css @@ -0,0 +1,159 @@ +html { + font-size: 62.5%; + font-family: serif; +} +body { + font-size: 1.8rem; + line-height: 1.618; + max-width: 38em; + margin: auto; + color: #4a4a4a; + background-color: #f9f9f9; +} +@media (max-width: 684px) { + body { + font-size: 1.53rem; + } +} +@media (max-width: 382px) { + body { + font-size: 1.35rem; + } +} +h1, h2, h3, h4, h5, h6 { + line-height: 1.15; + margin-bottom: 0em; + font-family: sans-serif; + font-weight: 500; + letter-spacing: -0.9px; + overflow-wrap: break-word; + word-wrap: break-word; + -ms-word-break: break-all; + word-break: break-word; + -ms-hyphens: auto; + -moz-hyphens: auto; + -webkit-hyphens: auto; + hyphens: auto; +} +h1 { + font-size: 2.35em; +} +h2 { + font-size: 2em; +} +h3 { + font-size: 1.75em; +} +h4 { + font-size: 1.5em; +} +h5 { + font-size: 1.25em; +} +h6 { + font-size: 1em; +} +small, sub, sup { + font-size: 75%; +} +hr { + border-color: #338618; +} +a { + text-decoration: none; + color: #338618; +} +a:hover { + color: #5e5e5e; + border-bottom: 2px solid #4a4a4a; +} +ul { + padding-left: 1.4em; +} +li { + margin-bottom: 0.4em; +} +blockquote { + font-style: italic; + margin-left: 1.5em; + padding-left: 1em; + border-left: 3px solid #338618; +} +img { + max-width: 100%; +} +pre { + background-color: #C7E3BE; + display: block; + padding: 1em; + overflow-x: scroll; +} +code { + font-size: 0.9em; + padding: 0 0.5em; + background-color: #C7E3BE; + white-space: pre-wrap; +} +pre > code { + padding: 0; + background-color: transparent; + white-space: pre; +} +table { + text-align: justify; + width: 100%; + border-collapse: collapse; +} +td, th { + padding: 0.5em; + border-bottom: 1px solid #C7E3BE; +} +input, textarea { + border: 1px solid #4a4a4a; +} +input:focus, textarea:focus { + border: 1px solid #338618; +} +.button, button, input[type="submit"], input[type="reset"], input[type="button"] { + display: inline-block; + padding: 0 30px; + color: #4a4a4a; + text-align: center; + font-size: 11px; + font-weight: 600; + letter-spacing: 0.1rem; + text-transform: uppercase; + text-decoration: none; + white-space: nowrap; + background-color: transparent; + border-radius: 4px; + border: 1px solid #4a4a4a; + cursor: pointer; + box-sizing: border-box; +} +.button:focus, .button:hover, button:focus, button:hover, +input[type="submit"]:focus, input[type="submit"]:hover, input[type="reset"]:focus, +input[type="reset"]:hover, input[type="button"]:focus, input[type="button"]:hover { + background-color: #5e5e5e; + border-color: #338618; + outline: 0; +} +textarea, select, input[type] { + color: #4a4a4a; + padding: 6px 10px; + margin-bottom: 10px; + background-color: #C7E3BE; + border: 1px solid #C7E3BE; + border-radius: 4px; + box-shadow: none; + box-sizing: border-box; +} +textarea:focus, select:focus, input[type]:focus { + border: 1px solid #338618; + outline: 0; +} +label, legend, fieldset { + display: block; + margin-bottom: 0.5rem; + font-weight: 600; +} diff --git a/css/sakura-light.css b/css/sakura-light.css index e72f490..e69de29 100644 --- a/css/sakura-light.css +++ b/css/sakura-light.css @@ -1,139 +0,0 @@ -html { - font-family: serif; - font-size: 18px; -} -body { - line-height: 1.618; - max-width: 684px; - margin: auto; - color: #4a4a4a; - background-color: #f9f9f9; -} -h1, h2, h3, h4, h5, h6 { - line-height: 1.41; - font-family: sans-serif; - margin-bottom: 14.4px; - margin-top: 39.6px; - font-weight: 500; -} -h1 { - font-size: 45px; -} -h2 { - font-size: 38.7px; -} -h3 { - font-size: 31.5px; -} -h4 { - font-size: 27px; -} -h5 { - font-size: 22.5px; -} -h6 { - font-size: 18px; -} -small, sub, sup { - font-size: 65%; -} -hr { - border-color: #338618; -} -a { - text-decoration: none; - color: #338618; -} -a:hover { - color: #5e5e5e; - border-bottom: 2px solid #4a4a4a; -} -ul { - padding-left: 1.4em; -} -li { - margin-bottom: 0.4em; -} -blockquote { - font-style: italic; - padding-left: 1em; - border-left: 3px solid #338618; -} -img { - max-width: 100%; -} -pre { - background-color: #C7E3BE; - display: block; - padding: 1em; - overflow-x: scroll; -} -code { - font-size: 90%; - padding: 0 0.5em; - background-color: #C7E3BE; - white-space: pre-wrap; -} -pre > code { - padding: 0; - background-color: transparent; - white-space: pre; -} -table { - text-align: justify; - width: 100%; - border-collapse: collapse; -} -td, th { - padding: 8px; - border-bottom: 1px solid #C7E3BE; -} -input, textarea { - border: 1px solid #4a4a4a; -} -input:focus, textarea:focus { - border: 1px solid #338618; -} -.button, button, input[type="submit"], input[type="reset"], input[type="button"] { - display: inline-block; - padding: 0 30px; - color: #4a4a4a; - text-align: center; - font-size: 11px; - font-weight: 600; - letter-spacing: 0.1rem; - text-transform: uppercase; - text-decoration: none; - white-space: nowrap; - background-color: transparent; - border-radius: 4px; - border: 1px solid #4a4a4a; - cursor: pointer; - box-sizing: border-box; -} -.button:focus, .button:hover, button:focus, button:hover, -input[type="submit"]:focus, input[type="submit"]:hover, input[type="reset"]:focus, -input[type="reset"]:hover, input[type="button"]:focus, input[type="button"]:hover { - background-color: #5e5e5e; - border-color: #338618; - outline: 0; -} -textarea, select, input[type] { - color: #4a4a4a; - padding: 6px 10px; - margin-bottom: 10px; - background-color: #C7E3BE; - border: 1px solid #C7E3BE; - border-radius: 4px; - box-shadow: none; - box-sizing: border-box; -} -textarea:focus, select:focus, input[type]:focus { - border: 1px solid #338618; - outline: 0; -} -label, legend, fieldset { - display: block; - margin-bottom: 0.5rem; - font-weight: 600; -} diff --git a/css/sakura-vader.css b/css/sakura-vader.css index ef1383a..e507c2e 100644 --- a/css/sakura-vader.css +++ b/css/sakura-vader.css @@ -1,41 +1,60 @@ html { + font-size: 62.5%; font-family: serif; - font-size: 18px; } body { + font-size: 1.8rem; line-height: 1.618; - max-width: 684px; + max-width: 38em; margin: auto; color: #d9d8dc; background-color: #120c0e; } +@media (max-width: 684px) { + body { + font-size: 1.53rem; + } +} +@media (max-width: 382px) { + body { + font-size: 1.35rem; + } +} h1, h2, h3, h4, h5, h6 { - line-height: 1.41; + line-height: 1.15; + margin-bottom: 0em; font-family: sans-serif; - margin-bottom: 14.4px; - margin-top: 39.6px; font-weight: 500; + letter-spacing: -0.9px; + overflow-wrap: break-word; + word-wrap: break-word; + -ms-word-break: break-all; + word-break: break-word; + -ms-hyphens: auto; + -moz-hyphens: auto; + -webkit-hyphens: auto; + hyphens: auto; } h1 { - font-size: 45px; + font-size: 2.35em; } h2 { - font-size: 38.7px; + font-size: 2em; } h3 { - font-size: 31.5px; + font-size: 1.75em; } h4 { - font-size: 27px; + font-size: 1.5em; } h5 { - font-size: 22.5px; + font-size: 1.25em; } h6 { - font-size: 18px; + font-size: 1em; } small, sub, sup { - font-size: 65%; + font-size: 75%; } hr { border-color: #eb99a1; @@ -56,6 +75,7 @@ li { } blockquote { font-style: italic; + margin-left: 1.5em; padding-left: 1em; border-left: 3px solid #eb99a1; } @@ -69,7 +89,7 @@ pre { overflow-x: scroll; } code { - font-size: 90%; + font-size: 0.9em; padding: 0 0.5em; background-color: #40363a; white-space: pre-wrap; @@ -85,7 +105,7 @@ table { border-collapse: collapse; } td, th { - padding: 8px; + padding: 0.5em; border-bottom: 1px solid #40363a; } input, textarea { diff --git a/css/sakura.css b/css/sakura.css index a5061a1..98bd16d 100644 --- a/css/sakura.css +++ b/css/sakura.css @@ -1,41 +1,60 @@ html { + font-size: 62.5%; font-family: serif; - font-size: 18px; } body { + font-size: 1.8rem; line-height: 1.618; - max-width: 684px; + max-width: 38em; margin: auto; color: #4a4a4a; background-color: #f9f9f9; } +@media (max-width: 684px) { + body { + font-size: 1.53rem; + } +} +@media (max-width: 382px) { + body { + font-size: 1.35rem; + } +} h1, h2, h3, h4, h5, h6 { - line-height: 1.41; + line-height: 1.15; + margin-bottom: 0em; font-family: sans-serif; - margin-bottom: 14.4px; - margin-top: 39.6px; font-weight: 500; + letter-spacing: -0.9px; + overflow-wrap: break-word; + word-wrap: break-word; + -ms-word-break: break-all; + word-break: break-word; + -ms-hyphens: auto; + -moz-hyphens: auto; + -webkit-hyphens: auto; + hyphens: auto; } h1 { - font-size: 45px; + font-size: 2.35em; } h2 { - font-size: 38.7px; + font-size: 2em; } h3 { - font-size: 31.5px; + font-size: 1.75em; } h4 { - font-size: 27px; + font-size: 1.5em; } h5 { - font-size: 22.5px; + font-size: 1.25em; } h6 { - font-size: 18px; + font-size: 1em; } small, sub, sup { - font-size: 65%; + font-size: 75%; } hr { border-color: #2c8898; @@ -56,6 +75,7 @@ li { } blockquote { font-style: italic; + margin-left: 1.5em; padding-left: 1em; border-left: 3px solid #2c8898; } @@ -69,7 +89,7 @@ pre { overflow-x: scroll; } code { - font-size: 90%; + font-size: 0.9em; padding: 0 0.5em; background-color: #f1f1f1; white-space: pre-wrap; @@ -85,7 +105,7 @@ table { border-collapse: collapse; } td, th { - padding: 8px; + padding: 0.5em; border-bottom: 1px solid #f1f1f1; } input, textarea { diff --git a/scss/_main.scss b/scss/_main.scss index 56535da..7aaa7c7 100644 --- a/scss/_main.scss +++ b/scss/_main.scss @@ -1,4 +1,4 @@ -/* Sakura.css v0.5.0 +/* Sakura.css v0.6.0 * ================ * Project: https://github.com/oxalorg/Vader.css */