diff --git a/assets/static/css/bcarlin.css b/assets/static/css/bcarlin.css index a27e26e..99d2b22 100644 --- a/assets/static/css/bcarlin.css +++ b/assets/static/css/bcarlin.css @@ -92,19 +92,14 @@ header nav [role="link"]:is([aria-current]:not([aria-current="false"]),:hover,:a --pico-text-decoration: none; } -article :where(a:not([role="button"])) { - --pico-text-decoration: none; -} - -body > :is(main, footer) { +.container { max-width: 40em; margin-left: auto; margin-right: auto; +} - @media (width >= 1024px) { - margin-right: 0; - margin-left: 18em; - } +article :where(a:not([role="button"])) { + --pico-text-decoration: none; } /* @@ -120,19 +115,10 @@ body > :is(main, footer) { backdrop-filter: blur(3px); font-family: var(--pico-font-family-sans-serif); font-weight: bold; - - @media (width >= 1024px) { - display: none; - } - - img { - height: 2em; - } } -#menu-close { - float: right; - padding: 0 1.5em; +.mobile-header img { + height: 2em; } #menu-close, #menu-close:hover, #menu-toggle { @@ -140,85 +126,98 @@ body > :is(main, footer) { background-color: inherit; border: none; text-decoration: none; - - @media (width >= 1024px) { - display: none; - } } body { background-color: var(--pico-background-color); +} - & > header { - width: 100vw; - text-align: center; - height: 100vh; - position: fixed; - left: -100vw; - top: 0; - background-color: var(--pico-background-color); - z-index: 100; - transition: left 0.5s; - overflow: hidden auto; +body > header { + width: 100vw; + text-align: center; + height: 100vh; + position: fixed; + left: -100vw; + top: 0; + background-color: var(--pico-background-color); + z-index: 100; + transition: left 0.5s; + overflow: hidden auto; +} - @media (width >= 1024px) { - position: sticky; - top: 0; - left: 0; - width: 15em; - float: left; - } +body > header.active { + left: 0; +} - .u-logo { - width: 5em; - } +body > header nav, body > header nav ul { + flex-direction: column; +} - .title { - font-size: 1.5rem; - font-weight: bold; - font-family: var(--pico-font-family-sans-serif); - margin-top: 1em; - } +body > header .u-logo { + width: 5em; +} - a { - color: var(--pico-color); - padding: 0; - .menu-primary & { - font-weight: bold; - } - } +body > header .title { + font-size: 1.5rem; + font-weight: bold; + font-family: var(--pico-font-family-sans-serif); + margin-top: 1em; +} - nav { - font-size: 1rem; - font-family: var(--pico-font-family-sans-serif); - width: 100%; - height: 100%; - display: flex; - flex-direction: column; - justify-content: space-between; +body > header nav { + font-size: 1rem; + font-family: var(--pico-font-family-sans-serif); + width: 100%; + height: 100%; + display: flex; + flex-direction: column; + justify-content: space-between; +} - ul { - flex-direction: column; - } +body > header nav li { + padding: 0; + padding: calc( var(--pico-nav-element-spacing-vertical) / 4) + calc( var(--pico-nav-element-spacing-horizontal) / 4); +} - li { - padding: 0; - padding: calc( var(--pico-nav-element-spacing-vertical) / 4) - calc( var(--pico-nav-element-spacing-horizontal) / 4); - } - } - } +body > header a { + color: var(--pico-color); + padding: 0; +} - & > footer{ - p { - font-size: 0.7em; - text-align: center; - } - } +body > header > a { + float: right; + padding: 0 1.5em; +} + +.menu-primary { + font-weight: bold; +} + +body > footer p { + font-size: 0.7em; + text-align: center; } @media (width >= 1024px) { + .mobile-header, #menu-close { + display: none; + } + + body > header { + position: sticky; + top: 0; + left: 0; + width: 15em; + float: left; + } + + .container { + margin-right: 0; + margin-left: 18em; + } + .metadata p { display: inline; } @@ -229,130 +228,134 @@ body { * Content Styling */ -main { - .translations { - text-align: end; - margin-bottom: 0.3em; - - a { - text-decoration: none; - } - } - - & > article { - text-align: justify; - - & > header { - margin-bottom: calc(2 * var(--pico-block-spacing-vertical)); - - h1, p { - margin-bottom: calc(0.1 * var(--pico-typography-spacing-vertical)); - margin-top: 0.3em; - } - - - .category a { - font-family: var(--pico-font-family-sans-serif); - font-weight: 700; - line-height: var(--pico-line-height); - color: var(--pico-muted-color); - text-decoration: none; - font-size: 1rem; - margin-bottom: 0.5em; - } - } - - ul > li { - list-style-type: disc; - } - - h1, h2, h3, h4, h5, h6 { - font-family: var(--pico-font-family-sans-serif); - text-align: left; - - a { - color: var(--pico-muted-color); - text-decoration: none; - margin-left: 0.4rem; - font-size: 1rem; - } - } - - h1 { - font-size: 1.7rem; - } - - h2 { - font-size: 1.3rem; - - &::before { - content: "## "; - color: var(--markup-color); - } - } - - h3 { - font-size: 1.2rem; - - &::before { - content: "### "; - color: var(--markup-color); - } - } - - h4 { - font-size: 1.1rem; - - &::before { - content: "#### "; - color: var(--markup-color); - } - } - - h5 { - font-size: 1rem; - - &::before { - content: "##### "; - color: var(--markup-color); - } - } - - h6 { - font-size: 1rem; - - &::before { - content: "###### "; - color: var(--markup-color); - } - } - - pre { - margin-bottom: calc(1.5 * var(--pico-spacing)); - } - - code, kbd, pre { - font-size: 0.8em; - } - - a[rel="external"]::after { - content: "\ecae"; - font-size: 0.7em; - margin-left: 0.2em; - font-family: 'remixicon' !important; - font-style: normal; - color: var(--pico-muted-color); - text-decoration: none; - } - - figure { - max-width: 50%; - text-align: center; - margin: var(--pico-block-spacing-vertical) auto; - } - } +.translations { + text-align: end; + margin-bottom: 0.3em; } +.translations a { + text-decoration: none; +} + +main > article { + text-align: justify; +} + +main > article > header { + margin-bottom: calc(2 * var(--pico-block-spacing-vertical)); +} + +ul.tags, ul.tags li { + list-style-type: none; + display: inline; + padding-left: 0; + margin-bottom: 0; +} + +ul > li { + list-style-type: disc; +} + +h1, h2, h3, h4, h5, h6 { + font-family: var(--pico-font-family-sans-serif); + text-align: left; +} + +h1 { + font-size: 1.7rem; +} + +h2 { + font-size: 1.3rem; +} + +h2::before { + content: "## "; + color: var(--markup-color); +} + +h3 { + font-size: 1.2rem; +} + +h3::before { + content: "### "; + color: var(--markup-color); +} + +h4 { + font-size: 1.1rem; +} + +h4::before { + content: "#### "; + color: var(--markup-color); +} + +h5 { + font-size: 1rem; +} + +h5::before { + content: "##### "; + color: var(--markup-color); +} + +h6 { + font-size: 1rem; +} + +h6::before { + content: "###### "; + color: var(--markup-color); +} + +article header h1, article header p { + margin-bottom: calc(0.1 * var(--pico-typography-spacing-vertical)); + margin-top: 0.3em; +} + + +article header .category a { + font-family: var(--pico-font-family-sans-serif); + font-weight: 700; + line-height: var(--pico-line-height); + color: var(--pico-muted-color); + text-decoration: none; + font-size: 1rem; + margin-bottom: 0.5em; +} + +h2 a, h3 a, h4 a, h5 a, h6 a { + color: var(--pico-muted-color); + text-decoration: none; + margin-left: 0.4rem; + font-size: 1rem; +} + +pre { + margin-bottom: calc(1.5 * var(--pico-spacing)); +} + +code, kbd, pre { + font-size: 0.8em; +} + +a[rel="external"]::after { + content: "\ecae"; + font-size: 0.7em; + margin-left: 0.2em; + font-family: 'remixicon' !important; + font-style: normal; + color: var(--pico-muted-color); + text-decoration: none; +} + +figure { + max-width: 50%; + text-align: center; + margin: var(--pico-block-spacing-vertical) auto; +} /* * Admonitions @@ -371,20 +374,16 @@ main { * Post lists */ -.h-feed { - article{ - &:not(:last-child) { - border-bottom: var(--pico-border-width) solid var(--pico-card-border-color); - margin-bottom: 0; - } - - p { - margin-bottom: calc(0.2 * var(--pico-typography-spacing-vertical)); - } - - .p-summary { - font-size: 0.9em; - font-style: italic; - } - } +.h-feed article:not(:last-child) { + border-bottom: var(--pico-border-width) solid var(--pico-card-border-color); + margin-bottom: 0; +} + +.h-feed article p { + margin-bottom: calc(0.2 * var(--pico-typography-spacing-vertical)); +} + +.h-feed article .p-summary { + font-size: 0.9em; + font-style: italic; } diff --git a/content/blog/jj-main-vcs/index.en.md b/content/blog/jj-main-vcs/index.en.md index ddeded4..a71672c 100644 --- a/content/blog/jj-main-vcs/index.en.md +++ b/content/blog/jj-main-vcs/index.en.md @@ -26,11 +26,7 @@ replacement of git. does things right: -- undo that works -- versioned working copy (restore a deleted file to a previous version) - jj git fetch removes local branches when the remote is removed -- jj log shows what is useful by default without noise -- rebase of trees -- rebase of multiple branches +- undo that works [jj]: https://github.com/jj-vcs/jj diff --git a/layouts/baseof.html b/layouts/baseof.html index 6db0687..e1c7971 100644 --- a/layouts/baseof.html +++ b/layouts/baseof.html @@ -30,12 +30,10 @@ - {{ partial "header.html" . }} - - + {{- if .IsTranslated }} {{- range .Translations }} @@ -49,8 +47,7 @@ {{ block "main" . }}{{ end }} - -