File tree 5 files changed +21
-17
lines changed
5 files changed +21
-17
lines changed Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ $breadcrumb: prefix('breadcrumb');
30
30
$search : prefix (' search' );
31
31
32
32
// ============= The Workbench core component =============
33
- $activityBar : prefix (' activityBar ' );
33
+ $compositeBar : prefix (' compositeBar ' );
34
34
$editor : prefix (' editor' );
35
35
$menuBar : prefix (' menuBar' );
36
36
$panel : prefix (' panel' );
@@ -39,6 +39,7 @@ $sidebar: prefix('sidebar');
39
39
$statusBar : prefix (' statusBar' );
40
40
$workbench : prefix (' workbench' );
41
41
$mainBench : prefix (' mainBench' );
42
+ $activityBar : prefix (' activityBar' );
42
43
$notification : prefix (' notification' );
43
44
$problems : prefix (' problems' );
44
45
Original file line number Diff line number Diff line change 1
1
@import ' mo/style/common' ;
2
2
3
3
#{$activityBar } {
4
- bottom : 22px ;
5
- left : 0 ;
6
- position : absolute ;
7
- top : 35px ;
4
+ flex : 1 ;
5
+ padding-bottom : 20px ;
8
6
width : 48px ;
9
- z-index : 1 ;
10
7
11
8
& __container {
12
9
display : flex ;
Original file line number Diff line number Diff line change 7
7
font-size : 13px ;
8
8
height : 35px ;
9
9
justify-content : center ;
10
- position : absolute ;
11
10
width : 48px ;
12
11
13
12
& --left {
Original file line number Diff line number Diff line change 3
3
#{$workbench } {
4
4
bottom : 0 ;
5
5
left : 0 ;
6
- padding-bottom : 22px ;
7
6
position : absolute ;
8
7
right : 0 ;
9
8
top : 0 ;
10
9
z-index : 1 ;
11
10
}
12
11
12
+ #{$compositeBar } {
13
+ display : flex ;
14
+ flex-direction : column ;
15
+ min-height : 100% ;
16
+ width : auto ;
17
+ }
18
+
13
19
#{$mainBench } {
14
- bottom : 22px ;
15
- height : auto ;
16
- left : 48px ;
17
- position : absolute ;
18
- right : 0 ;
19
- top : 0 ;
20
+ display : flex ;
21
+ flex-direction : row ;
22
+ height : 100% ;
23
+ left : 0 ;
20
24
width : auto ;
21
25
22
26
/* stylelint-disable */
Original file line number Diff line number Diff line change @@ -38,6 +38,7 @@ import { IWorkbench } from 'mo/model';
38
38
39
39
const mainBenchClassName = prefixClaName ( 'mainBench' ) ;
40
40
const workbenchClassName = prefixClaName ( 'workbench' ) ;
41
+ const compositeBarClassName = prefixClaName ( 'compositeBar' ) ;
41
42
const appClassName = classNames ( APP_PREFIX , Utils . isMacOs ( ) ? 'mac' : '' ) ;
42
43
43
44
const panelService = container . resolve < IPanelService > ( PanelService ) ;
@@ -65,9 +66,11 @@ export function WorkbenchView(props: IWorkbench & IWorkbenchController) {
65
66
return (
66
67
< div id = { ID_APP } className = { appClassName } tabIndex = { 0 } >
67
68
< div className = { workbenchClassName } >
68
- { ! menuBar . hidden && < MenuBarView /> }
69
- { ! activityBar . hidden && < ActivityBarView /> }
70
69
< div className = { mainBenchClassName } >
70
+ < div className = { compositeBarClassName } >
71
+ { ! menuBar . hidden && < MenuBarView /> }
72
+ { ! activityBar . hidden && < ActivityBarView /> }
73
+ </ div >
71
74
< SplitPane
72
75
split = "vertical"
73
76
primary = "first"
@@ -96,7 +99,7 @@ export function WorkbenchView(props: IWorkbench & IWorkbenchController) {
96
99
? '100%'
97
100
: horizontalSplitPanePos [ 0 ]
98
101
}
99
- maxSize = "99 %"
102
+ maxSize = "100 %"
100
103
minSize = "10%"
101
104
>
102
105
< EditorView />
You can’t perform that action at this time.
0 commit comments