diff options
author | fr33domlover <fr33domlover@riseup.net> | 2019-07-24 17:22:58 +0300 |
---|---|---|
committer | fr33domlover <fr33domlover@riseup.net> | 2019-07-24 17:24:37 +0300 |
commit | 7fb1196a6e79713eb0ed4a73b1d86b405013ba47 (patch) | |
tree | 0cc5bd14287f52e0d054cd24271dfbe6e4787259 | |
parent | aeaebffd77014f4c49b2d8e6fbe249355265a0de (diff) |
Remove old CSS, rename new theme.css to light.css
-rw-r--r-- | html/forgefed-vocabulary.html | 10 | ||||
-rw-r--r-- | html/forgefed.html | 10 | ||||
-rw-r--r-- | html/index.html | 6 | ||||
-rw-r--r-- | html/light.css (renamed from html/theme.css) | 0 | ||||
-rw-r--r-- | html/spec.css | 1 | ||||
-rw-r--r-- | html/spec.sass | 365 | ||||
-rw-r--r-- | html/template.html | 6 |
7 files changed, 8 insertions, 390 deletions
diff --git a/html/forgefed-vocabulary.html b/html/forgefed-vocabulary.html index a87ba1f..5231c84 100644 --- a/html/forgefed-vocabulary.html +++ b/html/forgefed-vocabulary.html @@ -4,11 +4,7 @@ <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <title>ForgeFed Vocabulary</title> - <!-- - <link rel="stylesheet" type="text/css" href="zenburn.css" /> - <link rel="stylesheet" type="text/css" href="spec.css" /> - --> - <link rel="stylesheet" type="text/css" href="theme.css" /> + <link rel="stylesheet" type="text/css" href="light.css" /> </head> <body class="body"> <header class="header"> @@ -29,8 +25,8 @@ <main class="main"> <h1 class="main-title"> ForgeFed Vocabulary - draft - 2019-07-24 master - <a href="https://notabug.org/peers/forgefed/commit/28ce77c58fac2e738c8744f87e11ff540d433a29"> - 28ce77c + <a href="https://notabug.org/peers/forgefed/commit/0c9efdedf6b8f959c5d303b288493c43cb2ea52a"> + 0c9efde </a> [dirty] </h1> diff --git a/html/forgefed.html b/html/forgefed.html index 971e8c6..9de420e 100644 --- a/html/forgefed.html +++ b/html/forgefed.html @@ -4,11 +4,7 @@ <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <title>ForgeFed</title> - <!-- - <link rel="stylesheet" type="text/css" href="zenburn.css" /> - <link rel="stylesheet" type="text/css" href="spec.css" /> - --> - <link rel="stylesheet" type="text/css" href="theme.css" /> + <link rel="stylesheet" type="text/css" href="light.css" /> </head> <body class="body"> <header class="header"> @@ -29,8 +25,8 @@ <main class="main"> <h1 class="main-title"> ForgeFed - draft - 2019-07-24 master - <a href="https://notabug.org/peers/forgefed/commit/28ce77c58fac2e738c8744f87e11ff540d433a29"> - 28ce77c + <a href="https://notabug.org/peers/forgefed/commit/0c9efdedf6b8f959c5d303b288493c43cb2ea52a"> + 0c9efde </a> [dirty] </h1> diff --git a/html/index.html b/html/index.html index 5d5312b..c18925c 100644 --- a/html/index.html +++ b/html/index.html @@ -4,11 +4,7 @@ <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <title>ForgeFed</title> - <!-- - <link rel="stylesheet" type="text/css" href="zenburn.css" /> - <link rel="stylesheet" type="text/css" href="spec.css" /> - --> - <link rel="stylesheet" type="text/css" href="theme.css" /> + <link rel="stylesheet" type="text/css" href="light.css" /> </head> <body class="body"> <header class="header"> diff --git a/html/theme.css b/html/light.css index 8c1cdd2..8c1cdd2 100644 --- a/html/theme.css +++ b/html/light.css diff --git a/html/spec.css b/html/spec.css deleted file mode 100644 index 0a7aace..0000000 --- a/html/spec.css +++ /dev/null @@ -1 +0,0 @@ -@font-face{font-family:"Cabin";font-weight:400;font-style:normal;src:local("Cabin Regular"),url("/fonts/cabin/cabin-regular.woff2") format("woff2"),url("/fonts/cabin/cabin-regular.woff") format("woff")}@font-face{font-family:"Cabin";font-weight:400;font-style:italic;src:local("Cabin Italic"),url("/fonts/cabin/cabin-italic.woff2") format("woff2"),url("/fonts/cabin/cabin-italic.woff") format("woff")}@font-face{font-family:"Cabin";font-weight:600;font-style:normal;src:local("Cabin Bold"),url("/fonts/cabin/cabin-bold.woff2") format("woff2"),url("/fonts/cabin/cabin-bold.woff") format("woff")}@font-face{font-family:"Cabin";font-weight:600;font-style:italic;src:local("Cabin Bold Italic"),url("/fonts/cabin/cabin-bold-italic.woff2") format("woff2"),url("/fonts/cabin/cabin-bold-italic.woff") format("woff")}@font-face{font-family:"Hack";font-weight:400;font-style:normal;src:local("Hack Regular"),url("/fonts/hack/hack-regular.woff2") format("woff2"),url("/fonts/hack/hack-regular.woff") format("woff")}*{margin:0;padding:0;box-sizing:border-box}.default{font-size:62.5%}.body{max-width:80rem;margin:0 auto;padding:0 2rem 0;background:#000}.header{text-align:center;margin:4rem auto 2rem}.header-title__link{font:400 7rem/7.5rem Cabin,Helvetica,sans-serif;color:#c00;letter-spacing:0.1rem;text-decoration:none}.header-title__link:hover{color:#ef2929}.nav{margin:2rem auto}.nav__link{font:400 2.2rem Cabin,Helvetica,sans-serif;color:#d3d7cf;margin:0 1.5rem;text-decoration:none}.nav__link:hover{color:#eeeeec}.footer{font:400 1.5rem Cabin,Helvetica,sans-serif;color:#555;text-align:center;margin:10rem auto 3rem}.footer__link{font:400 2rem Cabin,Helvetica,sans-serif;color:#739fcf;text-decoration:none;border-bottom:0.1rem solid;padding:0 0 0.1rem 0;font-size:1.5rem}.footer__link:hover{color:#34e2e2}.main{font:400 2rem/2.8rem Cabin,Helvetica,sans-serif;color:#ccc}.main a{font:400 2rem Cabin,Helvetica,sans-serif;color:#739fcf;text-decoration:none;border-bottom:0.1rem solid;padding:0 0 0.1rem 0}.main a:hover{color:#34e2e2}.main abbr{cursor:help;text-decoration:none;border-bottom:0.2rem dotted}.main b{font-weight:600}.main blockquote{margin:0 2rem;padding:0rem 2rem;border-left:1rem solid #404040;font-style:italic}.main blockquote blockquote{margin:0;border-left:0.5rem solid #404040}.main blockquote+p,.main p+blockquote{margin-top:3rem}.main cite{font-style:italic;font-size:2.1rem}.main code,.main samp,.main var{font:400 1.5rem Hack,monospace;color:#ccc;background:#404040;margin:0 0.2rem;padding:0.2rem 0.4rem 0.1rem}.main del{color:#404040;background:#000}.main details{padding:0 0 0 3rem}.main summary{margin:0 0 1rem -2.5rem;color:#739fcf;cursor:context-menu}.main summary:hover{color:#34e2e2}.main dfn{font-weight:600;font-style:normal}.main dl{margin:2rem 0}.main dt{margin:1rem 0 0 0;font-weight:600}.main dd{margin:0 0 1rem 4rem}.main em,.main i{font-style:italic}.main h1{font:400 4.5rem Cabin,Helvetica,sans-serif;color:#ccc;margin:5rem 0 2rem}.main h2{font:400 4rem Cabin,Helvetica,sans-serif;color:#ccc;margin:5rem 0 2rem}.main h3{font:600 3.2rem Cabin,Helvetica,sans-serif;color:#ccc;margin:4.5rem 0 1.5rem}.main h4{font:600 3rem Cabin,Helvetica,sans-serif;color:#ccc;margin:3rem 0 1.5rem}.main h5{font:600 2.8rem Cabin,Helvetica,sans-serif;color:#ccc;margin:3rem 0 1.5rem}.main h6{font:600 2.3rem Cabin,Helvetica,sans-serif;color:#ccc;margin:3rem 0 1.5rem}.main h1+h2{margin:2rem 0}.main h2+h3,.main h3+h4,.main h4+h5,.main h5+h6{margin:2rem 0 1.5rem}.main hr{border:0.1rem solid #555753;margin:5rem auto}.main img{border:0;margin:2rem 0}.main mark{background:#c4a000;padding:0.2rem 0.5rem}.main ol{list-style-type:decimal;margin:2rem}.main ol li,.main ul li{padding:0 0 0 0.5rem}.main p{margin:1.5rem 0}.main pre{font:400 1.5rem Hack,monospace;color:#ccc;margin:3rem 0;padding:2rem;background:#404040;word-wrap:break-word;overflow:auto}.main s{text-decoration:line-through}.main small{font-size:1.5rem}.main strong{font-weight:600;font-size:2.1rem}.main sub,.main sup{font-size:1.5rem}.main table{margin:3rem 0;border-collapse:collapse;overflow:auto}.main td{padding:0.5rem 0 0}.main th{padding:0 3rem 1rem 0}.main tfoot,.main thead{font-weight:600}.main tbody{font-size:1.8rem}.main u{text-decoration:underline}.main ul{list-style-type:disc;margin:2rem 0 2rem 2rem}.main ul li ul{list-style-type:circle;margin:0.5rem 0 1rem 2rem}.main figure,.main .figure{margin:3rem 0}.main figure img,.main .figure img{margin:0}.main figcaption,.main .caption{font:400 1.5rem Cabin,Helvetica,sans-serif;color:#555;font-style:italic;margin:0.5rem 0 1.5rem}.main pre code{padding:0}.main thead,.main tr.header{text-align:left;border-bottom:0.1rem solid #555753}.main .footnotes li *{font-size:1.8rem;line-height:2rem}.main .footnotes li a[href^="#fnref"]{padding:0 0 0 0.5rem;border:0}.main a.footnoteRef{border:0}.main date.date--icon:before,.main time.time--icon:before{content:"🕒";margin:0 0.5rem 0 0}.main h1.main-title{font:400 4.5rem Cabin,Helvetica,sans-serif;color:#c4a000;margin:4rem 0 2rem}.main strong.strong--double{font-size:2.1rem;border-bottom:0.5rem double}.main strong.strong--em{font-size:2.1rem;font-style:italic}@media (max-width: 480px){.default{font-size:56.25%}.header-title__link{font:400 12vw Cabin,Helvetica,sans-serif;color:#c00}.nav__link{font:400 2.2rem/3.2rem Cabin,Helvetica,sans-serif;color:#d3d7cf}.footer{margin:15vw auto 3rem}.main h1{font-size:11vw}.main h2{font-size:10vw}.main h3{font-size:9vw}.main h4{font-size:8.5vw}.main h5{font-size:8vw}.main h6{font-size:7.5vw}.main h1.main-title{font-size:11vw;margin:4rem 0 0.5rem}} diff --git a/html/spec.sass b/html/spec.sass deleted file mode 100644 index e497202..0000000 --- a/html/spec.sass +++ /dev/null @@ -1,365 +0,0 @@ -/// Colours -------------------------------------------------------------- /// -$red: #cc0000 // logo -$redorange: #ef2929 // logo hover -$ochre: #c4a000 // heading -$lightblue: #739fcf // link -$lightmint: #d3d7cf // nav link -$aqua: #34e2e2 // link hover -$bluegray: #555753 // hr -$lightgray: #eeeeec // nav link hover -$gray80: #ccc // body text -$darkgray: #555 // footer text -$black: #000 // body background -$gray25: #404040 // addition for del, code, blockquote - - -/// Mixins --------------------------------------------------------------- /// - -// Format @font-face src value with the correct paths -@function font-src($family, $weight, $style, $variant) - $path: "/fonts/" + to-lower-case($family) + "/" - $basename: to-lower-case($family) + "-" + to-lower-case($variant) - @if $variant == "Bold Italic" - $basename: to-lower-case($family) + "-bold-italic" - $local: local($family + " " + $variant) - $woff2: url($path + $basename + ".woff2") format("woff2") - $woff: url($path + $basename + ".woff") format("woff") - @return $local, $woff2, $woff - -// Add @font-face attributes -=font-face($family, $weight, $style, $variant) - @font-face - font-family: $family - font-weight: $weight - font-style: $style - src: font-src($family, $weight, $style, $variant) - -// Set font attributes and colour -=font--cabin($weight, $size, $color) - font: $weight $size Cabin, Helvetica, sans-serif - color: $color - -=font--hack($weight, $size, $color) - font: $weight $size Hack, monospace - color: $color - -// Set default link style -=link--normal - +font--cabin(400, 2rem, $lightblue) - text-decoration: none - border-bottom: 0.1rem solid - padding: 0 0 0.1rem 0 - &:hover - color: $aqua - - -/// Start of css output -------------------------------------------------- /// - -/** Initialise fonts **/ -+font-face("Cabin", 400, normal, "Regular") -+font-face("Cabin", 400, italic, "Italic") -+font-face("Cabin", 600, normal, "Bold") -+font-face("Cabin", 600, italic, "Bold Italic") -+font-face("Hack", 400, normal, "Regular") - - -/** Global **/ -* - margin: 0 - padding: 0 - box-sizing: border-box - - -/** html and body tags **/ -.default - font-size: 62.5% - -.body - max-width: 80rem - margin: 0 auto - padding: 0 2rem 0 - background: $black - - -/** Header **/ -.header - text-align: center - margin: 4rem auto 2rem - -.header-title__link - +font--cabin(400, #{7rem}/#{7.5rem}, $red) - letter-spacing: 0.1rem - text-decoration: none - &:hover - color: $redorange - - -/** Navigation **/ -.nav - margin: 2rem auto - -.nav__link - +font--cabin(400, 2.2rem, $lightmint) - margin: 0 1.5rem - text-decoration: none - &:hover - color: $lightgray - - -/** Footer **/ -.footer - +font--cabin(400, 1.5rem, $darkgray) - text-align: center - margin: 10rem auto 3rem - -.footer__link - +link--normal - font-size: 1.5rem - - -/** Main content - Supply a small set of defaults, some for Markdown formatting **/ -.main - +font--cabin(400, #{2rem}/#{2.8rem}, $gray80) - - a - +link--normal - - abbr - cursor: help - text-decoration: none - border-bottom: 0.2rem dotted - - b - font-weight: 600 - - blockquote - margin: 0 2rem - padding: 0rem 2rem - border-left: 1rem solid $gray25 - font-style: italic - // Collapse outer left/right margins in nested blockquote - blockquote blockquote - margin: 0 - border-left: 0.5rem solid $gray25 - // Insert additional space between blockquotes and paragraphs - blockquote + p, p + blockquote - margin-top: 3rem - - cite - font-style: italic - font-size: 2.1rem - - code, samp, var - +font--hack(400, 1.5rem, $gray80) - background: $gray25 - margin: 0 0.2rem - padding: 0.2rem 0.4rem 0.1rem - - del - color: $gray25 - background: $black - - // Do not use details/summary in Markdown files, it will be enclosed by - // paragraph tags, resulting in invalid HTML - details - padding: 0 0 0 3rem - summary - margin: 0 0 1rem -2.5rem - color: $lightblue - cursor: context-menu - &:hover - color: $aqua - - dfn - font-weight: 600 - font-style: normal - - dl - margin: 2rem 0 - dt - margin: 1rem 0 0 0 - font-weight: 600 - dd - margin: 0 0 1rem 4rem - - em, i - font-style: italic - - h1 - +font--cabin(400, 4.5rem, $gray80) - margin: 5rem 0 2rem - h2 - +font--cabin(400, 4rem, $gray80) - margin: 5rem 0 2rem - h3 - +font--cabin(600, 3.2rem, $gray80) - margin: 4.5rem 0 1.5rem - h4 - +font--cabin(600, 3rem, $gray80) - margin: 3rem 0 1.5rem - h5 - +font--cabin(600, 2.8rem, $gray80) - margin: 3rem 0 1.5rem - h6 - +font--cabin(600, 2.3rem, $gray80) - margin: 3rem 0 1.5rem - // When a h2 heading is immediately under h1, decrease the margin between - // headings. Likewise for h2 to h3 - h1 + h2 - margin: 2rem 0 - h2 + h3, h3 + h4, h4 + h5, h5 + h6 - margin: 2rem 0 1.5rem - - hr - border: 0.1rem solid $bluegray - margin: 5rem auto - - img - border: 0 - margin: 2rem 0 - - mark - background: $ochre - padding: 0.2rem 0.5rem - - ol - list-style-type: decimal - margin: 2rem - - ol li, ul li - padding: 0 0 0 0.5rem - - p - margin: 1.5rem 0 - - pre - +font--hack(400, 1.5rem, $gray80) - margin: 3rem 0 - padding: 2rem - background: $gray25 - word-wrap: break-word - overflow: auto - - s - text-decoration: line-through - - small - font-size: 1.5rem - - strong - font-weight: 600 - font-size: 2.1rem - - sub, sup - font-size: 1.5rem - - table - margin: 3rem 0 - border-collapse: collapse - overflow: auto - td - padding: 0.5rem 0 0 - th - padding: 0 3rem 1rem 0 - tfoot, thead - font-weight: 600 - tbody - font-size: 1.8rem - - u - text-decoration: underline - - ul - list-style-type: disc - margin: 2rem 0 2rem 2rem - ul li ul - list-style-type: circle - margin: 0.5rem 0 1rem 2rem - - // Pandoc uses a div instead of figure/figcaption tags - figure, .figure - margin: 3rem 0 - figure img, .figure img - margin: 0 - figcaption, .caption - +font--cabin(400, 1.5rem, $darkgray) - font-style: italic - margin: 0.5rem 0 1.5rem - - // Pandoc compiles code fences as pre with nested code tag - // Drop code padding - pre code - padding: 0 - - // Pandoc assigns a .header class to the 1st row of tables, - // which may become a naming conflict in some cases */ - thead, tr.header - text-align: left - border-bottom: 0.1rem solid $bluegray - - // Pandoc footnotes - .footnotes li * - font-size: 1.8rem - line-height: 2rem - .footnotes li a[href^="#fnref"] - padding: 0 0 0 0.5rem - border: 0 - a.footnoteRef - border: 0 - - // Classes for specific usage - date.date--icon, time.time--icon - &:before - content: "🕒" - margin: 0 0.5rem 0 0 - - h1.main-title - +font--cabin(400, 4.5rem, $ochre) - margin: 4rem 0 2rem - - strong.strong--double - font-size: 2.1rem - border-bottom: 0.5rem double - - strong.strong--em - font-size: 2.1rem - font-style: italic - - -/** Add a media query to make adjustments for smaller screens **/ -@media (max-width: 480px) - /* Scale overall font size */ - .default - font-size: 56.25% - - /* Decrease header title font size */ - .header-title__link - +font--cabin(400, 12vw, $red) - - /* Increase nav link line height */ - .nav__link - +font--cabin(400, #{2.2rem}/#{3.2rem}, $lightmint) - - /* Scale footer top margin to viewport width */ - .footer - margin: 15vw auto 3rem - - /* Scale heading font sizes */ - .main - h1 - font-size: 11vw - h2 - font-size: 10vw - h3 - font-size: 9vw - h4 - font-size: 8.5vw - h5 - font-size: 8vw - h6 - font-size: 7.5vw - - h1.main-title - font-size: 11vw - margin: 4rem 0 0.5rem diff --git a/html/template.html b/html/template.html index a9c5a65..e7eb1f0 100644 --- a/html/template.html +++ b/html/template.html @@ -4,11 +4,7 @@ <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <title>$title$</title> - <!-- - <link rel="stylesheet" type="text/css" href="zenburn.css" /> - <link rel="stylesheet" type="text/css" href="spec.css" /> - --> - <link rel="stylesheet" type="text/css" href="theme.css" /> + <link rel="stylesheet" type="text/css" href="light.css" /> </head> <body class="body"> <header class="header"> |