From 17c81c11015fcbe9062d745fdc06e3f2584b25d4 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sun, 11 Oct 2015 22:51:00 +0100
Subject: [PATCH] icons

---
 src/skins/vector/css/organisms/LeftPanel.css |   5 +++--
 src/skins/vector/css/organisms/RoomView.css  |  16 ++++++++++++++--
 src/skins/vector/img/cancel.png              | Bin 0 -> 1209 bytes
 src/skins/vector/img/fileicon.png            | Bin 0 -> 1193 bytes
 src/skins/vector/views/organisms/RoomView.js |   4 +++-
 5 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 src/skins/vector/img/cancel.png
 create mode 100644 src/skins/vector/img/fileicon.png

diff --git a/src/skins/vector/css/organisms/LeftPanel.css b/src/skins/vector/css/organisms/LeftPanel.css
index 3639464ff8..0e7e077e4b 100644
--- a/src/skins/vector/css/organisms/LeftPanel.css
+++ b/src/skins/vector/css/organisms/LeftPanel.css
@@ -28,8 +28,9 @@ limitations under the License.
 
 .mx_LeftPanel_hideButton {
     position: absolute;
-    top: 18px;
-    right: 8px;
+    top: 10px;
+    right: 0px;
+    padding: 8px;
     cursor: pointer;
 }
 
diff --git a/src/skins/vector/css/organisms/RoomView.css b/src/skins/vector/css/organisms/RoomView.css
index 1bd827bc71..2aab203a4c 100644
--- a/src/skins/vector/css/organisms/RoomView.css
+++ b/src/skins/vector/css/organisms/RoomView.css
@@ -212,7 +212,7 @@ limitations under the License.
 
 .mx_RoomView_uploadProgressOuter {
     width: 100%;
-    background-color: #a9dbf4;
+    background-color: rgba(169, 219, 244, 0.5);
     height: 4px;
 }
 
@@ -226,11 +226,23 @@ limitations under the License.
     margin-left: 56px;
 }
 
+.mx_RoomView_uploadIcon {
+    float: left;
+    margin-top: 6px;
+    margin-left: 5px;
+}
+
+.mx_RoomView_uploadCancel {
+    float: right;
+    margin-top: 6px;
+    margin-right: 10px;
+}
+
 .mx_RoomView_uploadBytes {
     float: right;    
     opacity: 0.5;
     margin-top: 15px;
-    margin-right: 70px;
+    margin-right: 10px;
 }
 
 .mx_RoomView_ongoingConfCallNotification {
diff --git a/src/skins/vector/img/cancel.png b/src/skins/vector/img/cancel.png
new file mode 100644
index 0000000000000000000000000000000000000000..c963a4b7b37a630c1be331c78156614cc0705094
GIT binary patch
literal 1209
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m^Cs(B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuU%v{0TQqR!T
z+}y-mN5ROz&{W^RSl`${*T~q)#K6kLNC66zfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$IMft0d=ry1
z^FV@{U|qhxR-SpqC5d^-sh%#jN<ee;GBZ=GT+PkgjGPP|%`A+Z4GmpQ9o<}woXp&e
zT`Y}FER8HIVR~KilS^|`^GaZPQxJNcaOwpmh};68%`T}$nPsUdZbkXI3Sf_0W#V>=
z1y1vzdQ)(_#S*7peV}9XLD7p8-7q0w8Uiuli5JL$C;!wuV45!iChn>q3c!59sP5_F
z7*cWT&5gZWha7kq9?Y?Ibv)`S5L3f6-_cxM{+g@0{Gp2{m(FgExS(|HhDeK&tA4tl
z$fUK0x5mF$=S&w6th3De@OYsEt5!fG*PkSnm#oc9*FQ>%?-u@5^I}GS<gx3IWaku4
z`~3a4NaF02qn}F{Ze*JEXy;9RoROp5rNA-4V6&pa5r)~#)|+~yzbnn)$&pZSo!(h<
z%(r;X>owJkmL8mQ#4oUFwti;Y=X6PM>Y-YeH7?I~ePK(o;8MQ$Y5MdjPF&x`m!9)F
zCwDex*2hmN0SQ+#b<KQq+P6&F!G2`<qYkF~Pj{|Mj}&3trIx6<gtu|B%cfhp^SJ_B
z=k!Y@-dbB{?ELDv+8LD?w{5TY<Yw%vtaMp@;BK>9{&tZSU|-1}jcs6Lm~~9@g_@Lg
Q9H=nyboFyt=akR{0GueCmH+?%

literal 0
HcmV?d00001

diff --git a/src/skins/vector/img/fileicon.png b/src/skins/vector/img/fileicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..be277a1c8afe9c15815f2c63fc277cf20f66f3d6
GIT binary patch
literal 1193
zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1|)m_?Z^dEk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m^Cs(B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuU%v{0TQqR!T
z+}y-mN5ROz&{W^RSl`${*T~q)#K6kLNC66zfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$IMft0d=ry1
z^FV@{U|qhxR-SpqC5d^-sh%#jN<ee;GBZ=GT+PkgjGPS3%q)zY4GmpQ9o<}woXp&e
zT`Y}FER8HIVR~KilS^|`^GaZPQxJO1aq0ynh};68%`T}$nPsUdZbkXI3Sf_0WnyuQ
zrKPi>k+FfLnYoKGcDF$EreJXkRIejWz4}1M=!2pcDY{`oz%&G6!V@o$15f^`dB8MZ
z1WepozUk%+42<HQE{-7;x03$+|8IXdfz5}fS*FLT;7a3SJ{5)tkHDCyD6b7ZK|z6u
z9X)-i0uLT0E!oZNxM0z;zQ&oXySK3xry18&{GXTj^U_fT_kYXVls)^BCOl@@VJW#W
z(M`>bO<&%g&CIN9gR*_i&u{e?mO84XskL4Bz_H45lG@Cc{_f_9QGH7y^_ERj&Wt(}
zaCoALKD%bA3inpoEw!i9+G?xIk}V$HzrUa7{5(5WYa?UZ+60*wPamKD@c20YoKN+Q
zeKETV7!NnJE?BjQ>0Z;%!`I(8>+|+)OLLR8cy%C<y$|A(C3(pYZ%sYT<KuHCWozI6
zzrVes*;i#}8OH3cnz~4Uai$|zf{d)ZOzDFa%<i%lhh#Yf5*T{bQ?x&Z?~w-;9-gj#
JF6*2UngB0|lp+8C

literal 0
HcmV?d00001

diff --git a/src/skins/vector/views/organisms/RoomView.js b/src/skins/vector/views/organisms/RoomView.js
index f45ed59617..d1556b6586 100644
--- a/src/skins/vector/views/organisms/RoomView.js
+++ b/src/skins/vector/views/organisms/RoomView.js
@@ -154,8 +154,10 @@ module.exports = React.createClass({
                         <div className="mx_RoomView_uploadProgressOuter">
                             <div className="mx_RoomView_uploadProgressInner" style={innerProgressStyle}></div>
                         </div>
+                        <img className="mx_RoomView_uploadIcon" src="img/fileicon.png" width="40" height="40"/>
+                        <img className="mx_RoomView_uploadCancel" src="img/cancel.png" width="40" height="40"/>
                         <div className="mx_RoomView_uploadBytes">
-                        {filesize(this.state.upload.uploadedBytes).replace(/ .*/, '')} / {filesize(this.state.upload.totalBytes)}
+                            {filesize(this.state.upload.uploadedBytes).replace(/ .*/, '')} / {filesize(this.state.upload.totalBytes)}
                         </div>
                         <div className="mx_RoomView_uploadFilename">Uploading {this.state.upload.fileName}</div>
                     </div>