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

Merge remote-tracking branch 'origin/develop' into release-v0.12.7

This commit is contained in:
David Baker 2017-10-13 16:33:55 +01:00
parent adceda7588 d1476e0cc7
commit 3b2650e5ea
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -152,7 +152,7 @@
"build": { "build": {
"appId": "im.riot.app", "appId": "im.riot.app",
"category": "Network", "category": "Network",
"electronVersion": "1.7.5", "electronVersion": "1.7.9",
"//asar=false": "https://github.com/electron-userland/electron-builder/issues/675", "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
"asar": false, "asar": false,
"dereference": true, "dereference": true,

5
src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss
View File

@ -34,6 +34,11 @@ limitations under the License.
width: 40%; width: 40%;
} }
/* Until the button is wired up */
.mx_MyGroups_joinBox {
visibility: hidden;
}
.mx_MyGroups_joinCreateHeader { .mx_MyGroups_joinCreateHeader {
font-weight: bold; font-weight: bold;
margin-bottom: 10px; margin-bottom: 10px;