mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-01 10:27:06 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Weblate 2018-04-04 13:59:16 +00:00
commit e4a7dc6998
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -16,5 +16,6 @@ electron/dist
electron/pub electron/pub
**/.idea **/.idea
/config.json /config.json
/config.json.*
/config.local*.json /config.local*.json
/src/component-index.js /src/component-index.js

5
src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
View file

@ -68,16 +68,13 @@ limitations under the License.
.mx_AppTileFullWidth { .mx_AppTileFullWidth {
max-width: 960px; max-width: 960px;
width: 100%; width: 100%;
height: 100%;
margin: 0; margin: 0;
padding: 0; padding: 0;
border: 1px solid $primary-hairline-color; border: 1px solid $primary-hairline-color;
border-radius: 2px; border-radius: 2px;
} }
.mx_AppTile, .mx_AppTileFullWidth {
margin-top: 3px;
}
.mx_AppTileMenuBar { .mx_AppTileMenuBar {
margin: 0; margin: 0;
padding: 2px 10px; padding: 2px 10px;