Skip to content

Commit

Permalink
fix(layout): grid triage and regression (jackyzha0#1440)
Browse files Browse the repository at this point in the history
* fix(table of contents): multiple scrollbars (jackyzha0#1388)

* fix(center): Main content mininum width (jackyzha0#1439)

* fix(code block): Horizontal overflow fix (jackyzha0#1438, jackyzha0#1353)

* WIP fix for ul/ol .overflow

* Fix: restore former scrollbar behavior for overflow lists (jackyzha0#1437)

* Fix: code block overflow-x

* fix: Table of Content overflow (jackyzha0#1437)

* Address feedback

* Move max-height toggle from js to css
  • Loading branch information
saberzero1 authored Sep 25, 2024
1 parent 921f45c commit a7a0dca
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 23 deletions.
1 change: 0 additions & 1 deletion quartz/components/scripts/explorer.inline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ function toggleExplorer(this: HTMLElement) {
if (!content) return

content.classList.toggle("collapsed")
content.style.maxHeight = content.style.maxHeight === "0px" ? content.scrollHeight + "px" : "0px"
}

function toggleFolder(evt: MouseEvent) {
Expand Down
2 changes: 0 additions & 2 deletions quartz/components/scripts/toc.inline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ function toggleToc(this: HTMLElement) {
const content = this.nextElementSibling as HTMLElement | undefined
if (!content) return
content.classList.toggle("collapsed")
content.style.maxHeight = content.style.maxHeight === "0px" ? content.scrollHeight + "px" : "0px"
}

function setupToc() {
Expand All @@ -32,7 +31,6 @@ function setupToc() {
const collapsed = toc.classList.contains("collapsed")
const content = toc.nextElementSibling as HTMLElement | undefined
if (!content) return
content.style.maxHeight = collapsed ? "0px" : content.scrollHeight + "px"
toc.addEventListener("click", toggleToc)
window.addCleanup(() => toc.removeEventListener("click", toggleToc))
}
Expand Down
13 changes: 3 additions & 10 deletions quartz/components/styles/backlinks.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
@use "../../styles/variables.scss" as *;

.backlinks {
@media all and not ($desktop) {
@media all and not ($mobile) {
overflow-y: auto;
display: initial;
display: flex;
flex-direction: column;
&:after {
pointer-events: none;
content: "";
Expand All @@ -17,10 +18,6 @@
background: linear-gradient(transparent 0px, var(--light));
}

&:has(> .overflow) {
position: unset;
}

& > h3 {
font-size: 1rem;
margin: 0;
Expand All @@ -39,10 +36,6 @@
}

& > .overflow {
max-height: unset;
& > li:last-of-type {
margin-bottom: 0;
}
&:after {
display: none;
}
Expand Down
11 changes: 9 additions & 2 deletions quartz/components/styles/explorer.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
@use "../../styles/variables.scss" as *;

.explorer {
display: flex;
flex-direction: column;
overflow-y: hidden;
&.desktop-only {
overflow-y: auto;
@media all and not ($mobile) {
display: flex;
}
}
&:after {
pointer-events: none;
Expand Down Expand Up @@ -62,14 +67,16 @@ button#explorer {
#explorer-content {
list-style: none;
overflow: hidden;
max-height: none;
overflow-y: auto;
max-height: 100%;
transition:
max-height 0.35s ease,
visibility 0s linear 0s;
margin-top: 0.5rem;
visibility: visible;

&.collapsed {
max-height: 0;
transition:
max-height 0.35s ease,
visibility 0s linear 0.35s;
Expand Down
20 changes: 15 additions & 5 deletions quartz/components/styles/toc.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
.toc {
overflow-y: auto;
display: flex;
flex-direction: column;
&.desktop-only {
display: flex;
max-height: 40%;
}
}

button#toc {
Expand Down Expand Up @@ -32,17 +37,19 @@ button#toc {
#toc-content {
list-style: none;
overflow: hidden;
max-height: none;
overflow-y: auto;
max-height: 100%;
transition:
max-height 0.5s ease,
max-height 0.35s ease,
visibility 0s linear 0s;
position: relative;
visibility: visible;

&.collapsed {
max-height: 0;
transition:
max-height 0.5s ease,
visibility 0s linear 0.5s;
max-height 0.35s ease,
visibility 0s linear 0.35s;
visibility: hidden;
}

Expand All @@ -65,6 +72,9 @@ button#toc {
}
}
}
> ul.overflow {
max-height: none;
}

@for $i from 0 through 6 {
& .depth-#{$i} {
Expand Down
10 changes: 7 additions & 3 deletions quartz/styles/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@ a {

& .center,
& footer {
max-width: 100%;
min-width: 100%;
margin-left: auto;
margin-right: auto;
@media all and ($desktop) {
Expand Down Expand Up @@ -416,7 +418,7 @@ pre {
counter-increment: line 0;
display: grid;
padding: 0.5rem 0;
overflow-x: scroll;
overflow-x: auto;

& [data-highlighted-chars] {
background-color: var(--highlight);
Expand Down Expand Up @@ -535,12 +537,15 @@ video {
}

div:has(> .overflow) {
display: flex;
position: relative;
overflow-y: auto;
max-height: 100%;
}

ul.overflow,
ol.overflow {
max-height: 400;
max-height: 100%;
overflow-y: auto;

// clearfix
Expand All @@ -550,7 +555,6 @@ ol.overflow {
& > li:last-of-type {
margin-bottom: 30px;
}

&:after {
pointer-events: none;
content: "";
Expand Down

0 comments on commit a7a0dca

Please sign in to comment.