From f31cabbbf9b0d438710618a3edd2a4eaaae09d7d Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 15 Jan 2024 20:37:56 +0000
Subject: [PATCH] fix: dont use default callout title if theres additional title children left (closes #693)
---
quartz/styles/base.scss | 221 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 176 insertions(+), 45 deletions(-)
diff --git a/quartz/styles/base.scss b/quartz/styles/base.scss
index 2e56928..607749a 100644
--- a/quartz/styles/base.scss
+++ b/quartz/styles/base.scss
@@ -1,17 +1,23 @@
+@use "./variables.scss" as *;
@use "./syntax.scss";
@use "./callouts.scss";
-@use "./variables.scss" as *;
html {
scroll-behavior: smooth;
+ -webkit-text-size-adjust: none;
+ text-size-adjust: none;
+ overflow-x: hidden;
+ width: 100vw;
}
-body {
+body,
+section {
margin: 0;
max-width: 100%;
box-sizing: border-box;
background-color: var(--light);
font-family: var(--bodyFont);
+ color: var(--darkgray);
}
.text-highlight {
@@ -20,13 +26,29 @@
border-radius: 5px;
}
-p, ul, text, a, tr, td, li, ol, ul, .katex, .math {
+::selection {
+ background: color-mix(in srgb, var(--tertiary) 75%, transparent);
+ color: var(--darkgray);
+}
+
+p,
+ul,
+text,
+a,
+tr,
+td,
+li,
+ol,
+ul,
+.katex,
+.math {
color: var(--darkgray);
fill: var(--darkgray);
+ overflow-wrap: anywhere;
+ hyphens: auto;
}
.math {
- font-size: 1.1rem;
&.math-display {
text-align: center;
}
@@ -47,6 +69,12 @@
background-color: var(--highlight);
padding: 0 0.1rem;
border-radius: 5px;
+
+ &:has(> img) {
+ background-color: none;
+ border-radius: 0;
+ padding: 0;
+ }
}
}
@@ -66,11 +94,9 @@
.page {
@media all and (max-width: $fullPageWidth) {
- margin: 0 5vw;
- }
-
- & p {
- overflow-wrap: anywhere;
+ margin: 0 auto;
+ padding: 0 1rem;
+ max-width: $pageWidth;
}
& article {
@@ -78,14 +104,24 @@
font-size: 2rem;
}
- & li:has(> input[type='checkbox']) {
+ & li:has(> input[type="checkbox"]) {
list-style-type: none;
padding-left: 0;
- margin-left: -1.4rem;
+ }
+
+ & li:has(> input[type="checkbox"]:checked) {
+ text-decoration: line-through;
+ text-decoration-color: var(--gray);
+ color: var(--gray);
}
& li > * {
- margin: 0;
+ margin-top: 0;
+ margin-bottom: 0;
+ }
+
+ p > strong {
+ color: var(--dark);
}
}
@@ -112,14 +148,14 @@
flex-direction: row;
padding: 0;
width: initial;
- margin-top: 4rem;
+ margin-top: 2rem;
}
}
& .sidebar.left {
left: calc(calc(100vw - $pageWidth) / 2 - $sidePanelWidth);
@media all and (max-width: $fullPageWidth) {
- gap: 1rem;
+ gap: 0;
align-items: center;
}
}
@@ -143,10 +179,11 @@
}
}
- & .center, & footer {
- width: $pageWidth;
+ & .center,
+ & footer {
margin-left: auto;
margin-right: auto;
+ width: $pageWidth;
@media all and (max-width: $fullPageWidth) {
width: initial;
margin-left: 0;
@@ -163,8 +200,33 @@
input[type="checkbox"] {
transform: translateY(2px);
color: var(--secondary);
- border-color: var(--lightgray);
+ border: 1px solid var(--lightgray);
+ border-radius: 3px;
background-color: var(--light);
+ position: relative;
+ margin-inline-end: 0.2rem;
+ margin-inline-start: -1.4rem;
+ appearance: none;
+ width: 16px;
+ height: 16px;
+
+ &:checked {
+ border-color: var(--secondary);
+ background-color: var(--secondary);
+
+ &::after {
+ content: "";
+ position: absolute;
+ left: 4px;
+ top: 1px;
+ width: 4px;
+ height: 8px;
+ display: block;
+ border: solid var(--light);
+ border-width: 0 2px 2px 0;
+ transform: rotate(45deg);
+ }
+ }
}
blockquote {
@@ -194,9 +256,12 @@
}
}
-
-
-h1, h2, h3, h4, h5, h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
&[id] > a[href^="#"] {
margin: 0 0.5rem;
opacity: 0;
@@ -206,16 +271,46 @@
font-family: var(--codeFont);
user-select: none;
}
+
&[id]:hover > a {
opacity: 1;
}
}
-div[data-rehype-pretty-code-fragment] {
- line-height: 1.5rem;
+// typography improvements
+h1 {
+ font-size: 1.75rem;
+ margin-top: 2.25rem;
+ margin-bottom: 1rem;
+}
+
+h2 {
+ font-size: 1.4rem;
+ margin-top: 1.9rem;
+ margin-bottom: 1rem;
+}
+
+h3 {
+ font-size: 1.12rem;
+ margin-top: 1.62rem;
+ margin-bottom: 1rem;
+}
+
+h4,
+h5,
+h6 {
+ font-size: 1rem;
+ margin-top: 1.5rem;
+ margin-bottom: 1rem;
+}
+
+figure[data-rehype-pretty-code-figure] {
+ margin: 0;
+ position: relative;
+ line-height: 1.6rem;
position: relative;
- & > div[data-rehype-pretty-code-title] {
+ & > [data-rehype-pretty-code-title] {
font-family: var(--codeFont);
font-size: 0.9rem;
padding: 0.1rem 0.5rem;
@@ -227,16 +322,17 @@
}
& > pre {
- padding: 0.5rem 0;
+ padding: 0;
}
}
pre {
font-family: var(--codeFont);
- padding: 0.5rem;
+ padding: 0 0.5rem;
border-radius: 5px;
overflow-x: auto;
border: 1px solid var(--lightgray);
+ position: relative;
&:has(> code.mermaid) {
border: none;
@@ -249,6 +345,7 @@
counter-reset: line;
counter-increment: line 0;
display: grid;
+ padding: 0.5rem 0;
& [data-highlighted-chars] {
background-color: var(--highlight);
@@ -276,11 +373,11 @@
}
}
- &[data-line-numbers-max-digits='2'] > [data-line]::before {
+ &[data-line-numbers-max-digits="2"] > [data-line]::before {
width: 2rem;
}
-
- &[data-line-numbers-max-digits='3'] > [data-line]::before {
+
+ &[data-line-numbers-max-digits="3"] > [data-line]::before {
width: 3rem;
}
}
@@ -295,20 +392,46 @@
background: var(--lightgray);
}
-tbody, li, p {
- line-height: 1.5rem;
+tbody,
+li,
+p {
+ line-height: 1.6rem;
}
-table {
- margin: 1rem 0;
- border: 1px solid var(--gray);
- padding: 1.5rem;
- border-collapse: collapse;
+.table-container {
+ overflow-x: auto;
+
+ & > table {
+ margin: 1rem;
+ padding: 1.5rem;
+ border-collapse: collapse;
+
+ th,
+ td {
+ min-width: 75px;
+ }
+
+ & > * {
+ line-height: 2rem;
+ }
+ }
}
-td, th {
- padding: 0.2rem 1rem;
- border: 1px solid var(--gray);
+th {
+ text-align: left;
+ padding: 0.4rem 0.7rem;
+ border-bottom: 2px solid var(--gray);
+}
+
+td {
+ padding: 0.2rem 0.7rem;
+}
+
+tr {
+ border-bottom: 1px solid var(--lightgray);
+ &:last-child {
+ border-bottom: none;
+ }
}
img {
@@ -330,7 +453,8 @@
background-color: var(--lightgray);
}
-audio, video {
+audio,
+video {
width: 100%;
border-radius: 5px;
}
@@ -339,23 +463,24 @@
flex: 1 1 auto;
}
-ul.overflow, ol.overflow {
- height: 400px;
- overflow-y: scroll;
+ul.overflow,
+ol.overflow {
+ max-height: 400;
+ overflow-y: auto;
// clearfix
content: "";
clear: both;
& > li:last-of-type {
- margin-bottom: 50px;
+ margin-bottom: 30px;
}
&:after {
pointer-events: none;
- content: '';
+ content: "";
width: 100%;
- height: 50px;
+ height: 50px;
position: absolute;
left: 0;
bottom: 0;
@@ -364,3 +489,9 @@
background: linear-gradient(transparent 0px, var(--light));
}
}
+
+.transclude {
+ ul {
+ padding-left: 1rem;
+ }
+}
--
Gitblit v1.10.0