From dfc7c1f92fd1e169a8af3874b9224c497ec6f6c7 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Tue, 22 Oct 2024 11:17:19 -0400 Subject: [PATCH 1/2] add primary button styles --- .../src/routes/tutorial/[...slug]/Sidebar.svelte | 7 ++----- packages/site-kit/src/lib/styles/utils/buttons.css | 10 ++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/apps/svelte.dev/src/routes/tutorial/[...slug]/Sidebar.svelte b/apps/svelte.dev/src/routes/tutorial/[...slug]/Sidebar.svelte index 59945d4b81..3e7d55d0b0 100644 --- a/apps/svelte.dev/src/routes/tutorial/[...slug]/Sidebar.svelte +++ b/apps/svelte.dev/src/routes/tutorial/[...slug]/Sidebar.svelte @@ -100,7 +100,7 @@ enable copy-and-paste for the duration of this session - + {/if} @@ -166,12 +166,9 @@ button { display: block; - background-color: var(--sk-theme-1); - color: white; padding: 1rem; - width: 10em; + width: 10rem; margin: 1em 0 0 0; - border-radius: var(--sk-border-radius); line-height: 1; font: var(--sk-font-ui-small); } diff --git a/packages/site-kit/src/lib/styles/utils/buttons.css b/packages/site-kit/src/lib/styles/utils/buttons.css index d277fe9372..b9f742ed21 100644 --- a/packages/site-kit/src/lib/styles/utils/buttons.css +++ b/packages/site-kit/src/lib/styles/utils/buttons.css @@ -4,6 +4,16 @@ border-color: var(--sk-raised-color); border-width: var(--sk-raised-width); + &.primary { + --sk-raised-color: hsla(12, 93%, 60%) hsla(12, 93%, 35%) hsla(12, 93%, 35%) hsla(12, 93%, 60%); + --sk-raised-hover-color: hsla(12, 93%, 70%) hsla(12, 93%, 30%) hsla(12, 93%, 30%) + hsla(12, 93%, 70%); + --sk-raised-active-color: hsla(12, 93%, 30%) hsla(12, 93%, 70%) hsla(12, 93%, 70%) + hsla(12, 93%, 30%); + background: var(--sk-theme-1); + color: white; + } + &:hover { border-color: var(--sk-raised-hover-color); } From 90c64ef6c0335011de277a213b60cbcfb0c14960 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Thu, 24 Oct 2024 20:26:27 -0400 Subject: [PATCH 2/2] improve tutorial modal --- .../src/lib/components/Modal.svelte | 20 ++++++++++++++++++ .../routes/tutorial/[...slug]/Sidebar.svelte | 21 +++---------------- .../[...slug]/filetree/Filetree.svelte | 13 +----------- 3 files changed, 24 insertions(+), 30 deletions(-) diff --git a/apps/svelte.dev/src/lib/components/Modal.svelte b/apps/svelte.dev/src/lib/components/Modal.svelte index a3aa162830..26e814a0e5 100644 --- a/apps/svelte.dev/src/lib/components/Modal.svelte +++ b/apps/svelte.dev/src/lib/components/Modal.svelte @@ -74,4 +74,24 @@ filter: drop-shadow(3px 5px 10px rgba(0, 0, 0, 0.1)); z-index: 99999; } + + .modal :global { + h2 { + font: var(--sk-font-ui-large); + margin: 0 0 0.5em 0; + } + + p { + font: var(--sk-font-ui-medium); + } + + button { + display: block; + padding: 1rem; + width: 10rem; + margin: 1em 0 0 0; + line-height: 1; + font: var(--sk-font-ui-small); + } + } diff --git a/apps/svelte.dev/src/routes/tutorial/[...slug]/Sidebar.svelte b/apps/svelte.dev/src/routes/tutorial/[...slug]/Sidebar.svelte index 30d282d840..8dfdbe1054 100644 --- a/apps/svelte.dev/src/routes/tutorial/[...slug]/Sidebar.svelte +++ b/apps/svelte.dev/src/routes/tutorial/[...slug]/Sidebar.svelte @@ -153,27 +153,12 @@ } .modal-contents { - h2 { - font: var(--sk-font-ui-large); - margin: 0 0 0.5em 0; - } - - p { - font: var(--sk-font-ui-medium); - } - label { user-select: none; font: var(--sk-font-ui-medium); - } - - button { - display: block; - padding: 1rem; - width: 10rem; - margin: 1em 0 0 0; - line-height: 1; - font: var(--sk-font-ui-small); + display: flex; + align-items: center; + gap: 0.5rem; } } diff --git a/apps/svelte.dev/src/routes/tutorial/[...slug]/filetree/Filetree.svelte b/apps/svelte.dev/src/routes/tutorial/[...slug]/filetree/Filetree.svelte index c1080e2e73..cf5403c480 100644 --- a/apps/svelte.dev/src/routes/tutorial/[...slug]/filetree/Filetree.svelte +++ b/apps/svelte.dev/src/routes/tutorial/[...slug]/filetree/Filetree.svelte @@ -145,7 +145,7 @@ {/if} @@ -169,15 +169,4 @@ .modal-contents p { white-space: pre-line; } - - .modal-contents button { - display: block; - background: var(--sk-theme-1); - color: white; - padding: 1rem; - width: 10em; - margin: 1em 0 0 0; - border-radius: var(--sk-border-radius); - line-height: 1; - }