Skip to content

Commit 395937f

Browse files
MrWangJustToDoMrWangJustToDo
committed
ui fix
1 parent 32f1c89 commit 395937f

File tree

11 files changed

+60
-61
lines changed

11 files changed

+60
-61
lines changed

‎packages/react/src/_com.css‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44

55
[data-theme="light"] .diff-style-root {
66
--diff-border--: #dedede;
7-
--diff-add-content--: #e6ffec;
7+
--diff-add-content--: #dafbe1;
88
--diff-del-content--: #ffebe9;
9-
--diff-add-lineNumber--: #ccffd8;
10-
--diff-del-lineNumber--: #ffd7d5;
9+
--diff-add-lineNumber--: #aceebb;
10+
--diff-del-lineNumber--: #ffcecb;
1111
--diff-plain-content--: #ffffff;
1212
--diff-expand-content--: #fafafa;
1313
--diff-plain-lineNumber--: #fafafa;
1414
--diff-expand-lineNumber--: #fafafa;
1515
--diff-plain-lineNumber-color--: #555555;
1616
--diff-expand-lineNumber-color--: #555555;
1717
--diff-hunk-content--: #ddf4ff;
18-
--diff-hunk-lineNumber--: #c7ecff;
18+
--diff-hunk-lineNumber--: #b6e3ff;
1919
--diff-hunk-lineNumber-hover--: #0969da;
20-
--diff-add-content-highlight--: #abf2bc;
21-
--diff-del-content-highlight--: #ffb3ad;
20+
--diff-add-content-highlight--: #aceebb;
21+
--diff-del-content-highlight--: #ffcecb;
2222
--diff-add-widget--: #0969d2;
2323
--diff-add-widget-color--: #ffffff;
2424
--diff-empty-content--: #fafafa;
@@ -35,21 +35,21 @@
3535

3636
[data-theme="dark"] .diff-style-root {
3737
--diff-border--: #3d444d;
38-
--diff-add-content--: #14261f;
39-
--diff-del-content--: #311b1f;
40-
--diff-add-lineNumber--: #1f4429;
41-
--diff-del-lineNumber--: #552527;
38+
--diff-add-content--: #18271f;
39+
--diff-del-content--: #23191c;
40+
--diff-add-lineNumber--: #284228;
41+
--diff-del-lineNumber--: #4f2828;
4242
--diff-plain-content--: #0d1117;
4343
--diff-expand-content--: #161b22;
4444
--diff-plain-lineNumber--: #161b22;
4545
--diff-expand-lineNumber--: #161b22;
4646
--diff-plain-lineNumber-color--: #a0aaab;
4747
--diff-expand-lineNumber-color--: #a0aaab;
4848
--diff-hunk-content--: #131d2e;
49-
--diff-hunk-lineNumber--: #204274;
49+
--diff-hunk-lineNumber--: #0c2d6b;
5050
--diff-hunk-lineNumber-hover--: #1f6feb;
51-
--diff-add-content-highlight--: #1f572d;
52-
--diff-del-content-highlight--: #80312f;
51+
--diff-add-content-highlight--: #2f5732;
52+
--diff-del-content-highlight--: #713431;
5353
--diff-add-widget--: #0969d2;
5454
--diff-add-widget-color--: #ffffff;
5555
--diff-empty-content--: #161b22;

‎packages/react/src/components/DiffUnifiedExtendLine.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const InternalDiffUnifiedExtendLine = ({
3232
// TODO use css variable to get width
3333
const width = useDomWidth({
3434
selector: ".unified-diff-table-wrapper",
35-
enable: typeof renderExtendLine === "function" && !enableWrap,
35+
enable: typeof renderExtendLine === "function",
3636
});
3737

3838
if (!renderExtendLine) return null;

‎packages/react/src/components/DiffUnifiedWidgetLine.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const InternalDiffUnifiedWidgetLine = ({
4444

4545
const width = useDomWidth({
4646
selector: ".unified-diff-table-wrapper",
47-
enable: typeof renderWidgetLine === "function" && !enableWrap,
47+
enable: typeof renderWidgetLine === "function",
4848
});
4949

5050
if (!renderWidgetLine) return null;

‎packages/solid/src/_com.css‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44

55
[data-theme="light"] .diff-style-root {
66
--diff-border--: #dedede;
7-
--diff-add-content--: #e6ffec;
7+
--diff-add-content--: #dafbe1;
88
--diff-del-content--: #ffebe9;
9-
--diff-add-lineNumber--: #ccffd8;
10-
--diff-del-lineNumber--: #ffd7d5;
9+
--diff-add-lineNumber--: #aceebb;
10+
--diff-del-lineNumber--: #ffcecb;
1111
--diff-plain-content--: #ffffff;
1212
--diff-expand-content--: #fafafa;
1313
--diff-plain-lineNumber--: #fafafa;
1414
--diff-expand-lineNumber--: #fafafa;
1515
--diff-plain-lineNumber-color--: #555555;
1616
--diff-expand-lineNumber-color--: #555555;
1717
--diff-hunk-content--: #ddf4ff;
18-
--diff-hunk-lineNumber--: #c7ecff;
18+
--diff-hunk-lineNumber--: #b6e3ff;
1919
--diff-hunk-lineNumber-hover--: #0969da;
20-
--diff-add-content-highlight--: #abf2bc;
21-
--diff-del-content-highlight--: #ffb3ad;
20+
--diff-add-content-highlight--: #aceebb;
21+
--diff-del-content-highlight--: #ffcecb;
2222
--diff-add-widget--: #0969d2;
2323
--diff-add-widget-color--: #ffffff;
2424
--diff-empty-content--: #fafafa;
@@ -35,21 +35,21 @@
3535

3636
[data-theme="dark"] .diff-style-root {
3737
--diff-border--: #3d444d;
38-
--diff-add-content--: #14261f;
39-
--diff-del-content--: #311b1f;
40-
--diff-add-lineNumber--: #1f4429;
41-
--diff-del-lineNumber--: #552527;
38+
--diff-add-content--: #18271f;
39+
--diff-del-content--: #23191c;
40+
--diff-add-lineNumber--: #284228;
41+
--diff-del-lineNumber--: #4f2828;
4242
--diff-plain-content--: #0d1117;
4343
--diff-expand-content--: #161b22;
4444
--diff-plain-lineNumber--: #161b22;
4545
--diff-expand-lineNumber--: #161b22;
4646
--diff-plain-lineNumber-color--: #a0aaab;
4747
--diff-expand-lineNumber-color--: #a0aaab;
4848
--diff-hunk-content--: #131d2e;
49-
--diff-hunk-lineNumber--: #204274;
49+
--diff-hunk-lineNumber--: #0c2d6b;
5050
--diff-hunk-lineNumber-hover--: #1f6feb;
51-
--diff-add-content-highlight--: #1f572d;
52-
--diff-del-content-highlight--: #80312f;
51+
--diff-add-content-highlight--: #2f5732;
52+
--diff-del-content-highlight--: #713431;
5353
--diff-add-widget--: #0969d2;
5454
--diff-add-widget-color--: #ffffff;
5555
--diff-empty-content--: #161b22;

‎packages/solid/src/components/DiffUnifiedExtendLine.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const DiffUnifiedExtendLine = (props: { index: number; diffFile: DiffFile
2424

2525
const width = useDomWidth({
2626
selector: lineSelector,
27-
enable: () => currentIsShow() && !enableWrap(),
27+
enable: () => currentIsShow(),
2828
});
2929

3030
return (

‎packages/solid/src/components/DiffUnifiedWidgetLine.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ export const DiffUnifiedWidgetLine = (props: { index: number; diffFile: DiffFile
3030

3131
const currentIsHidden = createMemo(() => unifiedItem()?.isHidden);
3232

33-
const currenIsShow = createMemo(() => !!(oldWidget() || newWidget()) && !currentIsHidden() && !!renderWidget());
33+
const currentIsShow = createMemo(() => !!(oldWidget() || newWidget()) && !currentIsHidden() && !!renderWidget());
3434

3535
const onCloseWidget = () => setWidget?.({});
3636

3737
const lineSelector = createMemo(() => `.unified-diff-table-wrapper`);
3838

3939
const width = useDomWidth({
4040
selector: lineSelector,
41-
enable: () => currenIsShow() && !enableWrap(),
41+
enable: () => currentIsShow(),
4242
});
4343

4444
return (
45-
<Show when={currenIsShow()}>
45+
<Show when={currentIsShow()}>
4646
<tr data-line={`${props.lineNumber}-widget`} data-state="widget" class="diff-line diff-line-widget">
4747
<td class="diff-line-widget-content p-0" colspan={2}>
4848
<div class="diff-line-widget-wrapper sticky left-0 z-[1]" style={{ width: width() + "px" }}>

‎packages/svelte/src/_com.css‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44

55
[data-theme='light'] .diff-style-root {
66
--diff-border--: #dedede;
7-
--diff-add-content--: #e6ffec;
7+
--diff-add-content--: #dafbe1;
88
--diff-del-content--: #ffebe9;
9-
--diff-add-lineNumber--: #ccffd8;
10-
--diff-del-lineNumber--: #ffd7d5;
9+
--diff-add-lineNumber--: #aceebb;
10+
--diff-del-lineNumber--: #ffcecb;
1111
--diff-plain-content--: #ffffff;
1212
--diff-expand-content--: #fafafa;
1313
--diff-plain-lineNumber--: #fafafa;
1414
--diff-expand-lineNumber--: #fafafa;
1515
--diff-plain-lineNumber-color--: #555555;
1616
--diff-expand-lineNumber-color--: #555555;
1717
--diff-hunk-content--: #ddf4ff;
18-
--diff-hunk-lineNumber--: #c7ecff;
18+
--diff-hunk-lineNumber--: #b6e3ff;
1919
--diff-hunk-lineNumber-hover--: #0969da;
20-
--diff-add-content-highlight--: #abf2bc;
21-
--diff-del-content-highlight--: #ffb3ad;
20+
--diff-add-content-highlight--: #aceebb;
21+
--diff-del-content-highlight--: #ffcecb;
2222
--diff-add-widget--: #0969d2;
2323
--diff-add-widget-color--: #ffffff;
2424
--diff-empty-content--: #fafafa;
@@ -35,21 +35,21 @@
3535

3636
[data-theme='dark'] .diff-style-root {
3737
--diff-border--: #3d444d;
38-
--diff-add-content--: #14261f;
39-
--diff-del-content--: #311b1f;
40-
--diff-add-lineNumber--: #1f4429;
41-
--diff-del-lineNumber--: #552527;
38+
--diff-add-content--: #18271f;
39+
--diff-del-content--: #23191c;
40+
--diff-add-lineNumber--: #284228;
41+
--diff-del-lineNumber--: #4f2828;
4242
--diff-plain-content--: #0d1117;
4343
--diff-expand-content--: #161b22;
4444
--diff-plain-lineNumber--: #161b22;
4545
--diff-expand-lineNumber--: #161b22;
4646
--diff-plain-lineNumber-color--: #a0aaab;
4747
--diff-expand-lineNumber-color--: #a0aaab;
4848
--diff-hunk-content--: #131d2e;
49-
--diff-hunk-lineNumber--: #204274;
49+
--diff-hunk-lineNumber--: #0c2d6b;
5050
--diff-hunk-lineNumber-hover--: #1f6feb;
51-
--diff-add-content-highlight--: #1f572d;
52-
--diff-del-content-highlight--: #80312f;
51+
--diff-add-content-highlight--: #2f5732;
52+
--diff-del-content-highlight--: #713431;
5353
--diff-add-widget--: #0969d2;
5454
--diff-add-widget-color--: #ffffff;
5555
--diff-empty-content--: #161b22;

‎packages/svelte/src/lib/components/DiffUnifiedExtendLine.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
const width = $derived.by(
3535
useDomWidth({
3636
selector: () => '.unified-diff-table-wrapper',
37-
enable: () => currentIsShow && !enableWrap
37+
enable: () => currentIsShow
3838
})
3939
);
4040
</script>

‎packages/svelte/src/lib/components/DiffUnifiedWidgetLine.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
const width = $derived.by(
5050
useDomWidth({
5151
selector: () => `.unified-diff-table-wrapper`,
52-
enable: () => currentIsShow && !enableWrap
52+
enable: () => currentIsShow
5353
})
5454
);
5555
</script>

‎packages/vue/src/_com.css‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44

55
[data-theme="light"] .diff-style-root {
66
--diff-border--: #dedede;
7-
--diff-add-content--: #e6ffec;
7+
--diff-add-content--: #dafbe1;
88
--diff-del-content--: #ffebe9;
9-
--diff-add-lineNumber--: #ccffd8;
10-
--diff-del-lineNumber--: #ffd7d5;
9+
--diff-add-lineNumber--: #aceebb;
10+
--diff-del-lineNumber--: #ffcecb;
1111
--diff-plain-content--: #ffffff;
1212
--diff-expand-content--: #fafafa;
1313
--diff-plain-lineNumber--: #fafafa;
1414
--diff-expand-lineNumber--: #fafafa;
1515
--diff-plain-lineNumber-color--: #555555;
1616
--diff-expand-lineNumber-color--: #555555;
1717
--diff-hunk-content--: #ddf4ff;
18-
--diff-hunk-lineNumber--: #c7ecff;
18+
--diff-hunk-lineNumber--: #b6e3ff;
1919
--diff-hunk-lineNumber-hover--: #0969da;
20-
--diff-add-content-highlight--: #abf2bc;
21-
--diff-del-content-highlight--: #ffb3ad;
20+
--diff-add-content-highlight--: #aceebb;
21+
--diff-del-content-highlight--: #ffcecb;
2222
--diff-add-widget--: #0969d2;
2323
--diff-add-widget-color--: #ffffff;
2424
--diff-empty-content--: #fafafa;
@@ -35,21 +35,21 @@
3535

3636
[data-theme="dark"] .diff-style-root {
3737
--diff-border--: #3d444d;
38-
--diff-add-content--: #14261f;
39-
--diff-del-content--: #311b1f;
40-
--diff-add-lineNumber--: #1f4429;
41-
--diff-del-lineNumber--: #552527;
38+
--diff-add-content--: #18271f;
39+
--diff-del-content--: #23191c;
40+
--diff-add-lineNumber--: #284228;
41+
--diff-del-lineNumber--: #4f2828;
4242
--diff-plain-content--: #0d1117;
4343
--diff-expand-content--: #161b22;
4444
--diff-plain-lineNumber--: #161b22;
4545
--diff-expand-lineNumber--: #161b22;
4646
--diff-plain-lineNumber-color--: #a0aaab;
4747
--diff-expand-lineNumber-color--: #a0aaab;
4848
--diff-hunk-content--: #131d2e;
49-
--diff-hunk-lineNumber--: #204274;
49+
--diff-hunk-lineNumber--: #0c2d6b;
5050
--diff-hunk-lineNumber-hover--: #1f6feb;
51-
--diff-add-content-highlight--: #1f572d;
52-
--diff-del-content-highlight--: #80312f;
51+
--diff-add-content-highlight--: #2f5732;
52+
--diff-del-content-highlight--: #713431;
5353
--diff-add-widget--: #0969d2;
5454
--diff-add-widget-color--: #ffffff;
5555
--diff-empty-content--: #161b22;

0 commit comments

Comments
 (0)