Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/styles/syncMergeChromeDensity.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,3 +165,10 @@ describe('folder-sync status columns residual', () => {
)
})
})

describe('sync merge border base', () => {
it('matches capture session chrome border #c0c0c0', () => {
expect(syncView).toMatch(/border:\s*1px solid #c0c0c0/)
expect(mergeView).toMatch(/border:\s*1px solid #c0c0c0/)
})
})
2 changes: 1 addition & 1 deletion src/views/FolderMergeView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3476,7 +3476,7 @@ h1 {
min-width: 0;
height: 16.5px;
padding: 0 6px;
border: 1px solid #bfc4cc;
border: 1px solid #c0c0c0;
border-radius: 0;
background: #ffffff;
color: #111111;
Expand Down
4 changes: 2 additions & 2 deletions src/views/FolderSyncView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2405,7 +2405,7 @@ h1 {
height: 16.5px;
min-height: 16.5px;
padding: 0 6px;
border: 1px solid #bfc4cc;
border: 1px solid #c0c0c0;
border-radius: 0;
background: #ffffff;
color: #111111;
Expand Down Expand Up @@ -2917,7 +2917,7 @@ h1 {
min-width: 0;
height: 16.5px;
padding: 0 6px;
border: 1px solid #bfc4cc;
border: 1px solid #c0c0c0;
border-radius: 0;
background: #ffffff;
color: #111111;
Expand Down
Loading