diff --git a/TODO.md b/TODO.md index dbe0767..08399b4 100644 --- a/TODO.md +++ b/TODO.md @@ -6,11 +6,13 @@ - [x] og + twitter card - [x] Index, 5 posts - [x] Archive + About: Change title -- [ ] Emphasize `` -- [ ] Favicon +- [x] Emphasize `` +- [x] Favicon (Added)* +- [ ] *Review the favicon imgs directory. Not sure if the images are in the right directory. - [ ] Index call2action that leads you to "posts" -- [ ] Change paginators (no vertical separator |) -- [ ] Fonts, use one font for the title and another one (more readable) for the post text +- [x] Change paginators (no vertical separator |) +- [x] Fonts, use one font for the title and another one (more readable) for the post text +- [x] Remove background pre on about - [ ] Some images contains a `

`, get rid of it. - Images with p in the post content (as it is html now) - ![image.png](path/to/image.png) ->

diff --git a/src/resources/_gen/assets/css/css/main.css_abdeb689137b085b8cf50bb0fe96e360.content b/src/resources/_gen/assets/css/css/main.css_abdeb689137b085b8cf50bb0fe96e360.content index 6902c3c..fbe8dd5 100644 --- a/src/resources/_gen/assets/css/css/main.css_abdeb689137b085b8cf50bb0fe96e360.content +++ b/src/resources/_gen/assets/css/css/main.css_abdeb689137b085b8cf50bb0fe96e360.content @@ -281,6 +281,7 @@ template { Fonts ========================================================================== */ --font-brand: 'Overpass Mono', monospace; + --font-ui: -apple-system, system-ui, sans-serif; /* Fonts weights */ --fw-regular: 400; @@ -307,7 +308,7 @@ template { /* Font sizes https://www.modularscale.com/?16,14&px&1.5 */ --font-size-1: 14px; - --font-size-2: 16px; + --font-size-2: 17px; --font-size-3: 24px; --font-size-4: 36px; --font-size-5: 54px; @@ -315,8 +316,8 @@ template { /* Font sizes names */ --font-title: var(--fw-bold) var(--font-size-4) / 1.25 var(--font-brand); --font-heading: var(--fw-bold) var(--font-size-3) / 1.25 var(--font-brand); - --font-body: var(--font-size-2) / 1.46 var(--font-brand); - --font-caption: var(--font-size-1) / 1.37 var(--font-brand); + --font-body: var(--font-size-2) / 1.6 var(--font-ui); + --font-caption: var(--font-size-1) / 1.5 var(--font-brand); /* ========================================================================== Spacing @@ -356,8 +357,6 @@ template { box-sizing: border-box; } body { - font-family: var(--font-brand); - font: var(--font-body); text-rendering: auto; background-color: var(--background-main); color: var(--color-main); @@ -373,6 +372,19 @@ h1, h2, h3, h4, h5, h6, b, strong { font-weight: var(--fw-bold); } +h1, h2, h3, h4, h5, h6 { + font-family: var(--font-brand); +} +p, ul, ol, dl, dd { + font: var(--font-body); +} +li code, +p code { + font: var(--font-caption); + padding: 4px; + color: rgb(0, 180, 0); + font-family: var(--font-brand); +} i, em { font-style: italic; } @@ -517,6 +529,7 @@ i, em { margin: 0; display: flex; gap: var(--spacing-2); + font-family: var(--font-brand); } .main-nav a.is-active { color: var(--color-main); @@ -564,12 +577,6 @@ i, em { flex-shrink: 0; } .post .social span, .social span { - /* position:absolute; - left:-10000px; - top:auto; - width:1px; - height:1px; - overflow: hidden; */ display: block; font: var(--font-caption); margin-top: var(--spacing-1); @@ -627,6 +634,7 @@ i, em { /* margin-top: calc(var(--spacing-1) / 2); */ } .post-item .post-item-summary { + font-family: var(--font-ui); font: var(--font-body); color: var(--color-main-medium); } @@ -644,6 +652,7 @@ i, em { width: auto; } .post-detail pre { + font: var(--font-caption); overflow-x: scroll; /* border: 1px solid var(--color-main-medium); */ /* box-shadow: 3px 3px 15px 5px rgba(0, 0, 0, 0.3); */ @@ -679,7 +688,7 @@ i, em { padding-bottom: var(--spacing-1); } .post h2 span { - font: var(--font-body); + font: var(--font-caption); color: var(--color-main-medium); vertical-align: middle; } @@ -698,25 +707,57 @@ i, em { margin-bottom: var(--spacing-6); } +.about .highlight { + margin-bottom: var(--spacing-8); + } +.about .highlight pre { + background-color: transparent !important; + } .pagination { border-top: 1px solid var(--color-main-medium); border-bottom: 1px solid var(--color-main-medium); padding-block: var(--spacing-3); + font: var(--font-caption); display: flex; align-items: center; - flex-wrap: wrap; + justify-content: space-between; + flex-wrap: nowrap; gap: 0 var(--spacing-3); + color: var(--color-main-medium); } -.pagination a { - font: var(--font-heading); +.pagination .center { + display: flex; + align-items: center; + gap: 0 var(--spacing-3); } -.pagination span { - font: var(--font-body); +.pagination .left, + .pagination .right { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } +.pagination .left::before, + .pagination .left::after, + .pagination .right::before, + .pagination .right::after { + vertical-align: middle; + font-size: var(--font-size-3); + } +.pagination .left::before { + content: "⇠ "; + } +.pagination .right { + direction: rtl; + text-align: left; + } +.pagination .right::before { + content: "⇢ "; + } .footer { padding: var(--spacing-6) var(--spacing-3); font: var(--font-caption); display: flex; + align-items: center; gap: var(--spacing-1); flex-wrap: wrap; } @@ -725,6 +766,7 @@ i, em { opacity: .4; } .footer-contact { + font: var(--font-caption); list-style-type: none; padding: 0; margin: 0; diff --git a/src/static/android-chrome-192x192.png b/src/static/android-chrome-192x192.png new file mode 100644 index 0000000..ce59583 Binary files /dev/null and b/src/static/android-chrome-192x192.png differ diff --git a/src/static/android-chrome-256x256.png b/src/static/android-chrome-256x256.png new file mode 100644 index 0000000..b72c942 Binary files /dev/null and b/src/static/android-chrome-256x256.png differ diff --git a/src/static/apple-touch-icon.png b/src/static/apple-touch-icon.png new file mode 100644 index 0000000..2a25791 Binary files /dev/null and b/src/static/apple-touch-icon.png differ diff --git a/src/static/browserconfig.xml b/src/static/browserconfig.xml new file mode 100644 index 0000000..b3930d0 --- /dev/null +++ b/src/static/browserconfig.xml @@ -0,0 +1,9 @@ + + + + + + #da532c + + + diff --git a/src/static/favicon-16x16.png b/src/static/favicon-16x16.png new file mode 100644 index 0000000..7a3cdcd Binary files /dev/null and b/src/static/favicon-16x16.png differ diff --git a/src/static/favicon-32x32.png b/src/static/favicon-32x32.png new file mode 100644 index 0000000..db121a0 Binary files /dev/null and b/src/static/favicon-32x32.png differ diff --git a/src/static/favicon.ico b/src/static/favicon.ico new file mode 100644 index 0000000..5db5246 Binary files /dev/null and b/src/static/favicon.ico differ diff --git a/src/static/mstile-150x150.png b/src/static/mstile-150x150.png new file mode 100644 index 0000000..dc8e944 Binary files /dev/null and b/src/static/mstile-150x150.png differ diff --git a/src/static/safari-pinned-tab.svg b/src/static/safari-pinned-tab.svg new file mode 100644 index 0000000..be66037 --- /dev/null +++ b/src/static/safari-pinned-tab.svg @@ -0,0 +1,19 @@ + + + + +Created by potrace 1.14, written by Peter Selinger 2001-2017 + + + + + diff --git a/src/static/site.webmanifest b/src/static/site.webmanifest new file mode 100644 index 0000000..de65106 --- /dev/null +++ b/src/static/site.webmanifest @@ -0,0 +1,19 @@ +{ + "name": "", + "short_name": "", + "icons": [ + { + "src": "/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/android-chrome-256x256.png", + "sizes": "256x256", + "type": "image/png" + } + ], + "theme_color": "#ffffff", + "background_color": "#ffffff", + "display": "standalone" +} diff --git a/src/themes/oscar/assets/css/common.css b/src/themes/oscar/assets/css/common.css index 4f7f490..bc0d0a8 100644 --- a/src/themes/oscar/assets/css/common.css +++ b/src/themes/oscar/assets/css/common.css @@ -5,8 +5,6 @@ } body { - font-family: var(--font-brand); - font: var(--font-body); text-rendering: auto; background-color: var(--background-main); color: var(--color-main); @@ -23,6 +21,21 @@ b, strong { font-weight: var(--fw-bold); } +h1, h2, h3, h4, h5, h6 { + font-family: var(--font-brand); +} +p, ul, ol, dl, dd { + font: var(--font-body); +} + +li code, +p code { + font: var(--font-caption); + padding: 4px; + color: rgb(0, 180, 0); + font-family: var(--font-brand); +} + i, em { font-style: italic; } diff --git a/src/themes/oscar/assets/css/main.css b/src/themes/oscar/assets/css/main.css index ce54f0c..1c63f80 100644 --- a/src/themes/oscar/assets/css/main.css +++ b/src/themes/oscar/assets/css/main.css @@ -11,6 +11,7 @@ /* Modules */ @import 'assets/css/modules/header.css'; @import 'assets/css/modules/posts.css'; +@import 'assets/css/modules/about.css'; @import 'assets/css/modules/pagination.css'; @import 'assets/css/modules/footer.css'; diff --git a/src/themes/oscar/assets/css/modules/about.css b/src/themes/oscar/assets/css/modules/about.css new file mode 100644 index 0000000..c19606e --- /dev/null +++ b/src/themes/oscar/assets/css/modules/about.css @@ -0,0 +1,8 @@ +.about { + .highlight { + margin-bottom: var(--spacing-8); + pre { + background-color: transparent !important; + } + } +} \ No newline at end of file diff --git a/src/themes/oscar/assets/css/modules/footer.css b/src/themes/oscar/assets/css/modules/footer.css index 9165e0e..0665b23 100644 --- a/src/themes/oscar/assets/css/modules/footer.css +++ b/src/themes/oscar/assets/css/modules/footer.css @@ -2,6 +2,7 @@ padding: var(--spacing-6) var(--spacing-3); font: var(--font-caption); display: flex; + align-items: center; gap: var(--spacing-1); flex-wrap: wrap; span { @@ -12,6 +13,7 @@ } } .footer-contact { + font: var(--font-caption); list-style-type: none; padding: 0; margin: 0; diff --git a/src/themes/oscar/assets/css/modules/header.css b/src/themes/oscar/assets/css/modules/header.css index ead9ca2..97d8707 100644 --- a/src/themes/oscar/assets/css/modules/header.css +++ b/src/themes/oscar/assets/css/modules/header.css @@ -32,6 +32,7 @@ margin: 0; display: flex; gap: var(--spacing-2); + font-family: var(--font-brand); } a.is-active { color: var(--color-main); @@ -82,12 +83,6 @@ } } span { - /* position:absolute; - left:-10000px; - top:auto; - width:1px; - height:1px; - overflow: hidden; */ display: block; font: var(--font-caption); margin-top: var(--spacing-1); diff --git a/src/themes/oscar/assets/css/modules/pagination.css b/src/themes/oscar/assets/css/modules/pagination.css index cbcbe6d..64f614a 100644 --- a/src/themes/oscar/assets/css/modules/pagination.css +++ b/src/themes/oscar/assets/css/modules/pagination.css @@ -2,14 +2,39 @@ border-top: 1px solid var(--color-main-medium); border-bottom: 1px solid var(--color-main-medium); padding-block: var(--spacing-3); + font: var(--font-caption); display: flex; align-items: center; - flex-wrap: wrap; + justify-content: space-between; + flex-wrap: nowrap; gap: 0 var(--spacing-3); - a { - font: var(--font-heading); + color: var(--color-main-medium); + .center { + display: flex; + align-items: center; + gap: 0 var(--spacing-3); } - span { - font: var(--font-body); + .left, + .right { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + &::before, + &::after { + vertical-align: middle; + font-size: var(--font-size-3); + } + } + .left { + &::before { + content: "⇠ "; + } + } + .right { + direction: rtl; + text-align: left; + &::before { + content: "⇢ "; + } } } \ No newline at end of file diff --git a/src/themes/oscar/assets/css/modules/posts.css b/src/themes/oscar/assets/css/modules/posts.css index 9fb75d8..42b34a9 100644 --- a/src/themes/oscar/assets/css/modules/posts.css +++ b/src/themes/oscar/assets/css/modules/posts.css @@ -32,6 +32,7 @@ /* margin-top: calc(var(--spacing-1) / 2); */ } .post-item-summary { + font-family: var(--font-ui); font: var(--font-body); color: var(--color-main-medium); } @@ -52,6 +53,7 @@ width: auto; } pre { + font: var(--font-caption); overflow-x: scroll; /* border: 1px solid var(--color-main-medium); */ /* box-shadow: 3px 3px 15px 5px rgba(0, 0, 0, 0.3); */ @@ -89,7 +91,7 @@ border-bottom: 1px solid var(--color-main-dark); padding-bottom: var(--spacing-1); span { - font: var(--font-body); + font: var(--font-caption); color: var(--color-main-medium); vertical-align: middle; &:first-child { diff --git a/src/themes/oscar/assets/css/variables.css b/src/themes/oscar/assets/css/variables.css index 0c3db86..38e0ec4 100644 --- a/src/themes/oscar/assets/css/variables.css +++ b/src/themes/oscar/assets/css/variables.css @@ -3,6 +3,7 @@ Fonts ========================================================================== */ --font-brand: 'Overpass Mono', monospace; + --font-ui: -apple-system, system-ui, sans-serif; /* Fonts weights */ --fw-regular: 400; @@ -29,7 +30,7 @@ /* Font sizes https://www.modularscale.com/?16,14&px&1.5 */ --font-size-1: 14px; - --font-size-2: 16px; + --font-size-2: 17px; --font-size-3: 24px; --font-size-4: 36px; --font-size-5: 54px; @@ -37,8 +38,8 @@ /* Font sizes names */ --font-title: var(--fw-bold) var(--font-size-4) / 1.25 var(--font-brand); --font-heading: var(--fw-bold) var(--font-size-3) / 1.25 var(--font-brand); - --font-body: var(--font-size-2) / 1.46 var(--font-brand); - --font-caption: var(--font-size-1) / 1.37 var(--font-brand); + --font-body: var(--font-size-2) / 1.6 var(--font-ui); + --font-caption: var(--font-size-1) / 1.5 var(--font-brand); /* ========================================================================== Spacing diff --git a/src/themes/oscar/layouts/partials/metas.html b/src/themes/oscar/layouts/partials/metas.html index 67e5a75..a6d2de2 100644 --- a/src/themes/oscar/layouts/partials/metas.html +++ b/src/themes/oscar/layouts/partials/metas.html @@ -19,7 +19,13 @@ {{ end -}} - + + + + + + + diff --git a/src/themes/oscar/layouts/partials/pagination.html b/src/themes/oscar/layouts/partials/pagination.html index 13ac081..c036431 100644 --- a/src/themes/oscar/layouts/partials/pagination.html +++ b/src/themes/oscar/layouts/partials/pagination.html @@ -1,7 +1,9 @@ -{{ if .Paginator.HasPrev }} - -{{ end }} -{{ .Paginator.PageNumber }} -{{ if .Paginator.HasNext }} - -{{ end }} +
+ {{ if .Paginator.HasPrev }} + + {{ end }} + {{ .Paginator.PageNumber }} + {{ if .Paginator.HasNext }} + + {{ end }} +
\ No newline at end of file diff --git a/src/themes/oscar/layouts/partials/posts/pagination.html b/src/themes/oscar/layouts/partials/posts/pagination.html index cdbdf62..98f1b30 100644 --- a/src/themes/oscar/layouts/partials/posts/pagination.html +++ b/src/themes/oscar/layouts/partials/posts/pagination.html @@ -1,7 +1,7 @@ {{- if .NextInSection }} - {{ .NextInSection.Title }} + {{ .NextInSection.Title }} {{- end }} {{- if .PrevInSection }} - | {{ .PrevInSection.Title }} + {{ .PrevInSection.Title }} {{- end }} \ No newline at end of file diff --git a/src/themes/oscar/layouts/sections/about.html b/src/themes/oscar/layouts/sections/about.html index b0a05be..30d38b3 100644 --- a/src/themes/oscar/layouts/sections/about.html +++ b/src/themes/oscar/layouts/sections/about.html @@ -2,7 +2,7 @@
-
+
{{ .Content }}