Merge pull request #2421 from matrix-org/bwindels/fixgrid

fix grid growing wider than viewport on chrome
This commit is contained in:
Matthew Hodgson 2019-01-09 18:24:35 +00:00 committed by GitHub
commit d529e2475b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

View file

@ -24,6 +24,7 @@ limitations under the License.
grid-template-columns: repeat(3, calc(100% / 3)); grid-template-columns: repeat(3, calc(100% / 3));
grid-template-rows: repeat(2, calc(100% / 2)); grid-template-rows: repeat(2, calc(100% / 2));
flex: 1 1 0; flex: 1 1 0;
min-width: 0;
} }
.mx_GroupGridView_rightPanel { .mx_GroupGridView_rightPanel {

View file

@ -73,7 +73,8 @@ limitations under the License.
.mx_MatrixChat > :not(.mx_LeftPanel_container):not(.mx_ResizeHandle) { .mx_MatrixChat > :not(.mx_LeftPanel_container):not(.mx_ResizeHandle) {
background-color: $primary-bg-color; background-color: $primary-bg-color;
flex: 1; flex: 1 1 0;
min-width: 0;
/* Experimental fix for https://github.com/vector-im/vector-web/issues/947 /* Experimental fix for https://github.com/vector-im/vector-web/issues/947
and https://github.com/vector-im/vector-web/issues/946. and https://github.com/vector-im/vector-web/issues/946.