Skip to content

align tutorial modal styles #630

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 3 commits into from
Oct 25, 2024
Merged

align tutorial modal styles #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfc7c1f
add primary button styles
Rich-Harris Oct 22, 2024
f08b15c
Merge branch 'main' into gh-367
Rich-Harris Oct 25, 2024
90c64ef
improve tutorial modal
Rich-Harris Oct 25, 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
20 changes: 20 additions & 0 deletions apps/svelte.dev/src/lib/components/Modal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
</style>
26 changes: 4 additions & 22 deletions apps/svelte.dev/src/routes/tutorial/[...slug]/Sidebar.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
enable copy-and-paste for the duration of this session
</label>

<button on:click={() => (show_modal = false)}>OK</button>
<button class="raised primary" on:click={() => (show_modal = false)}>OK</button>
</div>
</Modal>
{/if}
Expand Down Expand Up @@ -153,30 +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;
background-color: var(--sk-theme-1);
color: white;
padding: 1rem;
width: 10em;
margin: 1em 0 0 0;
border-radius: var(--sk-border-radius);
line-height: 1;
font: var(--sk-font-ui-small);
display: flex;
align-items: center;
gap: 0.5rem;
}
}

Expand Down
13 changes: 1 addition & 12 deletions apps/svelte.dev/src/routes/tutorial/[...slug]/filetree/Filetree.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
<div class="modal-contents">
<h2>This action is not allowed</h2>
<p>{modal_text}</p>
<button onclick={() => (modal_text = '')}>OK</button>
<button class="raised primary" onclick={() => (modal_text = '')}>OK</button>
</div>
</Modal>
{/if}
Expand All @@ -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;
}
</style>
10 changes: 10 additions & 0 deletions packages/site-kit/src/lib/styles/utils/buttons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Loading