blob: b832e88bd84272ad33ccd0dbfea31afe1ad90bd0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
.monaco-workbench .merge-editor .code-view > .title {
padding: 0 10px;
height: 30px;
display: flex;
align-content: center;
justify-content: space-between;
}
.monaco-workbench .merge-editor .code-view > .title .monaco-icon-label {
margin: auto 0;
}
.monaco-workbench .merge-editor .code-view > .container {
display: flex;
flex-direction: row;
}
.monaco-workbench .merge-editor .code-view > .container > .gutter {
width: 24px;
position: relative;
overflow: hidden;
flex-shrink: 0;
flex-grow: 0;
}
.merge-editor-diff {
background-color: var(--vscode-mergeEditor-change-background);
}
.merge-editor-diff-word {
background-color: var(--vscode-mergeEditor-change-word-background);
}
.merge-editor-block {
border: 2px solid var(--vscode-mergeEditor-conflict-unhandledUnfocused-border);
}
.merge-editor-block.focused {
border: 2px solid var(--vscode-mergeEditor-conflict-unhandledFocused-border);
}
.merge-editor-block.handled {
border: 2px solid var(--vscode-mergeEditor-conflict-handledUnfocused-border);
}
.merge-editor-block.handled.focused {
border: 2px solid var(--vscode-mergeEditor-conflict-handledFocused-border);
}
.gutter-item {
position: absolute;
}
.merge-accept-gutter-marker {
width: 28px;
margin-left: 4px;
}
.merge-accept-gutter-marker .background {
height: 100%;
width: 50%;
position: absolute;
}
.merge-accept-gutter-marker.multi-line .background {
border: 1px solid var(--vscode-checkbox-border);
border-right: 0;
left: 8px;
width: 10px;
}
.merge-accept-gutter-marker .checkbox {
height: 100%;
width: 100%;
position: absolute;
display: flex;
flex-direction: column;
justify-content: center;
}
.accept-conflict-group.monaco-custom-toggle {
height: 18px;
width: 18px;
border: 1px solid transparent;
border-radius: 3px;
margin-right: 0px;
margin-left: 0px;
padding: 0px;
opacity: 1;
background-size: 16px !important;
background-color: var(--vscode-checkbox-border);
}
.merge-accept-gutter-marker .checkbox-background {
background: var(--vscode-editor-background);
}
|
