Even more conflicts

This commit is contained in:
Andras Schmelczer 2026-10-28 23:23:53 +00:00
commit f85344824a
3 changed files with 18 additions and 31 deletions

View file

@ -99,11 +99,7 @@
<main> <main>
<section class="tokenizer-selector"> <section class="tokenizer-selector">
<div <div class="radio-group" role="radiogroup" aria-label="Tokenization strategy">
class="radio-group"
role="radiogroup"
aria-label="Tokenization strategy"
>
<label class="radio-option"> <label class="radio-option">
<input <input
type="radio" type="radio"

View file

@ -13,20 +13,13 @@ const tokenizerRadios = document.querySelectorAll(
const sampleText = `## Draft release const sampleText = `## Draft release
## Release plan ## Release plan
Build steps:
- Prototype - Prototype
- Publish - Publish
Review checklist:
- [ ] Draft - [ ] Draft
- [ ] Review - [ ] Review
Announcement:
> Internal > Internal
> Ready > Ready
Color-coded edits.`;
Use color-coded changes to compare tokenisers.`;
let pendingUpdate: number | null = null; let pendingUpdate: number | null = null;
function scheduleUpdate(): void { function scheduleUpdate(): void {
@ -74,7 +67,7 @@ function loadSample(): void {
.replace('- Prototype\n', '') .replace('- Prototype\n', '')
.replace('- [ ] Draft\n', '') .replace('- [ ] Draft\n', '')
.replace('> Internal\n', '') .replace('> Internal\n', '')
.replace('color', 'colour'); .replace('Color', 'Colour');
rightTextArea.value = sampleText rightTextArea.value = sampleText
.replace('## Release plan', '# Release plan') .replace('## Release plan', '# Release plan')
.replace('- Publish', '1. Publish') .replace('- Publish', '1. Publish')

View file

@ -68,7 +68,7 @@ header {
padding: 32px 32px 0 32px; padding: 32px 32px 0 32px;
} }
header>h1 { header > h1 {
font-size: 2.5rem; font-size: 2.5rem;
font-weight: 700; font-weight: 700;
color: $primary-blue; color: $primary-blue;
@ -93,13 +93,13 @@ code {
font-weight: 500; font-weight: 500;
} }
header>p { header > p {
color: $text-secondary; color: $text-secondary;
font-size: 1.1rem; font-size: 1.1rem;
margin-bottom: 0; margin-bottom: 0;
} }
header>p:not(:first-of-type) { header > p:not(:first-of-type) {
margin-top: 16px; margin-top: 16px;
} }
@ -299,13 +299,12 @@ textarea {
width: 100%; width: 100%;
user-select: text; user-select: text;
>* { > * {
position: relative; position: relative;
white-space: pre-wrap; white-space: pre-wrap;
} }
&:not(.show-deletions) { &:not(.show-deletions) {
.RemovedFromLeft, .RemovedFromLeft,
.RemovedFromRight { .RemovedFromRight {
display: none; display: none;
@ -371,12 +370,12 @@ $DOT_RADIUS: 4;
background: caret-colour($light-blue); background: caret-colour($light-blue);
} }
>* { > * {
position: absolute; position: absolute;
background-color: inherit; background-color: inherit;
} }
>.stick { > .stick {
left: 0; left: 0;
top: 0; top: 0;
transform: translateX(-50%); transform: translateX(-50%);
@ -387,7 +386,7 @@ $DOT_RADIUS: 4;
animation: blink-stick 1s steps(1) infinite; animation: blink-stick 1s steps(1) infinite;
} }
>.dot { > .dot {
border-radius: 50%; border-radius: 50%;
width: #{$DOT_RADIUS * 2}px; width: #{$DOT_RADIUS * 2}px;
height: #{$DOT_RADIUS * 2}px; height: #{$DOT_RADIUS * 2}px;
@ -409,11 +408,11 @@ $DOT_RADIUS: 4;
} }
} }
&:hover>.dot { &:hover > .dot {
opacity: 0; opacity: 0;
} }
>.info { > .info {
top: -1.3em; top: -1.3em;
left: calc(-#{$CARET_WIDTH} / 2 * 1px); left: calc(-#{$CARET_WIDTH} / 2 * 1px);
font-size: 0.9em; font-size: 0.9em;
@ -426,13 +425,12 @@ $DOT_RADIUS: 4;
border-radius: 3px 3px 3px 0; border-radius: 3px 3px 3px 0;
} }
&:hover>.info { &:hover > .info {
opacity: 1; opacity: 1;
} }
} }
@keyframes blink-stick { @keyframes blink-stick {
0%, 0%,
100% { 100% {
opacity: 1; opacity: 1;
@ -448,11 +446,11 @@ $DOT_RADIUS: 4;
padding: 32px 18px 0 18px; padding: 32px 18px 0 18px;
} }
header>h1 { header > h1 {
margin-bottom: 18px; margin-bottom: 18px;
} }
header>p { header > p {
font-size: 1rem; font-size: 1rem;
} }
@ -519,14 +517,14 @@ footer {
gap: 16px; gap: 16px;
} }
.footer-links>a>svg { .footer-links > a > svg {
color: $text-secondary; color: $text-secondary;
width: 28px; width: 28px;
height: 28px; height: 28px;
transition: transform 0.2s; transition: transform 0.2s;
} }
.footer-links>a>svg:hover { .footer-links > a > svg:hover {
cursor: pointer; cursor: pointer;
transform: scale(1.15); transform: scale(1.15);
} }