Skip to content

Tidy up a few CSS details #222

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

Tidy up a few CSS details #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7f91624
remove playfair display
Rich-Harris Oct 3, 2024
903d018
only load yantramanav 400
Rich-Harris Oct 3, 2024
6d275b8
tweak
Rich-Harris Oct 3, 2024
b395980
tweaks
Rich-Harris Oct 3, 2024
b5eb6e9
smart quotes everywhere
Rich-Harris Oct 3, 2024
502a18f
tidy up blog pages a little bit
Rich-Harris Oct 3, 2024
52c0f71
more
Rich-Harris Oct 3, 2024
59125b0
banish --sk-theme-3
Rich-Harris Oct 3, 2024
5faf1c6
tidy up
Rich-Harris Oct 3, 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
1 change: 0 additions & 1 deletion apps/svelte.dev/src/routes/_home/Video.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,5 @@
.video-player input:focus-visible ~ img {
outline: 2px solid var(--sk-theme-1);
outline-offset: 2px;
border-radius: var(--sk-border-radius);
}
</style>
72 changes: 37 additions & 35 deletions apps/svelte.dev/src/routes/blog/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{#each data.posts as post}
{#if !post.metadata.draft}
<article class="post" data-pubdate={post.date}>
<a class="no-underline" href="/{post.slug}" title="Read the article »">
<a href="/{post.slug}" title="Read the article »">
<h2>{post.metadata.title}</h2>
<p>{post.metadata.description}</p>
</a>
Expand All @@ -42,51 +42,53 @@

h2 {
display: inline-block;
margin: 3.2rem 0 0.4rem 0;
/* margin: 3.2rem 0 0.4rem 0; */
color: var(--sk-text-2);
max-width: 18em;
font-size: var(--sk-text-m);
font-weight: 400;
}

.post:first-child {
margin: 0 0 2rem 0;
padding: 0 0 4rem 0;
border-bottom: var(--sk-thick-border-width) solid #6767785b; /* based on --second */
}
.post {
margin: 2em 0;

.post:first-child h2 {
font-size: 4rem;
font-weight: 400;
color: var(--sk-text-2);
}
&:where(:first-child, :nth-child(2))::before {
content: 'Latest post • ' attr(data-pubdate);
color: var(--sk-text-4);
font-family: var(--sk-font-ui);
font-size: var(--sk-text-xs);
font-weight: 400;
text-transform: uppercase;
}

.post:where(:first-child, :nth-child(2))::before {
content: 'Latest post • ' attr(data-pubdate);
color: var(--sk-theme-3);
font-family: var(--sk-font-heading);
font-size: var(--sk-text-xs);
font-weight: 400;
letter-spacing: 0.05em;
text-transform: uppercase;
}
&:nth-child(2)::before {
content: 'Older posts';
}

.post:nth-child(2)::before {
content: 'Older posts';
}
&:first-child {
margin: 0 0 2rem 0;
padding: 0 0 4rem 0;

.post p {
font-size: var(--sk-text-s);
max-width: 30em;
color: var(--sk-text-3);
}
h2 {
font-size: 4rem;
font-weight: 400;
color: var(--sk-text-2);
}
}

.post > a {
display: block;
}
a {
display: block;
text-decoration: none;

&:hover h2 {
text-decoration: underline;
}
}

.posts a:hover,
.posts a:hover > h2 {
color: var(--sk-theme-3);
p {
font-size: var(--sk-text-s);
color: var(--sk-text-3);
margin: 0;
}
}
</style>
12 changes: 6 additions & 6 deletions apps/svelte.dev/src/routes/blog/[slug]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
}

.byline {
margin: 0 0 1rem 0;
padding: 1.6rem 0 0 0;
border-top: var(--sk-thick-border-width) solid #6767785b;
margin: 0 0 4rem 0;
padding: 1rem 0 0 0;
font-family: var(--sk-font-ui);
font-size: var(--sk-text-xs);
text-transform: uppercase;
}
Expand All @@ -78,7 +78,7 @@
}

.post :global(figcaption) {
color: var(--sk-theme-2);
color: var(--sk-text-4);
text-align: left;
}

Expand All @@ -90,7 +90,7 @@
float: right;
margin: 0 0 1em 1em;
width: 16rem;
color: var(--sk-theme-2);
color: var(--sk-text-4);
z-index: 2;
}

Expand All @@ -103,7 +103,7 @@
height: 420px;
margin: 2em 0;
border-radius: var(--sk-border-radius);
border: 0.8rem solid var(--sk-theme-2);
border: 0.8rem solid var(--sk-theme-4);
}

@media (min-width: 910px) {
Expand Down
3 changes: 1 addition & 2 deletions apps/svelte.dev/src/routes/tutorial/[slug]/Chrome.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@
a:focus-visible,
button:focus-visible,
input:focus-visible {
outline: none;
border: 2px solid var(--sk-theme-3);
outline-offset: -2px;
}

.icon,
Expand Down
5 changes: 2 additions & 3 deletions apps/svelte.dev/src/routes/tutorial/[slug]/Menu.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,8 +378,8 @@

li button {
position: relative;

display: flex;
width: 100%;
gap: 0.5rem;
}

Expand All @@ -403,8 +403,7 @@

a:focus-visible,
.exercises button:focus-visible {
outline: none;
border: 2px solid var(--sk-theme-3);
outline-offset: -2px;
}

@media screen and (max-width: 800px) {
Expand Down
4 changes: 0 additions & 4 deletions apps/svelte.dev/src/routes/tutorial/[slug]/ToggleButton.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@
border: transparent;
}

button:focus-visible {
outline: 2px solid var(--sk-theme-3);
}

button::before {
content: '';
position: absolute;
Expand Down
7 changes: 0 additions & 7 deletions apps/svelte.dev/src/routes/tutorial/[slug]/codemirror.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,6 @@
color: var(--sk-text-2);
}

.cm-editor.cm-focused .cm-selectionBackground,
.cm-editor .cm-selectionBackground,
.cm-editor .cm-content ::selection {
background: var(--sk-theme-3);
opacity: 0.3;
}

.cm-editor .cm-tooltip {
background: var(--sk-back-2);
color: var(--sk-text-1);
Expand Down
4 changes: 1 addition & 3 deletions apps/svelte.dev/src/routes/tutorial/[slug]/filetree/Item.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,7 @@
}

:focus-visible {
outline: none;
border: 2px solid var(--sk-theme-3) !important;
border-radius: 2px;
outline-offset: -2px;
}

input {
Expand Down
1 change: 0 additions & 1 deletion packages/site-kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"@fontsource/dm-serif-display": "^5.1.0",
"@fontsource/eb-garamond": "^5.1.0",
"@fontsource/fira-mono": "^5.1.0",
"@fontsource/playfair-display": "^5.1.0",
"@fontsource/yantramanav": "^5.1.0",
"esm-env": "^1.0.0",
"json5": "^2.2.3",
Expand Down
8 changes: 3 additions & 5 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 @@ -144,7 +144,6 @@
align-items: center;
height: calc(var(--height) - 0.6rem);
outline-offset: 0;
border-radius: var(--sk-border-radius);
padding: 0 0.4rem;

&::before,
Expand Down Expand Up @@ -343,12 +342,12 @@
li::before {
content: '';
position: absolute;
margin-top: 0.8rem;
margin-left: -1.8rem;
top: 1.4rem;
left: -1.8rem;
background-color: var(--sk-back-5);
width: 0.6rem;
height: 0.6rem;
border-radius: 2px;
border-radius: 50%;
opacity: 0.7;
}

Expand All @@ -364,7 +363,6 @@
li {
position: relative;
max-width: calc(var(--sk-line-max-width) - var(--list-padding));
line-height: 1.5;
margin: 0 0 0.5em 0;
}

Expand Down
3 changes: 0 additions & 3 deletions packages/site-kit/src/lib/docs/DocsContents.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,11 @@
height: 100%;
bottom: auto;
width: 100%;
/* columns: 2; */
margin: 0;
}

li {
display: block;
/* line-height: 1.2; */
margin: 0;
margin-bottom: 4rem;
}
Expand Down Expand Up @@ -108,7 +106,6 @@
}

[aria-current='page'] {
/* font-weight: 700; */
color: var(--sk-theme-1);
text-decoration: underline;
}
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 @@ -269,7 +269,7 @@ async function parse({
return this.parser!.parseInline(token.tokens);
}

return smart_quotes(token.text);
return smart_quotes(token.text, true);
},
heading({ tokens, depth, raw }) {
const text = this.parser!.parseInline(tokens);
Expand Down
26 changes: 18 additions & 8 deletions packages/site-kit/src/lib/markdown/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,28 @@ export const normalizeSlugify = (str: string) => {
return slugify(removeHTMLEntities(removeMarkdown(str))).replace(/(<([^>]+)>)/gi, '');
};

export function smart_quotes(str: string) {
export function smart_quotes(str: string, html: boolean = false) {
// replace dumb quotes with smart quotes. This isn't a perfect algorithm — it
// wouldn't correctly handle `That '70s show` or `My country 'tis of thee`
// but a) it's very unlikely they'll occur in our docs, and
// b) they can be dealt with manually
return str.replace(/(.|^)(&#39;|&quot;)(.|$)/g, (m, before, quote, after) => {
const left = !before.trim();
const double = quote === '&quot;';
const entity = `&${left ? 'l' : 'r'}${double ? 'd' : 's'}quo;`;

return (before ?? '') + entity + (after ?? '');
});
return str.replace(
html ? /(.|^)(&#39;|&quot;)(.|$)/g : /(.|^)('|")(.|$)/g,
(m, before, quote, after) => {
const left = !before.trim();
let replacement = '';

if (html) {
const double = quote === '&quot;';
replacement = `&${left ? 'l' : 'r'}${double ? 'd' : 's'}quo;`;
} else {
const double = quote === '"';
replacement = double ? (left ? '“' : '”') : left ? '‘' : '’';
}

return (before ?? '') + replacement + (after ?? '');
}
);
}

const tokenizer: TokenizerObject = {
Expand Down
1 change: 1 addition & 0 deletions packages/site-kit/src/lib/nav/Nav.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
display: flex;
align-items: center;
text-decoration: none;
outline-offset: -2px;

&:hover {
box-shadow: inset 0 -1px 0 0 var(--sk-back-5);
Expand Down
4 changes: 0 additions & 4 deletions packages/site-kit/src/lib/search/SearchBox.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,6 @@ It appears when the user clicks on the `Search` component or presses the corresp
}

&:focus-visible {
border-radius: var(--sk-border-radius);
outline-offset: -3px;
}
}
Expand All @@ -335,7 +334,6 @@ It appears when the user clicks on the `Search` component or presses the corresp
width: 5rem;
height: 6rem;
background: none;
border-radius: var(--sk-border-radius);
color: var(--sk-text-2);
opacity: 0.3;

Expand Down Expand Up @@ -388,7 +386,6 @@ It appears when the user clicks on the `Search` component or presses the corresp
}

&:focus {
border-radius: var(--sk-border-radius);
outline-offset: -3px;
}
}
Expand All @@ -413,7 +410,6 @@ It appears when the user clicks on the `Search` component or presses the corresp

&:focus-visible {
opacity: 1;
border-radius: var(--sk-border-radius);
outline-offset: -3px;
}
}
Expand Down
Loading
Loading