Merge remote-tracking branch 'origin/develop' into develop

2018-04-04 13:59:16 +00:00 · 2018-04-04 13:59:16 +00:00 · e4a7dc6998
parent 7f82cecf6c d95db207bf
commit e4a7dc6998
2 changed files with 2 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -16,5 +16,6 @@ electron/dist
 electron/pub
 **/.idea
 /config.json
+/config.json.*
 /config.local*.json
 /src/component-index.js
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
@ -68,16 +68,13 @@ limitations under the License.
 .mx_AppTileFullWidth {
    max-width: 960px;
    width: 100%;
+    height: 100%;
    margin: 0;
    padding: 0;
    border: 1px solid $primary-hairline-color;
    border-radius: 2px;
 }

-.mx_AppTile, .mx_AppTileFullWidth {
-    margin-top: 3px;
-}
-
 .mx_AppTileMenuBar {
    margin: 0;
    padding: 2px 10px;