Merge branch 'develop' into kegan/rageshake-server

.eslintignore

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

README.md

@@ -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
+1. Follow the instructions in 'Building From Source' above
-npm install electron
+2. Install electron and run it:
-npm run build
+
-node_modules/.bin/electron .
+   ```
-```
+   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
+ 1. Follow the instructions in 'Building From Source' above
-npm run build
+ 2. `node_modules/.bin/build -l --x64`
-node_modules/.bin/build -l --x64
-```
 
 All electron packages go into `electron/dist/`
 

src/skins/vector/css/themes/_dark.scss

@@ -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;