File tree Expand file tree Collapse file tree 4 files changed +27
-12
lines changed
release/share/git-webui/webui
src/share/git-webui/webui Expand file tree Collapse file tree 4 files changed +27
-12
lines changed Original file line number Diff line number Diff line change @@ -219,37 +219,40 @@ body {
219219# sidebar # sidebar-content # sidebar-vscode a {
220220 color : white;
221221}
222+ # sidebar # sidebar-content # sidebar-vscode h4 {
223+ padding : 0px ;
224+ }
222225# sidebar # sidebar-content # sidebar-vscode h4 : before {
223226 content : url(../ img/file.svg);
224227}
225228# sidebar # sidebar-content # sidebar-vscode {
226229 position : absolute;
227230 bottom : 80px ;
228231 width : 16.7em ;
229- padding-bottom : 0.3rem ;
230- margin-bottom : 0 ;
231232 background-color : # 333333 ;
232233}
234+ # sidebar # sidebar-content # sidebar-context h4 {
235+ padding : 0px ;
236+ }
233237# sidebar # sidebar-content # sidebar-context h4 : before {
234238 content : url(../ img/context.svg);
235239}
236240# sidebar # sidebar-content # sidebar-context {
237241 position : absolute;
238242 bottom : 40px ;
239243 width : 16.7em ;
240- padding-bottom : 0.3rem ;
241- margin-bottom : 0 ;
242244 background-color : # 333333 ;
243245}
246+ # sidebar # sidebar-content # sidebar-settings h4 {
247+ padding : 0px ;
248+ }
244249# sidebar # sidebar-content # sidebar-settings h4 : before {
245250 content : url(../ img/gear-fill.svg);
246251}
247252# sidebar # sidebar-content # sidebar-settings {
248253 position : absolute;
249254 bottom : 0px ;
250255 width : 16.7em ;
251- padding-bottom : 0.3rem ;
252- margin-bottom : 0px ;
253256 background-color : # 333333 ;
254257}
255258# sidebar # sidebar-content ul {
Original file line number Diff line number Diff line change @@ -421,6 +421,9 @@ webui.SideBarView = function(mainView, noEventHandlers) {
421421 if ( id . indexOf ( "local-branches" ) > - 1 ) {
422422 // parses the output of git branch --verbose --verbose
423423 var matches = / ^ \* ? \s * ( [ \w -\/ ] + ) \s + ( [ ^ \s ] + ) \s + ( \[ .* \] ) ? .* / . exec ( ref ) ;
424+ if ( ! matches ) {
425+ continue ;
426+ }
424427 var branchInfo = {
425428 "branch_name" : matches [ 1 ] ,
426429 "hash" : matches [ 2 ] ,
Original file line number Diff line number Diff line change @@ -305,6 +305,10 @@ body {
305305 color : white ;
306306 }
307307
308+ #sidebar-vscode h4 {
309+ padding : 0px ;
310+ }
311+
308312 #sidebar-vscode h4 :before {
309313 content : url(../img/file.svg ) ;
310314 }
@@ -313,11 +317,13 @@ body {
313317 position : absolute ;
314318 bottom : 80px ;
315319 width : 16.7em ;
316- padding-bottom : 0.3rem ;
317- margin-bottom : 0 ;
318320 background-color : rgba (51 , 51 , 51 , 1 );
319321 }
320322
323+ #sidebar-context h4 {
324+ padding : 0px ;
325+ }
326+
321327 #sidebar-context h4 :before {
322328 content : url(../img/context.svg ) ;
323329 }
@@ -326,11 +332,13 @@ body {
326332 position : absolute ;
327333 bottom : 40px ;
328334 width : 16.7em ;
329- padding-bottom : 0.3rem ;
330- margin-bottom : 0 ;
331335 background-color : rgba (51 , 51 , 51 , 1 );
332336 }
333337
338+ #sidebar-settings h4 {
339+ padding : 0px ;
340+ }
341+
334342 #sidebar-settings h4 :before {
335343 content : url(../img/gear-fill.svg ) ;
336344 }
@@ -339,8 +347,6 @@ body {
339347 position : absolute ;
340348 bottom : 0px ;
341349 width : 16.7em ;
342- padding-bottom : 0.3rem ;
343- margin-bottom :0px ;
344350 background-color : rgba (51 , 51 , 51 , 1 );
345351 }
346352
Original file line number Diff line number Diff line change @@ -421,6 +421,9 @@ webui.SideBarView = function(mainView, noEventHandlers) {
421421 if ( id . indexOf ( "local-branches" ) > - 1 ) {
422422 // parses the output of git branch --verbose --verbose
423423 var matches = / ^ \* ? \s * ( [ \w -\/ ] + ) \s + ( [ ^ \s ] + ) \s + ( \[ .* \] ) ? .* / . exec ( ref ) ;
424+ if ( ! matches ) {
425+ continue ;
426+ }
424427 var branchInfo = {
425428 "branch_name" : matches [ 1 ] ,
426429 "hash" : matches [ 2 ] ,
You can’t perform that action at this time.
0 commit comments