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

2017-10-13 16:33:55 +01:00 · 2017-10-13 16:33:55 +01:00 · 3b2650e5ea
commit 3b2650e5ea
parent adceda7588 d1476e0cc7
2 changed files with 6 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -152,7 +152,7 @@
  "build": {
    "appId": "im.riot.app",
    "category": "Network",
-    "electronVersion": "1.7.5",
+    "electronVersion": "1.7.9",
    "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
    "asar": false,
    "dereference": true,
--- a/src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss
@ -34,6 +34,11 @@ limitations under the License.
    width: 40%;
 }

+/* Until the button is wired up */
+.mx_MyGroups_joinBox {
+    visibility: hidden;
+}
+
 .mx_MyGroups_joinCreateHeader {
    font-weight: bold;
    margin-bottom: 10px;