Skip to content

Commit ba7fd7c

Browse files
isc-tleavittisc-tleavitt
authored
Merge pull request #537 from intersystems/issue-525
Compact sidebar
2 parents 89e3328 + 668302f commit ba7fd7c

File tree

7 files changed

+43
-18
lines changed

7 files changed

+43
-18
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414

1515
### Fixed
1616
- Fixed display of other users' username in workspace view on Unix (#530)
17+
- Fix left-sidebar spacing (#525)
1718
- Fixed slowness loading some CSP pages with multiple instances sharing a webserver (#540)
1819
- Prevent direct commits to default merge branch in basic mode (#484)
1920

‎git-webui/release/share/git-webui/webui/css/git-webui.css

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,12 @@ body {
192192
}
193193
#sidebar #sidebar-content h4 {
194194
vertical-align: baseline;
195-
margin: 0.5em 0 0 0;
195+
margin: 0.25em 0 0 0;
196196
}
197197
#sidebar #sidebar-content > section h4 {
198198
font-size: 125%;
199199
cursor: pointer;
200-
padding: 10px 0;
200+
padding: 5px 0;
201201
}
202202
#sidebar #sidebar-content #sidebar-workspace h4:before {
203203
content: url(../img/computer.svg);
@@ -208,6 +208,9 @@ body {
208208
#sidebar #sidebar-content #sidebarDiscarded h4:before {
209209
content: url(../img/discarded.svg);
210210
}
211+
#sidebar #sidebar-content #sidebarDiscarded h4 {
212+
border-bottom: 1px solid #5e5e5e;
213+
}
211214
#sidebar #sidebar-content #sidebar-remote h4:before {
212215
content: url(../img/daemon.svg);
213216
}
@@ -216,6 +219,9 @@ body {
216219
#sidebar #sidebar-content #sidebar-switch-branches h4:before {
217220
content: url(../img/branch.svg);
218221
}
222+
#sidebar #sidebar-content #space-filler {
223+
padding-bottom: 50px;
224+
}
219225
#sidebar #sidebar-content #sidebar-tags h4:before {
220226
content: url(../img/tag.svg);
221227
}
@@ -224,49 +230,53 @@ body {
224230
}
225231
#sidebar #sidebar-content #sidebar-vscode h4 {
226232
padding: 0px;
233+
margin-bottom: 10px;
227234
}
228235
#sidebar #sidebar-content #sidebar-vscode h4:before {
229236
content: url(../img/file.svg);
230237
}
231238
#sidebar #sidebar-content #sidebar-vscode {
232239
position: absolute;
233-
bottom: 90px;
240+
bottom: 60px;
234241
width: 16.7em;
235242
background-color: #333333;
236243
}
237244
#sidebar #sidebar-content #sidebar-context h4 {
238245
padding: 0px;
246+
margin-bottom: 10px;
239247
}
240248
#sidebar #sidebar-content #sidebar-context h4:before {
241249
content: url(../img/context.svg);
242250
}
243251
#sidebar #sidebar-content #sidebar-context {
244252
position: absolute;
245-
bottom: 50px;
253+
bottom: 30px;
246254
width: 16.7em;
247255
background-color: #333333;
248256
}
249257
#sidebar #sidebar-content #sidebar-settings h4 {
250258
padding: 0px;
259+
margin-bottom: 10px;
251260
}
252261
#sidebar #sidebar-content #sidebar-settings h4:before {
253262
content: url(../img/gear-fill.svg);
254263
}
255264
#sidebar #sidebar-content #sidebar-settings {
256265
position: absolute;
257-
bottom: 10px;
266+
bottom: 0;
258267
width: 16.7em;
259268
background-color: #333333;
260269
}
261270
#sidebar #sidebar-content #sidebar-home h4 {
262271
padding: 0px;
272+
margin-bottom: 10px;
263273
}
264274
#sidebar #sidebar-content #sidebar-home h4:before {
265275
content: url(../img/home.svg);
266276
}
267277
#sidebar #sidebar-content #sidebar-home {
268278
position: absolute;
269-
bottom: 130px;
279+
bottom: 90px;
270280
width: 16.7em;
271281
background-color: #333333;
272282
}

‎git-webui/release/share/git-webui/webui/img/discarded.svg

Lines changed: 1 addition & 1 deletion
Loading

‎git-webui/release/share/git-webui/webui/js/git-webui.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -994,20 +994,21 @@ webui.SideBarView = function(mainView, noEventHandlers) {
994994
'<h4>Discarded Files</h4>' +
995995
'</section>' +
996996
'<section id="sidebar-local-branches">' +
997-
'<h4 class="mt-3">Local Branches' +
997+
'<h4 class="mt-1">Local Branches' +
998998
'<button type="button" class="btn btn-default btn-sidebar-icon btn-add shadow-none" >' +
999999
webui.circlePlusIcon+
10001000
'</button>' + '</h4>' +
10011001
'</section>' +
10021002
'<section id="sidebar-remote-branches">' +
1003-
'<h4 class="mt-3">Remote Branches' +
1003+
'<h4 class="mt-1">Remote Branches' +
10041004
'<button type="button" class="btn btn-default btn-sidebar-icon btn-prune-remote-branches shadow-none" >'+
10051005
webui.refreshIcon+
10061006
'</button>' +'</h4>' +
10071007
'</section>' +
10081008
'<section id="sidebar-tags">' +
10091009
'<h4>Tags</h4>' +
10101010
'</section>' +
1011+
'<section id="space-filler"></section>'+
10111012
'<section id="sidebar-settings">' +
10121013
'<h4>Settings</h4>' +
10131014
'</section>' +

‎git-webui/src/share/git-webui/webui/css/git-webui.less

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -268,14 +268,14 @@ body {
268268

269269
h4 {
270270
vertical-align: baseline;
271-
margin: 0.5em 0 0 0;
271+
margin: 0.25em 0 0 0;
272272
}
273273

274274
> section {
275275
h4 {
276276
font-size: 125%;
277277
cursor: pointer;
278-
padding: @padding-large-vertical 0;
278+
padding: @padding-small-vertical 0;
279279
}
280280
}
281281

@@ -291,6 +291,10 @@ body {
291291
content: url(../img/discarded.svg);
292292
}
293293

294+
#sidebarDiscarded h4 {
295+
border-bottom: 1px solid darken(@separator-line, 50%);
296+
}
297+
294298
#sidebar-remote h4:before {
295299
content: url(../img/daemon.svg);
296300
}
@@ -301,6 +305,10 @@ body {
301305
}
302306
}
303307

308+
#space-filler {
309+
padding-bottom: 50px;
310+
}
311+
304312
#sidebar-tags h4:before {
305313
content: url(../img/tag.svg);
306314
}
@@ -311,6 +319,7 @@ body {
311319

312320
#sidebar-vscode h4 {
313321
padding: 0px;
322+
margin-bottom: 10px;
314323
}
315324

316325
#sidebar-vscode h4:before {
@@ -319,13 +328,14 @@ body {
319328

320329
#sidebar-vscode {
321330
position: absolute;
322-
bottom: 90px;
331+
bottom: 60px;
323332
width: 16.7em;
324333
background-color: rgba(51, 51, 51, 1);
325334
}
326335

327336
#sidebar-context h4 {
328337
padding: 0px;
338+
margin-bottom: 10px;
329339
}
330340

331341
#sidebar-context h4:before {
@@ -334,13 +344,14 @@ body {
334344

335345
#sidebar-context {
336346
position: absolute;
337-
bottom: 50px;
347+
bottom: 30px;
338348
width: 16.7em;
339349
background-color: rgba(51, 51, 51, 1);
340350
}
341351

342352
#sidebar-settings h4 {
343353
padding: 0px;
354+
margin-bottom: 10px;
344355
}
345356

346357
#sidebar-settings h4:before {
@@ -349,13 +360,14 @@ body {
349360

350361
#sidebar-settings {
351362
position: absolute;
352-
bottom: 10px;
363+
bottom: 0;
353364
width: 16.7em;
354365
background-color: rgba(51, 51, 51, 1);
355366
}
356367

357368
#sidebar-home h4 {
358369
padding: 0px;
370+
margin-bottom: 10px;
359371
}
360372

361373
#sidebar-home h4:before {
@@ -364,7 +376,7 @@ body {
364376

365377
#sidebar-home {
366378
position: absolute;
367-
bottom: 130px;
379+
bottom: 90px;
368380
width: 16.7em;
369381
background-color: rgba(51, 51, 51, 1);
370382
}

‎git-webui/src/share/git-webui/webui/img/discarded.svg

Lines changed: 1 addition & 1 deletion
Loading

‎git-webui/src/share/git-webui/webui/js/git-webui.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -994,20 +994,21 @@ webui.SideBarView = function(mainView, noEventHandlers) {
994994
'<h4>Discarded Files</h4>' +
995995
'</section>' +
996996
'<section id="sidebar-local-branches">' +
997-
'<h4 class="mt-3">Local Branches' +
997+
'<h4 class="mt-1">Local Branches' +
998998
'<button type="button" class="btn btn-default btn-sidebar-icon btn-add shadow-none" >' +
999999
webui.circlePlusIcon+
10001000
'</button>' + '</h4>' +
10011001
'</section>' +
10021002
'<section id="sidebar-remote-branches">' +
1003-
'<h4 class="mt-3">Remote Branches' +
1003+
'<h4 class="mt-1">Remote Branches' +
10041004
'<button type="button" class="btn btn-default btn-sidebar-icon btn-prune-remote-branches shadow-none" >'+
10051005
webui.refreshIcon+
10061006
'</button>' +'</h4>' +
10071007
'</section>' +
10081008
'<section id="sidebar-tags">' +
10091009
'<h4>Tags</h4>' +
10101010
'</section>' +
1011+
'<section id="space-filler"></section>'+
10111012
'<section id="sidebar-settings">' +
10121013
'<h4>Settings</h4>' +
10131014
'</section>' +

0 commit comments

Comments
 (0)