Skip to content

Commit 36bf1c9

Browse files
author
Miguel Solorio
committed
Clean up activity bar size and margins
1 parent 8f60641 commit 36bf1c9

1 file changed

Lines changed: 17 additions & 21 deletions

File tree

src/vs/workbench/browser/parts/activitybar/media/activityaction.css

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item {
77
display: block;
88
position: relative;
9-
padding: 5px 0;
9+
margin-bottom: 8px;
1010
}
11+
1112
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-label {
1213
position: relative;
1314
z-index: 1;
1415
display: flex;
1516
overflow: hidden;
16-
height: 40px;
17+
height: 48px;
1718
margin-right: 0;
1819
box-sizing: border-box;
1920

@@ -35,11 +36,10 @@
3536
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before {
3637
content: "";
3738
position: absolute;
38-
top: 9px;
39-
height: 32px;
39+
top: 0;
4040
z-index: 1;
41-
top: 5px;
42-
height: 40px;
41+
top: 0;
42+
height: 100%;
4343
width: 0;
4444
border-left: 2px solid;
4545
}
@@ -50,7 +50,7 @@
5050
}
5151

5252
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked:focus .active-item-indicator:before {
53-
border-left: none; /* don't show active border + focus at the same time, focus takes priority */
53+
visibility: hidden; /* don't show active border + focus at the same time, focus takes priority */
5454
}
5555

5656
/* Hides active elements in high contrast mode */
@@ -62,20 +62,14 @@
6262
border-left: none !important; /* no focus feedback when using mouse */
6363
}
6464

65+
.monaco-workbench .activitybar.left > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before,
6566
.monaco-workbench .activitybar.left > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked .active-item-indicator:before{
6667
left: 0;
6768
}
6869

69-
.monaco-workbench .activitybar.left > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before {
70-
left: 1px;
71-
}
72-
70+
.monaco-workbench .activitybar.right > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked .active-item-indicator:before,
7371
.monaco-workbench .activitybar.right > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before {
74-
right: 1px;
75-
}
76-
77-
.monaco-workbench .activitybar.right > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked .active-item-indicator:before {
78-
right: 2px;
72+
right: 0;
7973
}
8074

8175
/* Hides outline on HC as focus is handled by border */
@@ -88,16 +82,18 @@
8882
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .badge {
8983
position: absolute;
9084
z-index: 1;
91-
top: 5px;
85+
top: 0;
86+
bottom: 0;
87+
margin: auto;
9288
left: 0;
9389
overflow: hidden;
94-
width: 50px;
95-
height: 40px;
90+
width: 100%;
91+
height: 100%;
9692
}
9793

9894
.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .badge .badge-content {
9995
position: absolute;
100-
top: 20px;
96+
top: 24px;
10197
right: 8px;
10298
font-size: 9px;
10399
font-weight: 600;
@@ -113,7 +109,7 @@
113109

114110
.monaco-workbench .activitybar.right > .content :not(.monaco-menu) > .monaco-action-bar .action-label:not(.codicon) {
115111
margin-left: 0;
116-
padding: 0 50px 0 0;
112+
padding: 0 48px 0 0;
117113
background-position: calc(100% - 9px) center;
118114
}
119115

0 commit comments

Comments
 (0)