Skip to content

nicer gutters #772

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 4 commits into from
Nov 2, 2024
Merged

nicer gutters #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d222e1c
nicer gutters
Rich-Harris Nov 2, 2024
14fe0be
fix
Rich-Harris Nov 2, 2024
6eab1ca
better
Rich-Harris Nov 2, 2024
9f2c36c
cursor
Rich-Harris Nov 2, 2024
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
4 changes: 2 additions & 2 deletions apps/svelte.dev/src/lib/icons/chevron.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions apps/svelte.dev/src/routes/docs/[...path]/OnThisPage.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
background-size: 2rem;
top: 0.4rem;
right: 0.2rem;
rotate: -90deg;
rotate: 0deg;
transition: rotate 0.2s;
transition: rotate 0.2s;
}
Expand All @@ -153,7 +153,7 @@

label:has(:checked) {
&::after {
rotate: 90deg;
rotate: 180deg;
}

/* TODO remove :global once https://github.com/sveltejs/svelte/issues/13779 is fixed */
Expand Down
2 changes: 1 addition & 1 deletion packages/editor/src/lib/Editor.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@

.fake-gutter {
text-align: right;
padding-right: 3px;
padding-right: 0.7rem;
}

.fake-content {
Expand Down
49 changes: 32 additions & 17 deletions packages/editor/src/lib/codemirror.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@
}

.cm-activeLine {
background: inherit;
}

.cm-foldGutter {
width: 1.4rem;
}

.cm-activeLineGutter {
/* this must be translucent, or it will obscure the selection */
background: hsl(0, 0%, 0%, 0.04);

Expand All @@ -46,8 +54,29 @@
}
}

.cm-activeLineGutter {
background-color: var(--sk-bg-3);
.cm-gutterElement {
position: relative;

&:where(:has([title='Fold line']), :has([title='Unfold line']))::after {
content: '';
position: absolute;
width: 100%;
right: 0;
top: 0;
height: 2.4rem;
background: url($lib/icons/chevron.svg) no-repeat 50% 50%;
background-size: contain;
transition: transform 0.2s;
cursor: pointer;
}

&:has([title='Unfold line'])::after {
transform: rotate(-90deg);
}

span {
color: transparent;
}
}

.cm-lineNumbers {
Expand All @@ -60,10 +89,6 @@
}
}

.cm-foldGutter {
width: 1rem;
}

.cm-foldPlaceholder {
background-color: transparent;
border: none;
Expand All @@ -85,17 +110,7 @@
}

.cm-content {
/* ensure no gap between top of editor and highlighted first/last line */
padding-top: 0;
padding-bottom: 0;

.cm-line:first-child {
padding-top: 4px;
}

.cm-line:last-child {
padding-bottom: 4px;
}
padding: 0.4rem 0;
}

.cm-line {
Expand Down
4 changes: 2 additions & 2 deletions packages/site-kit/src/lib/components/Text.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@
&::after {
background: url($lib/icons/chevron.svg) 50% 50% no-repeat;
background-size: 2rem;
rotate: -90deg;
rotate: 0deg;
transition: rotate 0.2s;
transition: rotate 0.2s;
top: 0.2rem;
Expand Down Expand Up @@ -534,7 +534,7 @@

&[open] {
&::after {
rotate: 90deg;
rotate: 180deg;
}

& > summary {
Expand Down
4 changes: 2 additions & 2 deletions packages/site-kit/src/lib/search/SearchResultList.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,12 @@
height: 2rem;
background: url($lib/icons/chevron.svg);
background-size: contain;
rotate: -90deg;
rotate: 0deg;
transition: rotate 0.2s;
}

[open] &::after {
rotate: 90deg;
rotate: 180deg;
}

span:not(:last-child)::after {
Expand Down
Loading