gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3340 from vector-im/luke/css-rts-fix-welcome-pages-safari 

Height:100% for welcome pages on Safari
This commit is contained in:
Luke Barnard 2017-03-08 17:07:53 +00:00 committed by GitHub
parent 08852c6174 9d96baa613
commit 6a1118218b
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/skins/vector/css/matrix-react-sdk/structures/_MatrixChat.scss
View File

@ -90,16 +90,13 @@ limitations under the License.
*/ */
overflow-x: auto; overflow-x: auto;
/* XXX: Hack: apparently if you try to nest a flex-box
* within a non-flex-box within a flex-box, the height
* of the innermost element gets miscalculated if the
* parents are both auto. Height has to be auto here
* for RoomView to correctly fit when the Toolbar is shown.
* Ideally we'd launch straight into the RoomView at this
* point, but instead we fudge it and make the middlePanel
* flex itself.
*/
display: flex; display: flex;
/* To fix https://github.com/vector-im/riot-web/issues/3298 where Safari
needed height 100% all the way down to the HomePage. Height does not
have to be auto, empirically.
*/
height: 100%;
} }
.mx_MatrixChat .mx_RightPanel { .mx_MatrixChat .mx_RightPanel {

2
src/skins/vector/css/vector-web/structures/_HomePage.scss
View File

@ -18,6 +18,8 @@ limitations under the License.
.mx_HomePage { .mx_HomePage {
max-width: 960px; max-width: 960px;
width: 100%; width: 100%;
height: 100%;
overflow-y: hidden;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }