diff --git a/layout/item_note.html b/layout/item_note.html new file mode 100644 index 0000000..9623d68 --- /dev/null +++ b/layout/item_note.html @@ -0,0 +1,4 @@ +
+

{{ title }}

+

+
diff --git a/makesite.py b/makesite.py index 3280dd3..a59dacf 100755 --- a/makesite.py +++ b/makesite.py @@ -397,6 +397,7 @@ def main(param_file): list_layout = fread("layout/list.html") item_layout = fread("layout/item.html") item_nosummary_layout = fread("layout/item_nosummary.html") + item_note_layout = fread("layout/item_note.html") category_title_layout = fread("layout/category_title.html") category_layout = fread("layout/category.html") comment_layout = fread("layout/comment.html") @@ -550,7 +551,7 @@ def main(param_file): notes, "_site/notes/index.html", list_layout, - item_nosummary_layout, + item_note_layout, archive_title_layout, None, **params diff --git a/params-local.json b/params-local.json index c35ba48..4e8165c 100644 --- a/params-local.json +++ b/params-local.json @@ -2,7 +2,7 @@ "title": "Le blog du Yax", "subtitle": "GNU, Linux, BSD et autres libertés", "author": "Yax", - "site_url": "https://blogduyax.traefik.me", + "site_url": "http://127.0.0.1:8000", "stacosys_url": "http://127.0.0.1:8100/api", "external_check": "./check_git.sh" } diff --git a/static/css/style.css b/static/css/style.css index 8aa47e5..e2c109b 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -1,131 +1,18 @@ -/* font * / - -/* cyrillic-ext */ -@font-face { - font-family: 'Merriweather'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Merriweather Regular'), local('Merriweather-Regular'), url(/fonts/merriweather/Merriweather-Regular.ttf) format('truetype'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} -/* cyrillic */ -@font-face { - font-family: 'Merriweather'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Merriweather Regular'), local('Merriweather-Regular'), url(/fonts/merriweather/Merriweather-Regular.ttf) format('truetype'); - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* vietnamese */ -@font-face { - font-family: 'Merriweather'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Merriweather Regular'), local('Merriweather-Regular'), url(/fonts/merriweather/Merriweather-Regular.ttf) format('truetype'); - unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; -} -/* latin-ext */ -@font-face { - font-family: 'Merriweather'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Merriweather Regular'), local('Merriweather-Regular'), url(/fonts/merriweather/Merriweather-Regular.ttf) format('truetype'); - unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; -} -/* latin */ -@font-face { - font-family: 'Merriweather'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Merriweather Regular'), local('Merriweather-Regular'), url(/fonts/merriweather/Merriweather-Regular.ttf) format('truetype'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} - -/* font for latin-ext */ -@font-face { - font-family: 'Gentium Book Basic'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(/fonts/gentium/gentium-book-basic-ext.woff2) format('woff2'); - unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; -} - -/* italic font for latin-ext */ -@font-face { - font-family: 'Gentium Book Basic'; - font-style: italic; - font-weight: 400; - font-display: swap; - src: url(/fonts/gentium/gentium-book-basic-italic-ext.woff2) format('woff2'); - unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; -} - -/* font for latin */ -@font-face { - font-family: 'Gentium Book Basic'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(/fonts/gentium/gentium-book-basic.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} - -/* italic font for latin */ -@font-face { - font-family: 'Gentium Book Basic'; - font-style: italic; - font-weight: 400; - font-display: swap; - src: url(/fonts/gentium/gentium-book-basic-italic.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} - /* General */ html { - font-family: 'Merriweather', serif; - font-feature-settings: "dlig", "liga", "lnum", "kern"; - font-kerning: auto; - font-language-override: normal; - font-optical-sizing: auto; - font-size: 62.5%; + font-family: system-ui, sans-serif; } h1, h2, h3, h4, h5, h6 { - font-family: 'Merriweather', serif; - font-feature-settings: "dlig", "liga", "lnum", "kern"; - font-kerning: auto; - font-language-override: normal; - font-optical-sizing: auto; - font-size: 3.2rem; + font-family: system-ui, sans-serif; } p, li { - font-feature-settings: "kern", "onum", "liga"; - font-kerning: auto; - font-language-override: normal; - font-optical-sizing: auto; - font-family: 'Gentium Book Basic', Georgia, serif; - font-size: 2.2rem; - font-stretch: 100%; - font-weight: 400; - font-size-adjust: none; - font-style: normal; - font-variant: normal; - font-variant-alternates: normal; - font-variant-caps: normal; - font-variant-east-asian: normal; - font-variant-ligatures: normal; - font-variant-numeric: normal; - font-variant-position: normal; - font-variation-settings: normal; - line-height: 32px; + font-family: system-ui, sans-serif; + font-weight: 400; + font-size: large; + line-height: 28px; vertical-align: baseline; color: rgb(56, 71, 67); margin-bottom: 2rem; @@ -135,8 +22,12 @@ h1, h2, h3, h4, h5, h6 { color: #05bf85; } -h1 { - font-size: 4.2rem; +h1 { + font-weight: 600; +} + +h2 { + margin: 0 } a:link, a:visited { @@ -161,31 +52,29 @@ a:hover, a:active { height: 250px; line-height: 13rem; text-align: center; - vertical-align: middle; - font-family: "Merriweather", serif; + vertical-align: middle; margin-bottom: 5rem; } .banner div > h1 { color: rgb(36, 46, 43); - vertical-align: baseline; - font-size: 5.5rem; + vertical-align: baseline; } -.banner div > h2 { - font-weight: 400; - font-size: 2.3rem; +.banner div > h2 { + font-weight: 400; color: rgb(56, 71, 67); vertical-align: baseline; } #menu-blog { + font-weight: 600; + font-size: larger; line-height: 96px; vertical-align: middle; } -#menu-blog a { - font-size: 2.3rem; +#menu-blog a { padding-right: 2rem; } @@ -242,7 +131,7 @@ a:hover, a:active { } .comment-author { - font-weight: bold; + font-weight: 500; } .comment-detail {