Skip to content

Commit 450a179

Browse files
authored
nicer gutters (#772)
* nicer gutters * fix * better * cursor
1 parent 35b623e commit 450a179

File tree

6 files changed

+41
-26
lines changed

6 files changed

+41
-26
lines changed
Lines changed: 2 additions & 2 deletions
Loading

apps/svelte.dev/src/routes/docs/[...path]/OnThisPage.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
background-size: 2rem;
130130
top: 0.4rem;
131131
right: 0.2rem;
132-
rotate: -90deg;
132+
rotate: 0deg;
133133
transition: rotate 0.2s;
134134
transition: rotate 0.2s;
135135
}
@@ -153,7 +153,7 @@
153153
154154
label:has(:checked) {
155155
&::after {
156-
rotate: 90deg;
156+
rotate: 180deg;
157157
}
158158
159159
/* TODO remove :global once https://github.com/sveltejs/svelte/issues/13779 is fixed */

packages/editor/src/lib/Editor.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
116116
.fake-gutter {
117117
text-align: right;
118-
padding-right: 3px;
118+
padding-right: 0.7rem;
119119
}
120120
121121
.fake-content {

packages/editor/src/lib/codemirror.css

Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@
3838
}
3939

4040
.cm-activeLine {
41+
background: inherit;
42+
}
43+
44+
.cm-foldGutter {
45+
width: 1.4rem;
46+
}
47+
48+
.cm-activeLineGutter {
4149
/* this must be translucent, or it will obscure the selection */
4250
background: hsl(0, 0%, 0%, 0.04);
4351

@@ -46,8 +54,29 @@
4654
}
4755
}
4856

49-
.cm-activeLineGutter {
50-
background-color: var(--sk-bg-3);
57+
.cm-gutterElement {
58+
position: relative;
59+
60+
&:where(:has([title='Fold line']), :has([title='Unfold line']))::after {
61+
content: '';
62+
position: absolute;
63+
width: 100%;
64+
right: 0;
65+
top: 0;
66+
height: 2.4rem;
67+
background: url($lib/icons/chevron.svg) no-repeat 50% 50%;
68+
background-size: contain;
69+
transition: transform 0.2s;
70+
cursor: pointer;
71+
}
72+
73+
&:has([title='Unfold line'])::after {
74+
transform: rotate(-90deg);
75+
}
76+
77+
span {
78+
color: transparent;
79+
}
5180
}
5281

5382
.cm-lineNumbers {
@@ -60,10 +89,6 @@
6089
}
6190
}
6291

63-
.cm-foldGutter {
64-
width: 1rem;
65-
}
66-
6792
.cm-foldPlaceholder {
6893
background-color: transparent;
6994
border: none;
@@ -85,17 +110,7 @@
85110
}
86111

87112
.cm-content {
88-
/* ensure no gap between top of editor and highlighted first/last line */
89-
padding-top: 0;
90-
padding-bottom: 0;
91-
92-
.cm-line:first-child {
93-
padding-top: 4px;
94-
}
95-
96-
.cm-line:last-child {
97-
padding-bottom: 4px;
98-
}
113+
padding: 0.4rem 0;
99114
}
100115

101116
.cm-line {

packages/site-kit/src/lib/components/Text.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@
495495
&::after {
496496
background: url($lib/icons/chevron.svg) 50% 50% no-repeat;
497497
background-size: 2rem;
498-
rotate: -90deg;
498+
rotate: 0deg;
499499
transition: rotate 0.2s;
500500
transition: rotate 0.2s;
501501
top: 0.2rem;
@@ -534,7 +534,7 @@
534534
535535
&[open] {
536536
&::after {
537-
rotate: 90deg;
537+
rotate: 180deg;
538538
}
539539
540540
& > summary {

packages/site-kit/src/lib/search/SearchResultList.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@
100100
height: 2rem;
101101
background: url($lib/icons/chevron.svg);
102102
background-size: contain;
103-
rotate: -90deg;
103+
rotate: 0deg;
104104
transition: rotate 0.2s;
105105
}
106106
107107
[open] &::after {
108-
rotate: 90deg;
108+
rotate: 180deg;
109109
}
110110
111111
span:not(:last-child)::after {

0 commit comments

Comments
 (0)