From 2c84cb6702ca3c1816665902b52f3924cf2fb648 Mon Sep 17 00:00:00 2001 From: Richard Lewis Date: Tue, 3 Apr 2018 15:24:46 +0100 Subject: [PATCH 1/2] Ignore local config files. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 46d294ecf7..14030632ca 100644 --- a/.gitignore +++ b/.gitignore @@ -16,5 +16,6 @@ electron/dist electron/pub **/.idea /config.json +/config.json.* /config.local*.json /src/component-index.js From 0296919dfbfdb828764614da61879ddc0cd88c39 Mon Sep 17 00:00:00 2001 From: Richard Lewis Date: Wed, 4 Apr 2018 13:48:33 +0100 Subject: [PATCH 2/2] Remove top margin --- .../vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss index e22207676f..0cf3e7b9cb 100644 --- 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;