Merge branch 'develop' into kegan/rageshake-server

This commit is contained in:
Kegan Dougal 2017-01-26 10:48:40 +00:00
commit 646ace6e59
3 changed files with 13 additions and 12 deletions

View file

@ -1 +1,2 @@
src/vector/modernizr.js
src/component-index.js

View file

@ -113,12 +113,14 @@ pre-built version from https://riot.im/desktop.html or, if you prefer,
built it yourself.
To run as a desktop app:
```
npm install
npm install electron
npm run build
node_modules/.bin/electron .
```
1. Follow the instructions in 'Building From Source' above
2. Install electron and run it:
```
npm install electron
node_modules/.bin/electron .
```
To build packages, use electron-builder. This is configured to output:
* dmg + zip for macOS
@ -141,11 +143,9 @@ npm run build:electron
For other packages, use electron-builder manually. For example, to build a package
for 64 bit Linux:
```
npm install
npm run build
node_modules/.bin/build -l --x64
```
1. Follow the instructions in 'Building From Source' above
2. `node_modules/.bin/build -l --x64`
All electron packages go into `electron/dist/`

View file

@ -83,7 +83,7 @@ $roomsublist-label-bg-color: #454545;
// ********************
// event tile lifecycle
$event-encrypting-color: #abddbc;
$event-encrypting-color: rgba(171, 221, 188, 0.4);
$event-sending-color: #ddd;
$event-notsent-color: #f44;