Skip to content

non-neumorphic buttons #270

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 1 commit into from
Oct 7, 2024
Merged

non-neumorphic buttons #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/(authed)/playground/[id]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
flex-direction: column;

@media (min-width: 800px) {
--app-controls-h: 4rem;
--app-controls-h: 4.4rem;
}
}

Expand Down
17 changes: 14 additions & 3 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 @@ -112,25 +112,36 @@
}

&::before {
box-shadow: var(--sk-raised);
border-radius: var(--sk-border-radius);
border-style: solid;
border-color: var(--sk-raised-color);
border-width: var(--sk-raised-width);
}

&:hover::before {
box-shadow: var(--sk-raised-hover);
border-color: var(--sk-raised-hover-color);
}

&:active::before {
box-shadow: var(--sk-raised-active);
border-color: var(--sk-raised-active-color);
border-width: var(--sk-raised-active-width);
}

&::after {
background: url($lib/icons/chevron.svg) 50% 50% no-repeat;
background-size: 2rem;
top: 0.4rem;
right: 0.2rem;
rotate: -90deg;
transition: rotate 0.2s;
transition: rotate 0.2s;
}

&:active::after {
top: 0.5rem;
right: 0.1rem;
}

h3 {
font-family: var(--sk-font-ui);
font-size: var(--sk-font-size-ui-small);
Expand Down
19 changes: 15 additions & 4 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 @@ -431,22 +431,26 @@
content: '';
position: absolute;
right: 0.6rem;
top: 0.2rem;
top: 0.1rem;
width: 2.4rem;
height: 2.4rem;
pointer-events: none;
}

&::before {
box-shadow: var(--sk-raised);
border-radius: var(--sk-border-radius);
border-style: solid;
border-color: var(--sk-raised-color);
border-width: var(--sk-raised-width);
}

&:hover::before {
box-shadow: var(--sk-raised-hover);
border-color: var(--sk-raised-hover-color);
}

&:has(summary:active)::before {
box-shadow: var(--sk-raised-active);
border-color: var(--sk-raised-active-color);
border-width: var(--sk-raised-active-width);
}

&::after {
Expand All @@ -455,6 +459,13 @@
rotate: -90deg;
transition: rotate 0.2s;
transition: rotate 0.2s;
top: 0.2rem;
right: 0.8rem;
}

&:has(summary:active)::after {
top: 0.3rem;
right: 0.7rem;
}

& > summary {
Expand Down
2 changes: 1 addition & 1 deletion packages/site-kit/src/lib/markdown/renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ async function parse({
blockquote(token) {
let content = this.parser?.parse(token.tokens) ?? '';
if (content.includes('[!LEGACY]')) {
content = `<details class="legacy"><summary>Legacy mode</summary>${content.replace('[!LEGACY]', '')}</details>`;
content = `<details class="legacy"><summary><label>Legacy mode <button class="raised"></button></label></summary>${content.replace('[!LEGACY]', '')}</details>`;
}
return `<blockquote>${content}</blockquote>`;
}
Expand Down
15 changes: 8 additions & 7 deletions packages/site-kit/src/lib/styles/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ body {
scrollbar-width: thin;
scrollbar-color: var(--sk-scrollbar) transparent;
-webkit-tap-highlight-color: hsla(var(--sk-theme-1-hsl), 0.1);

transition: 0.5s var(--quint-out);
transition-property: background, background-color, background-image, border;
}

*:focus-visible {
Expand Down Expand Up @@ -169,18 +166,22 @@ button > svg {

.raised {
border-radius: var(--sk-border-radius);
box-shadow: var(--sk-raised);
border-style: solid;
border-color: var(--sk-raised-color);
border-width: var(--sk-raised-width);

&:hover {
box-shadow: var(--sk-raised-hover);
border-color: var(--sk-raised-hover-color);
}

&:active {
box-shadow: var(--sk-raised-active);
border-color: var(--sk-raised-active-color);
border-width: var(--sk-raised-active-width);
}

&:disabled {
box-shadow: none;
border-color: transparent;
border-width: 1px;
}
}

Expand Down
24 changes: 10 additions & 14 deletions packages/site-kit/src/lib/styles/tokens.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
--sk-back-3: hsla(0, 0%, 99%, 1);
--sk-back-4: hsl(0, 0%, 95%);
--sk-back-5: hsl(0, 0%, 92%);
--sk-back-6: hsl(0, 0%, 86%);

--sk-text-1: hsla(0, 0%, 0%, 0.95);
--sk-text-2: hsla(0, 0%, 0%, 0.88);
Expand Down Expand Up @@ -86,16 +87,11 @@
--shiki-color-background: var(--sk-back-2);

/* raised buttons */
--sk-raised-highlight: hsl(0 0 100 / 0.8);
--sk-raised-highlight-active: hsl(0 0 100 / 1);
--sk-raised-shadow: hsl(0 0 0 / 0.1);
--sk-raised-shadow-active: hsl(0 0 0 / 0.15);

--sk-raised: 1px 1px 3px var(--sk-raised-shadow), -1px -1px 3px var(--sk-raised-highlight);
--sk-raised-hover: 1px 1px 3px var(--sk-raised-shadow-active),
-1px -1px 3px var(--sk-raised-highlight-active);
--sk-raised-active: inset -1px -1px 2px var(--sk-raised-highlight-active),
inset 1px 1px 2px var(--sk-raised-shadow-active);
--sk-raised-color: var(--sk-back-4) var(--sk-back-5) var(--sk-back-5) var(--sk-back-4);
--sk-raised-width: 1px 2px 2px 1px;
--sk-raised-hover-color: var(--sk-back-5) var(--sk-back-6) var(--sk-back-6) var(--sk-back-5);
--sk-raised-active-color: var(--sk-back-6) var(--sk-back-5) var(--sk-back-5) var(--sk-back-6);
--sk-raised-active-width: 2px 1px 1px 2px;

&.dark {
color-scheme: dark;
Expand All @@ -105,6 +101,7 @@
--sk-back-3: hsl(0 0 12);
--sk-back-4: hsl(0 0 22);
--sk-back-5: hsl(0 0 25);
--sk-back-6: hsl(0 0 32);
--sk-back-translucent: hsla(0, 0%, 100%, 0.1);
--sk-theme-1-hsl: 12, 94%, 62%;
--sk-theme-2-hsl: 240, 8%, 44%;
Expand Down Expand Up @@ -139,10 +136,9 @@
--shiki-color-background: var(--sk-back-3);

/* raised buttons */
--sk-raised-highlight: hsl(0 0 100 / 0.1);
--sk-raised-highlight-active: hsl(0 0 100 / 0.15);
--sk-raised-shadow: hsl(0 0 0 / 0.3);
--sk-raised-shadow-active: hsl(0 0 0 / 0.22);
--sk-raised-color: var(--sk-back-5) var(--sk-back-3) var(--sk-back-3) var(--sk-back-5);
--sk-raised-hover-color: var(--sk-back-6) var(--sk-back-3) var(--sk-back-3) var(--sk-back-6);
--sk-raised-active-color: var(--sk-back-3) var(--sk-back-6) var(--sk-back-6) var(--sk-back-3);
}
}

Expand Down
Loading