add something
This commit is contained in:
Christoph Brandau
+149
-8
@@ -572,6 +572,28 @@
|
||||
.explorer-row.active { background: rgba(90,140,248,0.1); border-color: rgba(90,140,248,0.28); }
|
||||
.explorer-row.folder { font-weight: 700; }
|
||||
.explorer-row svg { color: var(--color-accent); }
|
||||
.explorer-row svg.file-icon.code { color: #7aacff; }
|
||||
.explorer-row svg.file-icon.markup { color: #f08a5d; }
|
||||
.explorer-row svg.file-icon.style { color: #c678dd; }
|
||||
.explorer-row svg.file-icon.json { color: #e0c15c; }
|
||||
.explorer-row svg.file-icon.config { color: #9aa6d6; }
|
||||
.explorer-row svg.file-icon.script { color: #4eca76; }
|
||||
.explorer-row svg.file-icon.text { color: #b8c2e0; }
|
||||
.explorer-row svg.file-icon.image { color: #54c7ec; }
|
||||
.explorer-row svg.file-icon.audio { color: #d98cf0; }
|
||||
.explorer-row svg.file-icon.video { color: #ff8ba7; }
|
||||
.explorer-row svg.file-icon.archive { color: #d8a657; }
|
||||
.explorer-row svg.file-icon.sheet { color: #4eca76; }
|
||||
.explorer-row svg.file-icon.database { color: #5fc5d9; }
|
||||
.explorer-row svg.file-icon.font { color: #f0d080; }
|
||||
.explorer-row .language-icon {
|
||||
display: block;
|
||||
width: 15px;
|
||||
height: 15px;
|
||||
flex: 0 0 15px;
|
||||
fill: currentColor;
|
||||
}
|
||||
.explorer-row .language-icon path { fill: currentColor; }
|
||||
|
||||
.tree-toggle, .explorer-select { min-height: 20px; padding: 0; border: 0; background: transparent; color: var(--color-ink-muted); }
|
||||
.tree-toggle { width: 14px; }
|
||||
@@ -584,6 +606,16 @@
|
||||
|
||||
.commit-form { display: flex; flex-direction: column; flex: 1 1 0; min-height: 0; gap: 8px; padding: 10px; }
|
||||
.commit-form textarea { flex: 1 1 0; min-height: 80px; resize: none; }
|
||||
.commit-block-reason {
|
||||
margin: 0;
|
||||
padding: 8px 10px;
|
||||
border: 1px solid rgba(232,96,96,0.28);
|
||||
border-radius: 6px;
|
||||
color: #ef8080;
|
||||
background: rgba(232,96,96,0.08);
|
||||
font-size: 12px;
|
||||
line-height: 1.35;
|
||||
}
|
||||
|
||||
/* --- Commit history --- */
|
||||
|
||||
@@ -703,6 +735,10 @@
|
||||
box-shadow: 0 24px 72px rgba(0, 0, 0, 0.6), 0 2px 12px rgba(0,0,0,0.4);
|
||||
overflow: hidden;
|
||||
}
|
||||
.compare-dialog {
|
||||
width: min(1560px, calc(100vw - 32px));
|
||||
height: min(940px, calc(100vh - 32px));
|
||||
}
|
||||
|
||||
.dialog-header { display: flex; align-items: center; justify-content: space-between; gap: 12px; padding: 14px 16px; border-bottom: 1px solid var(--color-border-subtle); background: var(--color-surface-dim); }
|
||||
|
||||
@@ -712,6 +748,7 @@
|
||||
.dialog-close { min-height: 32px; min-width: 32px; padding: 0; justify-content: center; }
|
||||
|
||||
.dialog-body { display: grid; grid-template-columns: 280px minmax(0, 1fr); min-height: 0; }
|
||||
.compare-dialog .dialog-body { grid-template-columns: minmax(260px, 320px) minmax(0, 1fr); }
|
||||
|
||||
.dialog-files { display: grid; align-content: start; gap: 4px; padding: 8px; overflow: auto; border-right: 1px solid var(--color-border-subtle); background: var(--color-surface-dim); }
|
||||
|
||||
@@ -755,10 +792,12 @@
|
||||
|
||||
.split-diff {
|
||||
display: grid;
|
||||
grid-template-columns: 3.2rem minmax(0, 1fr) 1px 3.2rem minmax(0, 1fr);
|
||||
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
|
||||
align-content: start;
|
||||
flex: 1 1 0;
|
||||
overflow: auto;
|
||||
min-width: 0;
|
||||
min-height: 0;
|
||||
overflow: hidden;
|
||||
font-family: var(--font-mono);
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
@@ -766,6 +805,21 @@
|
||||
background: var(--color-surface-raised);
|
||||
}
|
||||
|
||||
.split-pane {
|
||||
min-width: 0;
|
||||
min-height: 0;
|
||||
overflow: auto;
|
||||
scrollbar-gutter: stable;
|
||||
}
|
||||
.split-pane + .split-pane { border-left: 1px solid var(--color-border-subtle); }
|
||||
|
||||
.split-pane-grid {
|
||||
display: grid;
|
||||
grid-template-columns: 3.2rem minmax(max-content, 1fr);
|
||||
align-content: start;
|
||||
min-width: 100%;
|
||||
}
|
||||
|
||||
.split-span {
|
||||
grid-column: 1 / -1;
|
||||
padding: 2px 10px;
|
||||
@@ -792,14 +846,13 @@
|
||||
padding: 0 8px;
|
||||
white-space: pre;
|
||||
color: var(--color-ink-muted);
|
||||
overflow: hidden;
|
||||
min-width: 0;
|
||||
overflow: visible;
|
||||
}
|
||||
.split-cell.del { background: rgba(232,96,96,0.1); color: #ef8080; }
|
||||
.split-cell.add { background: rgba(78,202,118,0.09); color: #5dd88a; }
|
||||
.split-cell.empty { background: rgba(0,0,0,0.06); }
|
||||
|
||||
.split-divider { background: var(--color-border-subtle); }
|
||||
|
||||
.split-col-headers {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
@@ -1153,18 +1206,105 @@
|
||||
}
|
||||
|
||||
.resolve-structured {
|
||||
display: grid;
|
||||
align-content: start;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
flex: 1 1 auto;
|
||||
min-height: 0;
|
||||
padding: 4px;
|
||||
overflow: auto;
|
||||
overflow: hidden;
|
||||
border: 1px solid var(--color-border-subtle);
|
||||
border-radius: 6px;
|
||||
background: var(--color-surface-raised);
|
||||
}
|
||||
|
||||
.resolve-conflict-controls {
|
||||
display: grid;
|
||||
align-content: start;
|
||||
gap: 6px;
|
||||
flex: 0 0 auto;
|
||||
max-height: 126px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.resolve-conflict-controls .resolve-conflict-bar {
|
||||
padding: 7px 8px;
|
||||
border: 1px solid rgba(224,160,64,0.25);
|
||||
border-radius: 6px;
|
||||
background: rgba(224,160,64,0.06);
|
||||
}
|
||||
.resolve-conflict-controls .resolve-conflict-bar.unresolved {
|
||||
border-color: rgba(232,96,96,0.3);
|
||||
background: rgba(232,96,96,0.06);
|
||||
}
|
||||
|
||||
.resolve-split {
|
||||
display: grid;
|
||||
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
|
||||
flex: 1 1 auto;
|
||||
min-width: 0;
|
||||
min-height: 0;
|
||||
overflow: hidden;
|
||||
border: 1px solid var(--color-border-subtle);
|
||||
border-radius: 6px;
|
||||
background: rgba(0,0,0,0.12);
|
||||
font-family: var(--font-mono);
|
||||
font-size: 12px;
|
||||
line-height: 1.5;
|
||||
tab-size: 2;
|
||||
}
|
||||
|
||||
.resolve-pane {
|
||||
min-width: 0;
|
||||
min-height: 0;
|
||||
overflow: auto;
|
||||
scrollbar-gutter: stable;
|
||||
}
|
||||
.resolve-pane + .resolve-pane { border-left: 1px solid var(--color-border-subtle); }
|
||||
|
||||
.resolve-pane-grid {
|
||||
display: grid;
|
||||
grid-template-columns: 3.2rem minmax(max-content, 1fr);
|
||||
align-content: start;
|
||||
min-width: 100%;
|
||||
}
|
||||
|
||||
.resolve-split-marker {
|
||||
grid-column: 1 / -1;
|
||||
padding: 3px 8px;
|
||||
color: #e0a040;
|
||||
background: rgba(224,160,64,0.12);
|
||||
font-family: var(--font-mono);
|
||||
font-size: 11px;
|
||||
font-weight: 800;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
.resolve-split-marker.unresolved { color: #ef8080; background: rgba(232,96,96,0.12); }
|
||||
|
||||
.resolve-num {
|
||||
padding: 0 6px 0 4px;
|
||||
border-right: 1px solid var(--color-border-subtle);
|
||||
color: var(--color-ink-faint);
|
||||
background: rgba(0,0,0,0.14);
|
||||
text-align: right;
|
||||
user-select: none;
|
||||
}
|
||||
.resolve-num.ours { color: rgba(78,202,118,0.65); background: rgba(78,202,118,0.11); border-right-color: rgba(78,202,118,0.2); }
|
||||
.resolve-num.theirs { color: rgba(122,172,255,0.65); background: rgba(122,172,255,0.11); border-right-color: rgba(122,172,255,0.2); }
|
||||
.resolve-num.empty { background: rgba(0,0,0,0.07); }
|
||||
|
||||
.resolve-cell {
|
||||
min-width: 0;
|
||||
padding: 0 8px;
|
||||
overflow: visible;
|
||||
color: var(--color-ink-muted);
|
||||
white-space: pre;
|
||||
}
|
||||
.resolve-cell.ours { color: #5dd88a; background: rgba(78,202,118,0.1); }
|
||||
.resolve-cell.theirs { color: #8fb4ff; background: rgba(90,140,248,0.11); }
|
||||
.resolve-cell.empty { background: rgba(0,0,0,0.06); }
|
||||
.resolve-cell.dimmed { opacity: 0.42; filter: grayscale(0.5); }
|
||||
|
||||
.resolve-context { margin: 0; padding: 2px 8px; overflow-x: auto; font-family: var(--font-mono); font-size: 12px; line-height: 1.5; tab-size: 2; color: var(--color-ink-muted); }
|
||||
|
||||
.resolve-conflict { display: grid; gap: 6px; padding: 8px; border: 1px solid rgba(224,160,64,0.25); border-radius: 6px; background: rgba(224,160,64,0.06); }
|
||||
@@ -1274,6 +1414,7 @@
|
||||
.compare-form { grid-template-columns: 1fr; }
|
||||
.compare-arrow { display: none; }
|
||||
.dialog-body { grid-template-columns: 1fr; grid-template-rows: minmax(120px, 0.4fr) minmax(0, 1fr); }
|
||||
.compare-dialog .dialog-body { grid-template-columns: 1fr; grid-template-rows: minmax(120px, 0.4fr) minmax(0, 1fr); }
|
||||
.dialog-files { border-right: none; border-bottom: 1px solid var(--color-border-subtle); }
|
||||
.branch-actions { flex-direction: row; justify-content: flex-start; }
|
||||
.tb-action-label { display: none; }
|
||||
|
||||
Reference in New Issue
Block a user