diff options
| -rw-r--r-- | config/emacs.org | 5 | ||||
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | flake.nix | 14 | ||||
| m--------- | nix | 0 | ||||
| -rw-r--r-- | style.css | 519 |
5 files changed, 372 insertions, 172 deletions
diff --git a/config/emacs.org b/config/emacs.org index b792212..5bf4838 100644 --- a/config/emacs.org +++ b/config/emacs.org @@ -164,11 +164,16 @@ This is my org mode configuration, which also configures latex. (org-pretty-entities t "prettify org mode") (org-agenda-files (list "~/monorepo/agenda.org" "~/org/notes.org" "~/org/agenda.org") "set default org files") (org-default-notes-file (concat org-directory "/notes.org") "Notes file") + (org-html-viewport '((width "device-width") + (initial-scale "1.0") + (minimum-scale "1.0")) "Prevent zooming out past default size") (org-publish-project-alist '(("website-org" :base-directory "~/monorepo" :base-extension "org" :publishing-directory "~/website_html" + :with-author t + :with-date t :recursive t :publishing-function org-html-publish-to-html :headline-levels 4 @@ -593,11 +593,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1772542754, - "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", + "lastModified": 1772624091, + "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4", + "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", "type": "github" }, "original": { @@ -125,6 +125,8 @@ fi pkgs.ghostscript pkgs.imagemagick pkgs.jq + pkgs.lora + pkgs.inconsolata (pkgs.texlive.combine { inherit (pkgs.texlive) scheme-full @@ -136,7 +138,6 @@ fi }) ]; - buildPhase = '' export HOME=$TMPDIR/fake-home mkdir -p $HOME/.emacs.d @@ -163,7 +164,7 @@ emacs -q --batch \ --eval '(setq noninteractive t)' \ --eval '(setq system-email "lol@troll.com")' \ --eval '(setq system-username "ci-runner")' \ - --eval '(setq system-fullname "CI")' \ + --eval '(setq system-fullname "Preston Pan")' \ --eval '(setq system-gpgkey "00000000")' \ --eval '(defun package-vc-install (&rest args) (message "blocked package-vc-install for %s" args))' \ --eval '(defun package-vc--unpack (&rest args) nil)' \ @@ -191,7 +192,6 @@ emacs -q --batch \ --eval '(org-roam-db-sync)' \ --eval '(setq term-file-prefix nil)' \ --eval '(load-theme (quote doom-rouge) t)' \ - --eval '(setq htmlize-output-type (quote font))' \ --eval '(setq custom-safe-themes t)' \ --eval '(force-mode-line-update)' \ --eval '(setq org-html-link-use-abs-url nil)' \ @@ -209,7 +209,11 @@ ${publish-org-roam-ui.packages.${system}.default}/bin/build-org-roam-graph \ ''; installPhase = '' -mkdir -p $out +mkdir -p $out/fonts + +cp -L ${pkgs.lora}/share/fonts/truetype/*.ttf $out/fonts/ +cp -L ${pkgs.inconsolata}/share/fonts/truetype/inconsolata/*.ttf $out/fonts + cp -r $HOME/website_html/. $out/ cp ${installer-iso}/iso/*.iso $out/installer.iso cd $out @@ -234,7 +238,6 @@ sha256sum installer.iso > installer.iso.sha256 }; devShells."${system}".default = with pkgs; mkShell { - shellHook = '' ${pre-commit-check.shellHook} git config branch.main.mergeoptions "--no-ff" @@ -244,6 +247,7 @@ alias gprune='git branch --merged | grep -v -E "^\*|main|master|dev" | xargs -r deadnix lychee python3 + miniserve ]; }; }; diff --git a/nix b/nix -Subproject 6f08e9d393e7c6cf3bfae4374e244bc84e2cb0b +Subproject d1412b325e95cea7d820c89b561d43a291203e8 @@ -1,49 +1,78 @@ -@import url("https://fonts.googleapis.com/css2?family=Lora:wght@500&display=swap"); -@import url("https://fonts.googleapis.com/css2?family=Inconsolata&display=swap"); +@font-face { + font-family: 'Lora'; + font-style: normal; + font-weight: 500; + src: url('./fonts/Lora-Medium.ttf') format('truetype'); +} + +@font-face { + font-family: 'Inconsolata'; + font-style: normal; + font-weight: 400; + src: url('./fonts/Inconsolata-Regular.ttf') format('truetype'); +} + +:root { + --bg-main: #FBF8F1; + --text-main: #4A3F35; + --toc-bg: #EAE3D2; + --toc-text: #4A3F35; + --quote-accent: #D4A373; + --link-color: #8C6239; +} + +/* @media (prefers-color-scheme: dark) { */ +/* :root { */ +/* --bg-main: #1e1e2e; */ +/* --text-main: #cdd6f4; */ +/* --toc-bg: #11111b; */ +/* --quote-accent: #f5c2e7; */ +/* } */ +/* } */ body { + background: + radial-gradient(rgba(0,0,0,0.02) 1px, transparent 1px), + var(--bg-main); + max-width: 65ch; + line-height: 1.75; + background-size: 6px 6px; margin: 40px auto; - width: 700px; - line-height: 1.6; font-size: 16px; - background: #fffff4; - color: #3a1616; + color: var(--text-main); padding: 0 10px; + /* fonts */ font-size: 18px; - line-height: 28px; font-family: "Lora"; font-weight: 500; - /* Smooth the font a little bit, it's a - bit too bold on retina screens */ + font-variant-ligatures: common-ligatures; -webkit-font-smoothing: antialiased; + + @media (max-width: 1250px) { + margin: 20px auto; + font-size: 20px; + } } -/* --------------------------------------------------- */ -/* Make a nice input form with rounded corners and hover - animations*/ -/* --------------------------------------------------- */ input { padding: 10px 16px; margin: 2px 0; box-sizing: border-box; border: 2px solid #dabebe; border-radius: 6px; - background: #fffff4; - color: #3a1616; + background: var(--bg-main); + color: var(--text-main); font-size: 16px; -webkit-transition: 0.5s; transition: 0.5s; outline: none; -} -input:focus { - border: 2px solid #3a1616; + &:focus { + border: 2px solid var(--text-main); + } } -/* --------------------------------------- */ -/* The button is very similar to the input */ -/* --------------------------------------- */ .button { - background-color: #fffff4; + background-color: var(--bg-main); border: none; color: black; padding: 6px 14px; @@ -54,17 +83,14 @@ input:focus { margin: 4px 2px; transition-duration: 0.4s; cursor: pointer; - border: 2px solid #3a1616; + border: 2px solid var(--text-main); border-radius: 6px; -} -.button:hover { - background-color: #3a1616; - color: white; + &:hover { + background-color: var(--text-main); + color: white; + } } -/* ----------------------------------------------- */ -/* Various classes for messages of different kinds */ -/* ----------------------------------------------- */ .isa_info, .isa_success, .isa_warning, @@ -77,14 +103,17 @@ input:focus { color: #00529b; background-color: #bde5f8; } + .isa_success { color: #4f8a10; background-color: #dff2bf; } + .isa_warning { color: #9f6000; background-color: #feefb3; } + .isa_error { color: #d8000c; background-color: #ffd2d2; @@ -97,6 +126,57 @@ h3 { font-family: "Lora"; } +h1 { + @media (max-width: 1250px) { + font-size: 20px; + } +} + +h2 { + @media (max-width: 1250px) { + font-size: 18px; + } +} + +h1, h2 { + border-bottom: 1px solid var(--border-color); /* Uses your existing #dabebe */ + padding-bottom: 8px; + margin-top: 2.5rem; + letter-spacing: -0.01em; + position: relative; +} + +h1 { + font-size: 2.1rem; + margin-top: 3rem; + margin-bottom: 1rem; +} + +h2 { + font-size: 1.6rem; + margin-top: 2.5rem; + margin-bottom: 0.6rem; +} + +h3 { + font-size: 1.25rem; + margin-top: 2rem; + margin-bottom: 0.4rem; +} + +p { + margin: 1.2rem 0; +} + +p, ul, ol { + margin-top: 1rem; + margin-bottom: 1rem; +} + +li { + margin: 0.3rem 0; +} + img { border-radius: 10px; text-align: center; @@ -111,34 +191,45 @@ img { max-width: none; } -mjx-container[jax="CHTML"] { +mjx-container[jax="CHTML"][display="true"] { text-align: left !important; + background: rgba(212, 163, 115, 0.05); + padding: 1.5rem; + border-left: 2px solid var(--quote-accent); + margin: 2rem 0 !important; + overflow-x: auto; + + /* Hide scrollbar for Firefox */ + scrollbar-width: none; + /* Hide scrollbar for IE/Edge */ + -ms-overflow-style: none; } -/* --------------------------------------------- */ -/* Bold hover animations on links and clickables */ -/* --------------------------------------------- */ -a { - cursor: pointer; - color: #217ab7; - line-height: inherit; - transition: 0.14s; +/* Hide scrollbar for Chrome, Safari and Opera */ +mjx-container[jax="CHTML"][display="true"]::-webkit-scrollbar { + display: none; } -a:hover { - color: white; - background-color: #3297d3; -} -a:visited { - color: #43458b; - border-color: #43458b; -} -a:visited:hover { - color: white; - background-color: #9251ac; + +/* Inline MathJax (Inside paragraphs) */ +mjx-container[jax="CHTML"]:not([display="true"]) { + padding: 0; + margin: 0; + background: transparent; + border: none; } -pre { - font-family: "Inconsolata", monospace; +a { + cursor: pointer; + color: var(--link-color); + text-decoration: underline; + text-decoration-thickness: 2px; + text-underline-offset: 4px; + transition: all 0.2s ease-in-out; + + &:hover { + color: color-mix(in srgb, var(--link-color) 80%, black); + text-decoration-thickness: 4px; + } } ::selection { @@ -147,167 +238,267 @@ pre { } #table-of-contents { - height: 100%; /* Full-height: remove this if you want "auto" height */ - width: 250px; /* Set the width of the sidebar */ - position: fixed; /* Fixed Sidebar (stay in place on scroll) */ - z-index: 1; /* Stay on top */ - top: 0; /* Stay at the top */ + height: 100vh; + width: 250px; + position: fixed; + z-index: 10; + top: 0; left: 0; - font-size: 0px; - overflow-x: hidden; /* Disable horizontal scroll */ - padding-top: 20px; - border-right: 1px; - background: #133201; -} + padding-top: 0; + background: var(--toc-bg); + border-right: 1px solid var(--quote-accent); + overflow-y: auto; + overflow-x: hidden; + scrollbar-width: none; -#table-of-contents ul a { - padding: 6px 8px 6px 16px; - text-decoration: none; - font-size: 25px; - display: block; - font-size: 15px; - color: black; -} + &::-webkit-scrollbar { display: none; } -#table-of-contents ul a { - padding: 6px 8px 6px 16px; - text-decoration: none; - font-size: 25px; - display: block; - font-size: 15px; - color: white; - background-color: #133201; -} + h2 { + display: none !important; + } + /* 2. Insert the aligned futuristic header */ + &::before { + content: "NAVIGATION"; + display: block; + /* Padding math: 19px left matches the link text exactly */ + padding: 24px 16px 12px 19px; + font-family: "Inconsolata"; + font-size: 11px; + font-weight: bold; + letter-spacing: 2px; + color: var(--text-main); + border-bottom: 1px solid rgba(212, 163, 115, 0.2); + margin-bottom: 10px; + } -#table-of-contents ul a:hover { - color: white; - background-color: #133201; -} + ul { + list-style-type: none; + padding-left: 0; + margin: 0; -#table-of-contents ul a:visited { - color: white; - border-color: #133201; -} + a { + display: block; + width: 218px; + padding: 10px 16px; + font-size: 13px; + font-family: "Inconsolata"; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1); + border-left: 3px solid transparent; + + &, &:visited { + color: var(--text-main); + text-decoration: none; + } -#table-of-contents ul a:visited:hover { - color: white; - background-color: #133201; -} + &:hover { + background-color: var(--text-main); + color: var(--bg-main); + padding-left: 22px; + border-left: 3px solid var(--quote-accent); + } + } + + ul { + a { + padding-left: 32px; + font-size: 12px; + opacity: 0.8; + width: 202px; /* Adjusted width for nesting */ + + &:hover { + padding-left: 38px; + } + } + } + } -#table-of-contents ul { - list-style-type: none; - padding-left: 0; + @media (max-width: 1250px) { + display: none; + } } .content { - margin-left: 160px; /* Same as the width of the sidebar */ + margin-left: 160px; padding: 0px 10px; + @media (max-width: 1250px) { + margin-left: 0; + } } .src, .example { + background: #1e1e2e; color: #cdd6f4; - background-color: #1e1e2e; - box-shadow: - rgba(0, 0, 0, 0.3) 0px 19px 38px, - rgba(0, 0, 0, 0.22) 0px 15px 12px; + padding: 1rem; + border-radius: 6px; + overflow-x: auto; + font-size: 0.9rem; + box-shadow: none; + + scrollbar-width: none; + -ms-overflow-style: none; +} + +.src::-webkit-scrollbar, +.example::-webkit-scrollbar { + display: none; } #postamble { text-align: center; } -pre.src-stem:before { - content: "Stem"; +pre { + font-family: "Inconsolata", monospace; + &.src-stem::before { + content: "Stem"; + } } -.links-page > ul { - columns: 2; - -webkit-columns: 2; - -moz-columns: 2; +.theorem, .proof { + display: block; + margin-left: 10px; + font-style: normal; + background: color-mix(in srgb, var(--quote-accent) 8%, transparent); + border-left: 3px solid var(--quote-accent); + padding: 1rem 1.3rem; + margin: 2rem 0; + &::before { + float: left; + font-weight: bold; + } } .theorem { - display:block; - margin-left:10px; margin-bottom:20px; - font-style:normal; -} - -.theorem:before { - content:"Theorem.\00a0\00a0"; - float:left; - font-weight:bold; + &::before { + content:"Theorem.\00a0\00a0"; + } } .proof { - display:block; - margin-left:10px; margin-bottom:30px; - font-style:normal; -} -.proof:before { - content:'Proof.\00a0\00a0'; - float:left; - font-weight:bold; + &::before { + content:'Proof.\00a0\00a0'; + } + + &::after { + content: "\25FC"; + float: right; + } } -.proof:after { - content:"\25FC"; - float:right; +.links-page > ul { + columns: 2; + -webkit-columns: 2; + -moz-columns: 2; } + blockquote { - width:60%; - margin:50px auto; - font-style:italic; - color: #555555; - padding:1.2em 30px 1.2em 75px; - border-left:8px solid #78C0A8 ; - line-height:1.6; + width: 80%; + margin: 40px auto; + font-style: italic; + color: var(--text-main); + padding: 1.5em 30px 1.5em 60px; + border-left: 4px solid var(--quote-accent); + border-radius: 0 8px 8px 0; + line-height: 1.6; position: relative; - background:#EDEDED; + background: color-mix(in srgb, var(--quote-accent) 15%, transparent); + + &::before { + font-family: "Lora", serif; + content: "\201C"; + color: var(--quote-accent); + font-size: 5em; + position: absolute; + left: 10px; + top: -20px; + opacity: 0.5; + } + + &::after { content: ''; } } -blockquote::before { - font-family:Arial; - content: "\201C"; - color:#78C0A8; - font-size:4em; - position: absolute; - left: 10px; - top:-10px; + +figure { + margin: 2rem auto; + text-align: center; } -blockquote::after{ - content: ''; +figcaption { + font-size: 0.9rem; + color: color-mix(in srgb, var(--text-main) 80%, gray); + margin-top: 0.5rem; } -/* On smaller screens, where height is less than 450px, change the style of the sidebar (less padding and a smaller font size) */ -@media screen and (max-height: 450px) { - .sidenav { - padding-top: 15px; - } - .sidenav a { - font-size: 18px; + +.title { + font-size: 2.6rem; + margin-bottom: 0.5rem; +} + +.subtitle { + font-size: 1.2rem; + color: color-mix(in srgb, var(--text-main) 70%, gray); +} + +.author, .date { + display: inline; + font-family: "Lora"; + font-style: italic; + font-size: 1.1rem; + color: color-mix(in srgb, var(--text-main) 70%, gray); +} + +.author { + &::before { + content: "by "; + font-family: "Inconsolata"; + font-style: normal; + font-weight: bold; + text-transform: uppercase; + font-size: 0.8rem; + letter-spacing: 1px; + margin-right: 4px; + } + &:not(:last-child)::after { + content: ", "; + font-style: normal; } } -@media (max-width: 1250px) { +header, .title + p, .subtitle + p { + margin-bottom: 3rem; + border-bottom: 1px double var(--quote-accent); + padding-bottom: 1rem; +} + +@media (max-width: 768px) { body { - margin: 20px auto; - font-size: 20px; - } - h1 { - font-size: 20px; + max-width: 100%; + padding: 0 15px; + box-sizing: border-box; } - h2 { - font-size: 18px; + + h1 { font-size: 2rem; } + h2 { font-size: 1.5rem; } + + img, blockquote, .src, .example, mjx-container[jax="CHTML"][display="true"] { + max-width: 100%; + box-sizing: border-box; } - #table-of-contents { - display: none; + + blockquote { + padding: 1em 15px 1em 40px; + width: 100%; } - #table-of-contents ul a { - padding: 0px 0px 0px 0px; - text-decoration: none; + + .src, .example, mjx-container[jax="CHTML"][display="true"] { + width: 100%; + overflow-x: auto; } } |