bluemsi/connectai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve conflicts by preferring remote changes

Browse Source
This commit is contained in:
g1nation
2026-05-14 21:58:59 +09:00
parent 0004853fcf
commit 05d05a392c
12 changed files with 1237 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files
media/sidebar.css
+12
View File
@@ -749,12 +749,24 @@
margin: 4px 0;
font-size: 10.5px;
color: var(--text-primary);
opacity: 1;
transition: opacity 600ms ease, margin 600ms ease, padding 600ms ease, max-height 600ms ease;
max-height: 80px;
overflow: hidden;
}
.arch-refresh-card .arc-head {
color: var(--text-bright); font-weight: 600; margin-bottom: 2px;
}
.arch-refresh-card .arc-meta { color: var(--text-dim); font-size: 9.5px; }
.arch-refresh-card.no-changes { border-style: dashed; }
.arch-refresh-card.fading {
opacity: 0;
max-height: 0;
margin: 0;
padding-top: 0;
padding-bottom: 0;
border-width: 0;
}
/* Inline model picker that lives in the input footer, next to the attach
button. Replaces the (now-removed) bottom model row + the separate