Skip to content

Commit c167797

Browse files
author
Guillaume Chau
committed
fix(ui): chrome bug: grid element overflow
https://bugs.chromium.org/p/chromium/issues/detail?id=833837
1 parent d601441 commit c167797

File tree

2 files changed

+28
-22
lines changed

2 files changed

+28
-22
lines changed

packages/@vue/cli-ui/src/App.vue

+7-10
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,18 @@ export default {
3737
@import "~@/style/imports"
3838
3939
.app
40-
display grid
41-
grid-template-columns 1fr
42-
grid-template-rows auto 1fr auto
43-
grid-template-areas "connection" "content" "status"
40+
display flex
41+
flex-direction column
4442
45-
.connection-status
46-
grid-area connection
43+
.connection-status,
44+
.status-bar
45+
flex auto 0 0
4746
4847
.content
49-
grid-area content
48+
flex auto 1 1
49+
height 100%
5050
overflow hidden
5151
52-
.status-bar
53-
grid-area status
54-
5552
.app-init-loading
5653
z-index 100000
5754
</style>

packages/@vue/cli-ui/src/views/ProjectHome.vue

+21-12
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@
66
}"
77
>
88
<TopBar />
9-
<ProjectNav/>
109

11-
<div v-if="ready" class="content">
12-
<router-view/>
10+
<div class="panes">
11+
<ProjectNav/>
12+
13+
<div v-if="ready" class="content vue-ui-disable-scroll">
14+
<router-view/>
15+
</div>
1316
</div>
1417

1518
<ProgressScreen progress-id="__plugins__"/>
@@ -41,22 +44,28 @@ export default {
4144
@import "~@/style/imports"
4245
4346
.project-home
44-
display grid
45-
grid-template-columns 46px 1fr
46-
grid-template-rows auto 1fr
47-
grid-template-areas "topbar topbar" "side-left content"
47+
display flex
48+
flex-direction column
4849
4950
&.wide
50-
grid-template-columns 180px 1fr
51+
.project-nav
52+
width 180px
53+
54+
.panes
55+
flex auto 1 1
56+
height 100%
57+
display flex
5158
52-
.top-bar
53-
grid-area topbar
59+
.top-bar,
60+
.project-nav
61+
flex auto 0 0
5462
5563
.project-nav
56-
grid-area side-left
64+
width 46px
5765
5866
.content
59-
grid-area content
67+
flex auto 1 1
68+
width 0
6069
overflow-x hidden
6170
overflow-y auto
6271

0 commit comments

Comments
 (0)