Merge branch 'master' into reactsdk-unfork

This commit is contained in:
David Baker 2015-09-28 11:32:40 +01:00
commit 91c0df4450
4 changed files with 4 additions and 55 deletions

View file

@ -34,15 +34,6 @@ h2 {
margin-bottom: 16px;
}
/* FIXME: show them on hoverover, and fix for firefox */
::-webkit-scrollbar {
display: none;
}
html {
overflow: -moz-scrollbars-none;
}
.mx_ContextualMenu_background {
position: fixed;
top: 0;
@ -153,4 +144,4 @@ html {
font-weight: bold;
font-size: 20px;
line-height: 1.4;
}
}