From ba5e7d40138905d4a741a4dc9d8189dc107f2838 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 26 Jan 2017 00:54:00 +0100
Subject: [PATCH 1/3] fix event-encrypting-color in dark theme

---
 src/skins/vector/css/themes/_dark.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/skins/vector/css/themes/_dark.scss b/src/skins/vector/css/themes/_dark.scss
index 51930433ea..f00578cdf6 100644
--- a/src/skins/vector/css/themes/_dark.scss
+++ b/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;
 

From 3c91f90dc9d325bcf2c8e80fb40067f257ed90d3 Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@users.noreply.github.com>
Date: Thu, 26 Jan 2017 09:47:01 +0000
Subject: [PATCH 2/3] Tweak desktop instructions (#3069)

to make it clear you need to do all the things in 'building from
source', including the build-react-sdk dance if you're building
develop.
---
 README.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index e4f043394a..fd6acfd778 100644
--- a/README.md
+++ b/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
-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/`
 

From baed5bec466f8a8a80ed440a8130613c7714033d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 26 Jan 2017 10:18:24 +0000
Subject: [PATCH 3/3] Don't lint the autogenned file

---
 .eslintignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintignore b/.eslintignore
index ea40ba2941..fabbe10497 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1 +1,2 @@
 src/vector/modernizr.js
+src/component-index.js