Skip to content

Fix codeblock types not overlapping in callout #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 6, 2025
Merged

Fix codeblock types not overlapping in callout #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c8ff38
Codeblock: Fix types not overlapping in callout
lamATnginx Oct 2, 2025
468de92
Codeblock: Handle zooming for firefox + chrome
lamATnginx Oct 2, 2025
36ff481
Codeblock: Refactored codeblock to handle all cases
lamATnginx Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 29 additions & 13 deletions assets/css/v2/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2019,10 +2019,6 @@ blockquote {
}
}

.callout-content {
margin: 0;
}

/* To help them align with text, side callouts should not have top margin*/
&[data-grid="last-third"] {
--margin-callout: 0 0 0 1rem;
Expand Down Expand Up @@ -2296,6 +2292,8 @@ a:has(code:not(pre code)) {
.code-block {
position: relative;
margin: var(--margin-codeblock); /* Expand into the gutter */
display: flex;
flex-direction: column;

tr::after {
display: none;
Expand All @@ -2307,20 +2305,38 @@ a:has(code:not(pre code)) {
}

.code-type {
display: inline-block;
height: 1.5rem;
border-top: 1px solid oklch(var(--color-codeblock-border));
border-left: 1px solid oklch(var(--color-codeblock-border));
border-right: 1px solid oklch(var(--color-codeblock-border));
position: relative;
border: none;
text-transform: uppercase;
padding: 0.15rem 0.5rem;
font-size: 0.75rem;
z-index: 2;
margin: 0 0 -1px 0;
display: flex;

&::after {
content: "";
display: block;
flex: 1;
height: auto;
border-bottom: 1px solid oklch(var(--color-codeblock-border));
}

.title {
display: inline-block;
padding: 0.15rem 0.5rem;
border-top: 1px solid oklch(var(--color-codeblock-border));
border-left: 1px solid oklch(var(--color-codeblock-border));
border-right: 1px solid oklch(var(--color-codeblock-border));
border-bottom: none;
}

/* Hide the top border only if code-type exists in code-block */
& + .code-container {
border-top: none;
}
}

.code-container {
box-shadow: 3px 3px 0px oklch(var(--color-shadow));
border: 1px solid oklch(var(--color-codeblock-border));

&:hover {
.code-copy-button {
Expand Down Expand Up @@ -2354,7 +2370,7 @@ a:has(code:not(pre code)) {
}

.code-content {
border: 1px solid oklch(var(--color-codeblock-border));
box-sizing: border-box;
overflow-x: scroll;
scrollbar-width: none;
line-height: 150%;
Expand Down
2 changes: 1 addition & 1 deletion layouts/_default/_markup/render-codeblock.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{{- else -}}
<div class="code-block">
{{- if and (ne .Type "") (ne .Type "none") -}}
<span class="code-type chroma">{{ .Type }}</span>
<figcaption class="code-type"><span class="title chroma">{{ .Type }}</span></figcaption>
{{- end -}}
<div class="code-container chroma">
<button onclick="copyToClipBoard(this, {{ $codeBlockId }})" class="code-copy-button multi-line" type="button">Copy</button>
Expand Down
7 changes: 1 addition & 6 deletions layouts/partials/callout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,7 @@

<blockquote class="{{ $class }} note" data-title="{{ $cleanTitle }}" data-grid="{{ $dataGrid }}">
<div class="callout-content">
{{- with $icon -}}
<i class="{{ . }}"></i>
{{- end -}}
<div class="callout-content">
{{ .content | markdownify }}
</div>
{{ .content | markdownify }}
</div>
</blockquote>

Expand Down
Loading