Skip to content

Commit 4808902

Browse files
committed
Update button padding in diffApprove.css and fix test files
1 parent b990506 commit 4808902

File tree

9 files changed

+9239
-8698
lines changed

9 files changed

+9239
-8698
lines changed

jest.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ module.exports = {
1414
allowJs: true,
1515
},
1616
diagnostics: false,
17-
isolatedModules: true,
1817
},
1918
],
2019
},

media/diffApprove.css

Lines changed: 51 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
body {
2-
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans",
3-
"Helvetica Neue", sans-serif;
2+
font-family:
3+
-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue",
4+
sans-serif;
45
padding: 0;
56
margin: 0;
67
}
@@ -27,46 +28,46 @@ body {
2728
}
2829

2930
button {
30-
padding: 6px 12px;
31+
padding: 2px 8px;
3132
border: 1px solid var(--vscode-button-border);
3233
border-radius: 4px;
3334
background: var(--vscode-button-background);
3435
color: var(--vscode-button-foreground);
3536
cursor: pointer;
36-
font-size: 12px;
37+
font-size: 11px;
3738
}
3839

3940
button:hover {
4041
background: var(--vscode-button-hoverBackground);
4142
}
4243

4344
.diff-content {
44-
padding: 16px;
45+
padding: 0;
4546
}
4647

4748
.diff-block {
48-
margin-bottom: 24px;
49+
margin: 0;
4950
border: 1px solid var(--vscode-panel-border);
50-
border-radius: 4px;
51+
border-radius: 0;
5152
overflow: hidden;
5253
}
5354

5455
.diff-block.approved {
5556
opacity: 0.7;
56-
border-left: 4px solid #28a745;
57+
border-left: 4px solid #2e7d32;
5758
}
5859

5960
.diff-block.denied {
6061
opacity: 0.7;
61-
border-left: 4px solid #dc3545;
62+
border-left: 4px solid #c62828;
6263
}
6364

6465
.block-header {
65-
padding: 8px 16px;
66+
padding: 2px 8px;
6667
background: var(--vscode-editor-background);
6768
border-bottom: 1px solid var(--vscode-panel-border);
6869
display: flex;
69-
justify-content: space-between;
70+
justify-content: flex-end;
7071
align-items: center;
7172
}
7273

@@ -76,26 +77,26 @@ button:hover {
7677
}
7778

7879
.approve-button {
79-
background: #28a745;
80-
border-color: #28a745;
80+
background: #2e7d32;
81+
border-color: #2e7d32;
8182
}
8283

8384
.deny-button {
84-
background: #dc3545;
85-
border-color: #dc3545;
85+
background: #c62828;
86+
border-color: #c62828;
8687
}
8788

8889
.lines {
89-
padding: 8px 0;
90+
padding: 0;
9091
font-family: "SF Mono", Monaco, Menlo, Courier, monospace;
9192
font-size: 12px;
92-
line-height: 1.5;
93+
line-height: 1.4;
9394
background: var(--vscode-editor-background);
9495
}
9596

9697
.line {
9798
display: flex;
98-
padding: 0 16px;
99+
padding: 0 8px;
99100
white-space: pre;
100101
}
101102

@@ -116,13 +117,13 @@ button:hover {
116117
}
117118

118119
.deletion {
119-
background-color: rgba(220, 53, 69, 0.2);
120-
color: #dc3545;
120+
background-color: rgba(198, 40, 40, 0.15);
121+
color: #c62828;
121122
}
122123

123124
.addition {
124-
background-color: rgba(40, 167, 69, 0.2);
125-
color: #28a745;
125+
background-color: rgba(46, 125, 50, 0.15);
126+
color: #2e7d32;
126127
}
127128

128129
.old-content,
@@ -141,11 +142,11 @@ button:hover {
141142
}
142143

143144
.old-content::before {
144-
background: #dc3545;
145+
background: #c62828;
145146
}
146147

147148
.new-content::before {
148-
background: #28a745;
149+
background: #2e7d32;
149150
}
150151

151152
.context {
@@ -154,37 +155,37 @@ button:hover {
154155

155156
/* Additions */
156157
.addition .line {
157-
background: rgba(40, 167, 69, 0.1);
158+
background: rgba(46, 125, 50, 0.08);
158159
}
159160

160161
.addition .content {
161-
color: #28a745;
162+
color: #2e7d32;
162163
}
163164

164165
/* Deletions */
165166
.deletion .line {
166-
background: rgba(220, 53, 69, 0.1);
167+
background: rgba(198, 40, 40, 0.08);
167168
}
168169

169170
.deletion .content {
170-
color: #dc3545;
171+
color: #c62828;
171172
}
172173

173174
/* Changes */
174175
.change .old-content .line {
175-
background: rgba(220, 53, 69, 0.1);
176+
background: rgba(198, 40, 40, 0.08);
176177
}
177178

178179
.change .old-content .content {
179-
color: #dc3545;
180+
color: #c62828;
180181
}
181182

182183
.change .new-content .line {
183-
background: rgba(40, 167, 69, 0.1);
184+
background: rgba(46, 125, 50, 0.08);
184185
}
185186

186187
.change .new-content .content {
187-
color: #28a745;
188+
color: #2e7d32;
188189
}
189190

190191
/* Separators */
@@ -222,3 +223,21 @@ button:hover {
222223
.line-number:empty::before {
223224
content: " ";
224225
}
226+
227+
#approveAll {
228+
background: #2e7d32;
229+
border-color: #2e7d32;
230+
}
231+
232+
#denyAll {
233+
background: #c62828;
234+
border-color: #c62828;
235+
}
236+
237+
#approveAll:hover {
238+
background: #1b5e20;
239+
}
240+
241+
#denyAll:hover {
242+
background: #b71c1c;
243+
}

0 commit comments

Comments
 (0)