PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

back out previous bodges to flexbox to make geminiscrollbar work in FF

Browse source
This commit is contained in:
Matthew Hodgson 2015-11-13 02:29:18 +00:00
parent 36b7deac35
commit 2cf0ceb260
2 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/skins/vector/css/organisms/RoomView.css
View file

@ -105,16 +105,14 @@ limitations under the License.
-webkit-flex: 1 1 0; -webkit-flex: 1 1 0;
flex: 1 1 0; flex: 1 1 0;
/* specify width and margin in here rather than the wrapper otherwise gemini-scrollbars gets confused */
min-width: 0px;
max-width: 960px;
width: 100%; width: 100%;
margin: auto;
overflow-y: auto; overflow-y: auto;
} }
.mx_RoomView_messageListWrapper { .mx_RoomView_messageListWrapper {
max-width: 960px;
margin: auto;
} }
.mx_RoomView_MessageList { .mx_RoomView_MessageList {

16
src/skins/vector/css/pages/MatrixChat.css
View file

@ -71,22 +71,13 @@ limitations under the License.
background-color: #eaf5f0; background-color: #eaf5f0;
/*
We can't use flex here as gemini-scrollbars chokes on the width calculation (on FF 42 and Chrome 48)
and you end up with double-scrollbars and an ever-increasing width.
-webkit-flex: 0 0 210px; -webkit-flex: 0 0 210px;
flex: 0 0 210px; flex: 0 0 210px;
*/
width: 210px;
} }
.mx_MatrixChat .mx_LeftPanel.collapsed { .mx_MatrixChat .mx_LeftPanel.collapsed {
/*
-webkit-flex: 0 0 60px; -webkit-flex: 0 0 60px;
flex: 0 0 60px; flex: 0 0 60px;
*/
width: 60px;
} }
.mx_MatrixChat .mx_MatrixChat_middlePanel { .mx_MatrixChat .mx_MatrixChat_middlePanel {
@ -126,18 +117,11 @@ limitations under the License.
-webkit-order: 3; -webkit-order: 3;
order: 3; order: 3;
/* Similarly, specify width explicitly otherwise gemini-scrollbars gets confused
-webkit-flex: 0 0 235px; -webkit-flex: 0 0 235px;
flex: 0 0 235px; flex: 0 0 235px;
*/
width: 235px;
} }
.mx_MatrixChat .mx_RightPanel.collapsed { .mx_MatrixChat .mx_RightPanel.collapsed {
/*
-webkit-flex: 0 0 72px; -webkit-flex: 0 0 72px;
flex: 0 0 72px; flex: 0 0 72px;
*/
width: 72px;
} }