Skip to content

Commit 601c6a7

Browse files
authored
Codeblock: Update design (#181)
1 parent 0176fa4 commit 601c6a7

File tree

2 files changed

+31
-40
lines changed

2 files changed

+31
-40
lines changed

assets/css/v2/style.css

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,8 +1014,11 @@ blockquote.side-callout {
10141014
}
10151015
}
10161016

1017-
.code-block {
1017+
.code-container {
10181018
grid-column: 1;
1019+
display: flex;
1020+
flex-direction: row;
1021+
position: relative;
10191022
}
10201023

10211024
.code-block .code-header:not(:has(.code-type)) {
@@ -1028,40 +1031,18 @@ li .code-block {
10281031
margin-left: -1rem;
10291032
}
10301033

1031-
.icon-code-copy {
1032-
background-color: #f2f2f2;
1033-
border: none;
1034-
padding: 5px 10px;
1035-
cursor: pointer;
1036-
font-family: "JetBrains Mono", monospace;
1037-
font-size: 12px;
1038-
color: #000;
1039-
}
1040-
10411034
.highlight-v2 {
1042-
margin: 0 0 1rem 0;
10431035
border-top: 1px solid #cccccc;
10441036
border-bottom: 1px solid #cccccc;
10451037
overflow-x: scroll;
10461038
scrollbar-width: none;
10471039
width: calc(100% + var(--overflow-gutter-extension));
1048-
1049-
background-image: linear-gradient(to right, white, white),
1050-
linear-gradient(to right, white, white),
1051-
linear-gradient(to right, rgba(165, 165, 165, 0.25), rgba(255, 255, 255, 0)),
1052-
linear-gradient(to left, rgba(165, 165, 165, 0.25), rgba(255, 255, 255, 0));
1053-
background-position: left center, right center, left center, right center;
1054-
background-repeat: no-repeat;
1055-
background-size: 12px 100%, 12px 100%, 10px 100%, 10px 100%;
1056-
background-attachment: local, local, scroll, scroll;
10571040
}
10581041

10591042
.highlight-v2.single-line {
10601043
display: flex;
10611044
align-items: center;
10621045
border: 1px solid #cccccc;
1063-
overflow-x: scroll;
1064-
width: calc(100% + var(--overflow-gutter-extension));
10651046
}
10661047

10671048
.code-header {
@@ -1075,12 +1056,18 @@ li .code-block {
10751056

10761057
.code-type {
10771058
text-transform: uppercase;
1078-
border: 1px solid #cccccc;
1079-
border-bottom: 1px solid white;
1080-
padding: .25rem 1rem; /* Padding for button content */
1059+
padding: .25rem 0.25rem; /* Padding for button content */
10811060
font-size: 12px; /* Font size */
10821061
z-index: 9999;
1083-
margin-bottom: -1px;
1062+
position: absolute;
1063+
background-color: white;
1064+
margin: -12px 0 0 1rem;
1065+
}
1066+
1067+
.code-container:hover {
1068+
.code-copy-button {
1069+
display: block;
1070+
}
10841071
}
10851072

10861073
.code-copy-button {
@@ -1091,6 +1078,14 @@ li .code-block {
10911078
font-family: "JetBrains Mono", monospace;
10921079
font-size: 12px;
10931080
color: #000;
1081+
order: 2;
1082+
display: none;
1083+
}
1084+
1085+
.code-copy-button {
1086+
position: absolute;
1087+
right: 8px;
1088+
margin-top: 8px;
10941089
}
10951090

10961091
.code-copy-button:hover {

layouts/_default/_markup/render-codeblock.html

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,23 @@
55

66
{{- if $isSingleLine -}}
77
<div class="code-block" data-mf="true" style="display: none;">
8-
<div class="code-header no-lang">
8+
<div class="code-container">
99
<button onclick="copyToClipBoard(this)" data-id-codeblock="{{ $codeBlockId }}" class="code-copy-button" type="button">Copy</button>
10-
</div>
11-
<div class="highlight-v2 single-line" id="{{ $codeBlockId }}">
12-
{{ $result.Wrapped }}
10+
<div class="highlight-v2 single-line" id="{{ $codeBlockId }}">
11+
{{ $result.Wrapped }}
12+
</div>
1313
</div>
1414
</div>
1515
{{- else -}}
1616
<div class="code-block" data-mf="true" style="display: none;">
1717
{{- if and (ne .Type "") (ne .Type "none") -}}
18-
<div class="code-header">
1918
<span class="code-type">{{ .Type }}</span>
20-
<button onclick="copyToClipBoard(this)" data-id-codeblock="{{ $codeBlockId }}" class="code-copy-button" type="button">Copy</button>
21-
</div>
22-
{{- else -}}
23-
<div class="code-header no-lang">
24-
<button onclick="copyToClipBoard(this)" data-id-codeblock="{{ $codeBlockId }}" class="code-copy-button" type="button">Copy</button>
25-
</div>
2619
{{- end -}}
27-
<div class="highlight-v2" id="{{ $codeBlockId }}">
28-
{{ $result.Wrapped }}
20+
<div class="code-container">
21+
<button onclick="copyToClipBoard(this)" data-id-codeblock="{{ $codeBlockId }}" class="code-copy-button multi-line" type="button">Copy</button>
22+
<div class="highlight-v2" id="{{ $codeBlockId }}">
23+
{{ $result.Wrapped }}
24+
</div>
2925
</div>
3026
</div>
3127
{{- end -}}

0 commit comments

Comments
 (0)