Merge pull request #9 from lemo-nade-room/develop

Develop
lemo-nade-room · Jun 9, 2024 · 6d50766 · 6d50766
2 parents 3dc0058 + 8e475e9
commit 6d50766
Show file tree

Hide file tree

Showing 17 changed files with 473 additions and 10 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/prettier.xml b/.idea/prettier.xml
diff --git a/.idea/svelte-diff-highlighting.iml b/.idea/svelte-diff-highlighting.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/src/lib/ui/Highlighted.svelte b/src/lib/ui/Highlighted.svelte
@@ -38,7 +38,7 @@
 </script>
 
 <div class="scroll svelte-diff-highlighting">
-	<p class="highlighted">
+	<p class="highlighted" translate="no">
 		{#each lines as line, i}
 			{@const lineNumber = i + 1}
 			<span class="line">
@@ -76,9 +76,8 @@
 		background: var(--background, none);
 		margin: var(--margin, 0);
 		padding: var(--padding, 0);
-		white-space: var(--white-space, pre-wrap);
+		white-space: pre-wrap;
 		tab-size: var(--tab-size, 2);
-		box-sizing: var(--box-sizing, border-box);
 		scrollbar-width: var(--scrollbar-width, thin);
 		scrollbar-color: var(--scrollbar-color, auto);
 
@@ -87,7 +86,7 @@
 			width: var(--content-width, max-content);
 			height: var(--content-height, max-content);
 			padding: calc(var(--line-number-font-size, 14px) * 0.4) 0;
-			white-space: nowrap;
+			white-space: var(--white-space, nowrap);
 			user-select: none;
 			-webkit-user-select: none;
 			--omission-icon-size: calc(var(--line-number-font-size, 14px) * 0.8);

diff --git a/src/lib/ui/HighlightedRemovedLines.svelte b/src/lib/ui/HighlightedRemovedLines.svelte
@@ -56,7 +56,7 @@
 					display: block;
 					width: calc(100% - var(--omission-icon-size));
 					height: 100%;
-					background-color: var(--removed-line-color, #ffb74c);
+					background-color: var(--omission-icon-color, #ffb74c);
 				}
 
 				display: flex;

diff --git a/src/lib/ui/OmissionIcon.svelte b/src/lib/ui/OmissionIcon.svelte
@@ -6,9 +6,7 @@
 	}
 </script>
 
-<button class="omission-icon" class:open on:click={toggle}>
-	<span class="circle"></span>
-</button>
+<button class="omission-icon" class:open on:click={toggle} />
 
 <style>
 	.omission-icon {