From 9b384e52b57792382b91d5629798096ef2234fa7 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 15 Jul 2015 04:16:38 +0100 Subject: [PATCH] implement latest skin --- skins/base/css/molecules/MemberTile.css | 2 +- skins/base/css/molecules/MessageComposer.css | 40 +++++++---- skins/base/css/molecules/MessageTile.css | 2 +- skins/base/css/molecules/RoomHeader.css | 65 +++++++++++++++--- skins/base/css/molecules/RoomTile.css | 13 ++-- skins/base/css/organisms/LeftPanel.css | 8 ++- skins/base/css/organisms/MemberList.css | 3 +- skins/base/css/organisms/RightPanel.css | 24 +++++-- skins/base/css/organisms/RoomView.css | 14 ++-- skins/base/css/pages/MatrixChat.css | 3 +- skins/base/img/file.png | Bin 308 -> 441 bytes skins/base/img/hide.png | Bin 341 -> 415 bytes skins/base/img/members.png | Bin 910 -> 998 bytes skins/base/img/search.png | Bin 651 -> 694 bytes skins/base/img/video.png | Bin 471 -> 624 bytes skins/base/img/voip.png | Bin 541 -> 636 bytes skins/base/views/molecules/DirectoryMenu.js | 15 ++-- skins/base/views/molecules/MessageComposer.js | 7 +- skins/base/views/molecules/MessageTile.js | 5 +- skins/base/views/molecules/RoomCreate.js | 2 +- skins/base/views/molecules/RoomHeader.js | 16 +++-- skins/base/views/molecules/RoomTile.js | 2 +- skins/base/views/organisms/LeftPanel.js | 1 - skins/base/views/organisms/RightPanel.js | 10 ++- skins/base/views/organisms/RoomView.js | 3 +- src/controllers/molecules/MessageComposer.js | 2 +- src/controllers/organisms/RoomView.js | 6 +- 27 files changed, 172 insertions(+), 71 deletions(-) diff --git a/skins/base/css/molecules/MemberTile.css b/skins/base/css/molecules/MemberTile.css index 6c5844486..1e3825602 100644 --- a/skins/base/css/molecules/MemberTile.css +++ b/skins/base/css/molecules/MemberTile.css @@ -30,7 +30,7 @@ limitations under the License. } .mx_MemberTile_avatar img { - border-radius: 16px; + border-radius: 20px; background-color: #dbdbdb; } diff --git a/skins/base/css/molecules/MessageComposer.css b/skins/base/css/molecules/MessageComposer.css index 1b0e4d750..f4e071dd8 100644 --- a/skins/base/css/molecules/MessageComposer.css +++ b/skins/base/css/molecules/MessageComposer.css @@ -19,9 +19,9 @@ limitations under the License. height: 50px; vertical-align: middle; margin: auto; - border-top: 1px solid #d8d8d8; - border-left: 1px solid #d8d8d8; - border-right: 1px solid #d8d8d8; + background-color: #fff; + border-radius: 25px; + border: 1px solid #e1e1e1; } .mx_MessageComposer_row { @@ -32,32 +32,44 @@ limitations under the License. .mx_MessageComposer .mx_MessageComposer_avatar { display: table-cell; - padding-left: 12px; - padding-right: 12px; - padding-top: 3px; - padding-bottom: 3px; - vertical-align: middle; - width: 32px; - height: 32px; + padding-left: 5px; + padding-right: 10px; + height: 50px; +} + +.mx_MessageComposer .mx_MessageComposer_avatar img { + margin-top: 5px; + border-radius: 20px; + background-color: #bdbdbd; } .mx_MessageComposer_input { display: table-cell; width: 100%; - padding-right: 1em; vertical-align: middle; + height: 50px; } .mx_MessageComposer_input textarea { font-size: 15px; width: 100%; height: 1em; + padding-top: 0.7em; + padding-bottom: 0.7em; border: 0px; resize: none; outline: none; - padding-top: 0.7em; - padding-bottom: 0.7em; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; -} \ No newline at end of file +} + +.mx_MessageComposer_upload { + display: table-cell; + vertical-align: middle; + padding-right: 15px; +} + +.mx_MessageComposer_upload img { + margin-top: 5px; +} diff --git a/skins/base/css/molecules/MessageTile.css b/skins/base/css/molecules/MessageTile.css index 82bfad059..fb5edb73b 100644 --- a/skins/base/css/molecules/MessageTile.css +++ b/skins/base/css/molecules/MessageTile.css @@ -31,7 +31,7 @@ limitations under the License. .mx_MessageTile_avatar img { background-color: #dbdbdb; - border-radius: 16px; + border-radius: 20px; border: 0px; } diff --git a/skins/base/css/molecules/RoomHeader.css b/skins/base/css/molecules/RoomHeader.css index a2f107f04..35e97a636 100644 --- a/skins/base/css/molecules/RoomHeader.css +++ b/skins/base/css/molecules/RoomHeader.css @@ -20,42 +20,85 @@ limitations under the License. .mx_RoomHeader_wrapper { max-width: 720px; margin: auto; - height: 50px; + height: 86px; + margin-top: 18px; + + display: -webkit-box; + display: -moz-box; + display: -ms-flexbox; + display: -webkit-flex; + display: flex; } .mx_RoomHeader_leftRow { display: table-row; margin-left: 12px; - height: 50px; - float: left; + height: 48px; + + -webkit-box-ordinal-group: 1; + -moz-box-ordinal-group: 1; + -ms-flex-order: 1; + -webkit-order: 1; + order: 1; } .mx_RoomHeader_rightRow { display: table-row; - height: 50px; - margin-right: -26px; - float: right; + height: 48px; + background-color: #fff; + border-radius: 48px; + border: 1px solid #e1e1e1; + + -webkit-box-ordinal-group: 2; + -moz-box-ordinal-group: 2; + -ms-flex-order: 2; + -webkit-order: 2; + order: 2; + + -webkit-flex: 0 0 200px; + flex: 0 0 200px; +} + +.mx_RoomHeader_info { + display: table-cell; + height: 48px; + vertical-align: middle; } .mx_RoomHeader_name { - display: table-cell; vertical-align: middle; - height: 50px; + height: 28px; + color: #80cef4; font-weight: 400; - font-size: 20px; + font-size: 18px; padding-left: 16px; padding-right: 16px; } +.mx_RoomHeader_topic { + vertical-align: bottom; + float: left; + max-height: 38px; + color: #80cef4; + padding-left: 16px; + padding-right: 16px; + overflow: scroll; +} + .mx_RoomHeader_avatar { display: table-cell; height: 50px; vertical-align: middle; } +.mx_RoomHeader_avatar img { + border-radius: 24px; +} + .mx_RoomHeader_button { - height: 50px; + height: 48px; display: table-cell; vertical-align: middle; - padding-right: 16px; + padding-left: 8px; + padding-right: 8px; } \ No newline at end of file diff --git a/skins/base/css/molecules/RoomTile.css b/skins/base/css/molecules/RoomTile.css index 685755512..26da6ea92 100644 --- a/skins/base/css/molecules/RoomTile.css +++ b/skins/base/css/molecules/RoomTile.css @@ -34,7 +34,7 @@ limitations under the License. } .mx_RoomTile_avatar img { - border-radius: 16px; + border-radius: 20px; background-color: #dbdbdb; } @@ -47,15 +47,14 @@ limitations under the License. .mx_RoomTile_badge { float: right; - background-color: #d8d8d8; - color: #747474; + background-color: #80cef4; + color: #fff; border-radius: 10px; font-weight: 400; font-size: 14px; - line-height: 22px; - width: 34px; - height: 20px; - vertical-align: top; + line-height: 28px; + width: 26px; + height: 26px; text-align: center; } diff --git a/skins/base/css/organisms/LeftPanel.css b/skins/base/css/organisms/LeftPanel.css index 36bc5933c..70a4b6f77 100644 --- a/skins/base/css/organisms/LeftPanel.css +++ b/skins/base/css/organisms/LeftPanel.css @@ -49,6 +49,7 @@ limitations under the License. overflow-y: scroll; } +/* .mx_LeftPanel .mx_RoomCreate { -webkit-box-ordinal-group: 2; -moz-box-ordinal-group: 2; @@ -69,6 +70,7 @@ limitations under the License. width: 100%; height: 46px; } +*/ .mx_LeftPanel .mx_DirectoryMenu { -webkit-box-ordinal-group: 3; @@ -77,12 +79,14 @@ limitations under the License. -webkit-order: 3; order: 3; - min-height: 150px; + -webkit-flex: 0 0 170px; + flex: 0 0 170px; + padding-left: 16px; padding-right: 16px; } .mx_LeftPanel .mx_DirectoryMenu .mx_DirectoryMenu_options { - margin-top: -12px; + margin-top: 12px; width: 100%; } \ No newline at end of file diff --git a/skins/base/css/organisms/MemberList.css b/skins/base/css/organisms/MemberList.css index b2cc01375..f0ededa1a 100644 --- a/skins/base/css/organisms/MemberList.css +++ b/skins/base/css/organisms/MemberList.css @@ -22,7 +22,7 @@ limitations under the License. .mx_MemberList_chevron { position: absolute; - right: 20px; + right: 35px; margin-top: -13px; } @@ -33,6 +33,7 @@ limitations under the License. max-height: 75%; border-radius: 8px; padding: 20px 14px 14px 24px; + background-color: #fff; } .mx_MemberList_wrapper { diff --git a/skins/base/css/organisms/RightPanel.css b/skins/base/css/organisms/RightPanel.css index 52d7077a6..11f425b82 100644 --- a/skins/base/css/organisms/RightPanel.css +++ b/skins/base/css/organisms/RightPanel.css @@ -33,18 +33,28 @@ limitations under the License. -webkit-order: 1; order: 1; - -webkit-flex: 0 0 50px; - flex: 0 0 50px; + -webkit-flex: 0 0 66px; + flex: 0 0 66px; +} - text-align: right; +/** Fixme - factor this out with the main header **/ - height: 50px; - border-bottom: 1px solid #d8d8d8; +.mx_RightPanel_headerButtonGroup { + margin-top: 18px; + height: 48px; + float: right; + background-color: #fff; + border-radius: 48px; + border: 1px solid #e1e1e1; + margin-right: 22px; } .mx_RightPanel_headerButton { - margin-top: 9px; - margin-right: 16px; + height: 48px; + display: table-cell; + vertical-align: middle; + padding-left: 8px; + padding-right: 8px; } .mx_RightPanel .mx_MemberList { diff --git a/skins/base/css/organisms/RoomView.css b/skins/base/css/organisms/RoomView.css index 2069f1647..298a54b04 100644 --- a/skins/base/css/organisms/RoomView.css +++ b/skins/base/css/organisms/RoomView.css @@ -35,9 +35,8 @@ limitations under the License. -webkit-order: 1; order: 1; - -webkit-flex: 0 0 50px; - flex: 0 0 50px; - border-bottom: 1px solid #d8d8d8; + -webkit-flex: 0 0 86px; + flex: 0 0 86px; } .mx_RoomView_auxPanel { @@ -47,7 +46,10 @@ limitations under the License. -webkit-order: 2; order: 2; + max-width: 720px; width: 100%; + margin: auto; + border-top: 1px solid #a8dbf3; height: 0%; } @@ -86,7 +88,7 @@ limitations under the License. order: 4; width: 100%; - -webkit-flex: 0 0 50px; - flex: 0 0 50px; - /* background-color: #ff0; */ + -webkit-flex: 0 0 63px; + flex: 0 0 63px; + margin-left: 3px; } diff --git a/skins/base/css/pages/MatrixChat.css b/skins/base/css/pages/MatrixChat.css index 7f7f12643..5ff442cf2 100644 --- a/skins/base/css/pages/MatrixChat.css +++ b/skins/base/css/pages/MatrixChat.css @@ -45,7 +45,7 @@ limitations under the License. -webkit-order: 2; order: 2; - /* background-color: #00f; */ + background-color: #f3f8fa; width: 100%; height: 100%; } @@ -57,6 +57,7 @@ limitations under the License. -webkit-order: 3; order: 3; + background-color: #f3f8fa; -webkit-flex: 0 0 230px; flex: 0 0 230px; height: 100%; diff --git a/skins/base/img/file.png b/skins/base/img/file.png index 2ea4f280f52336c7ac2a9c6892aac42a48cb306a..26a644ccfb204fb55eb206cd90d7649fe89967db 100644 GIT binary patch delta 378 zcmV-=0fqjw0=WZ_NPhuaNkl+OpQxYCgX=vp)=gTsA|Fn{$9)`1S7j zU7jo#We!Ro1bKFk%vCq^4gUxrfo{(ae9nEK1av=&-j?xTynnc^%}_0p=n~@V&ic%B zaS{Xu!uW`>I{>8Cmi%|W(+Uke)?=s&bp0$!E<0ghDAlnOfT_aY93v{%p;}a_Oc?!y zfs|oy9^~06L-N6c@m$m4H?`<#vJAad#!81t9 Y0Og2!*>t*so&W#<07*qoM6N<$f-ADPN&o-= delta 244 zcmVVE6adfz!B|sM+qjGaSkO2E6EK901tYKu zaRp~ECSW+q%bj`%XLbDY6L=6lKLF?4fo%p%DZvl}CYJeE14S&V zl&Y%gHM4EoJkQ?f`#u%$HM*|rXWkp*IR4-Sl+xY2wf2@fxaFZ`AOjirJK(I@X{~*` u4_wH1(`!J}G}AO)+N__F|E3Y~6kq`UQ)>j1{xbLg0000Y5QcZ|ZZDS@{6H~8hzWkAGS~%4g9#Q)yx7dG6)bumX#Q`^IBkpkNSX#atJ(DhP9GIo+ZUSAELmB^WBSu*H-S(L8=ppVh>iADk0WvACqhBB2$cd!o5@Z#+03nl5RMLxvwWw`du^XUL1WV5I+;JSw^LUrc z5mRU{RDn09(u=0?dfIhenx^Zzel4b-g2ygN5@$+eOI7TV`<_^>^Qvv=K c@DgAE-GM6u`VSQb^#A|>07*qoM6N<$f_Hs|_5c6? diff --git a/skins/base/img/members.png b/skins/base/img/members.png index 9c35bcdf1139996898c60149d7a8faf1edcf9840..cc572c0b03729ed1fe8a685bae110b0975274d42 100644 GIT binary patch delta 939 zcmV;c162Hu2j&NmNq>k*L_t(|+U!usA-^SBOt9nNK^<;JPyz! zR|H&vf5Hzy0tvy53vlPeLn=Z7galMbeFUn$P!cGVCb8or_CA;t6x_|a6r^&($MMX3 zvoqg*vxsx9Z0Dyc+x%@ifc9Gt!uWzs^A%cjneB6zDsilsI)6&X)tsdcCpAq)n}nlH zX23XqyGkZXKBOD9@Susi3^j_CI_0*!sN~d$~duomR;)t<|4nea5a>>lb8r z_KCdu>Rrf22Y(Xy_W%`--_E<^>BylSKPOaj>7BVo&eBG^ac=}WKAW@It1tf9LE~W0 zPoH<+$iqVOQZCjloP%%tC}THg+=*hdZDEXEpRPUs>PfPxpw2lIlSZgxqwUi{O zxLWlB?M4VS=?g=k7trt4gi(H_IOhC+7kPv&SBx)m~j_uJ``x}9ut46vujf>C}^=p+q(I<=s^ZO zu;WCz1|__mZ|v*B2^~$YlB&;PmmTQQGNvlb69Pd8r^;k{jY2}ucFNG4O)lr6K~MQU zxPO&*!E1cCv9}9jgf?H=kl|yEJ^0uJ<+zfI342Y_N6SDLvJs#RD908b9rHGI3BQ<) zc5cnkoebx=x6pvDpH3T@@SO}(eOT~d{^zoh?yc|S_B>v%l4m87(1F2t$i$|B;_J7) z>ait<{diTJOzC5P@u~=a7jeKy>L?XQz$EwKB>ww%(f_yUzXA9zzyNLAB?Y+7;tBu& N002ovPDHLkV1j!c%|QSF delta 850 zcmV-Y1Fih#2aX4jNq;a&L_t(|+U%A~OX@)w#`{~Tm05v{qzh#(Ea^g!fo-dW(YAHe zzCJ+vHbG#!Hqu83M5JsJgbRZfmK9y0i`3?HrARB!4+YOS|FKSRI&k33@|}5~XXd>; z?`WA!rsO-9q2!y_zfVy1>513Z*Q2AOL?Us1etv&{|Mc`!S$|n+wOX5+n%r);)9EZL z`v^q)AjxlUZ=0K&tE;QPf#q;GYHDgghvV+MsRa;v$V9t z?M6mMfG&0kXhNY7uN)sAudA#3T>_#J2n4)d@8IB|rfFEX^2Wx-@$vD)!$UXf!%8F+touC*bZ23k##8qrJVoIm_kc<>KNZQR?jMwApNg<>24| zzOk{fo}QlEnXRp@U@$l}H6_0zQ@D8S{QNv|&s*N#-{5*%Ab*cUB4jle_k6_a>+6+8(%9I@ z?yqob8onTaqb8u~@N+>uyK0Yc5u(K-}L7+d> z1Q!<<`jV%u%x1Haz+^H#KR@epL)z2?JegjV9Mb7DK*b2ym5d;WAvH*st*WY$92y!L zuCA{1H-BYOsrt?W0UR{}I->`oZ`<43=>y45!f26}mKMnl0yt^{GIo1=tG{V~fB)Xz zo@CtL-&blJ2x8_72zW2zr6*`@ZT*p5V#jQ6Z+CQbDCJL#n?b6u-Q8WiPkDJcx=+N# z=%YC_p#CrjVyzbtfWiZnk1!gIVt=BkwY9a%>wkj)j+y`^85$Z2hr?tqXSu$<$kP+uGX1VoxTMv$L}(=-Js>&WIPj%pY;a$#TsUL#rv9>gsC78B){L)z#hI4Whwd zkYpI>cy^I$w4I(n#!+lB^Xhrv_xtHyMuN-bDmDv6rqk2Y<>h7iYkGQGng@zs1t%sa zCreYQ6mv$pb+LuIkrll3Q}dIVO#S$LzCS;c^Z8(Upzk05DyR#O$MfZ1#ozcB{r{V0 c*G~Zk0M~sfGW4*&p8x;=07*qoM6N<$f*F&t^8f$< diff --git a/skins/base/img/search.png b/skins/base/img/search.png index f67ba892e9e01eeab9745ae0a4ce4189a355512a..2cbfeb200f191ccb2615066c5df2acccda7c58d5 100644 GIT binary patch delta 632 zcmV-;0*C#J1-1o{Nq<;LL_t(|+U%A~Yg0iK$7klweWdl?BrQpVwnA?zf>Ly$f9wrkP1m{Eu@d+Cgjokn1?47g|wQ?t?5QRtGk#xzd1Ai zbN&ZQDbZO5{;L69hSoe*YDP6*c9=9Zl+;Py(dN^7Hi7>LAb+GR?nX;{(VRmrr}Xm) zGET8Cq!-AIrdX**vo^UqWu4Pc1qir&SqYewi!co*wH7^I?KI#x1LHWqxXYMC4=xx454q*}33@9_A=kmnNdK$K;$FBo zV-4N?d)&_I41b|@kEsGcGkJ$hTFMH+cpvZV#)lXqiuHuJcJUU9w1O; zEP$cmq=6fO8lV-4F^c2Xs!ef=aV3DIp-{wb20lliIVC{SAYKrU07~~lkur!9V9utc zCXWU9+7aVAaTEbp(%MR$g*--o{jeWhOH);u<`M+D*nhh!Q`~*4%{SZpdPW%lac9c> zf=Mjb7!xwKA2dSos@Jj6 zLQaQTHGZ5C7VmV#`~7gME$>YmuzRH?T$?;{P5K+94stZ;VjmB}?XFB2*rw=^V*rEm zT%DjdGI0hJ4V?X1IViU{FbZyhl2dsy^cg6QHj_|I&=r#XiacWY)piB&8V6GH%K8mkk zsw9yQU}$m`$-qknNKp(GCgh#_>#Ey1t{(fj=bUc0?ixPq_1k-`|N8H(xL&U>Um41m zFOGj7@J-^k&1Tc-bo%}Nd_G^V*BXt+Xf!&VPM^!b_IkZG zn@z9RZ@1gUVlfyDTCJAD;fO>ceEbu@ZnrBG3diFy7K>RdmfzRx_xnnv((QJW$)w$G ze?qvvkMsGQ$z)2U(&==%N=CcgPNh=I^&Zjt5hoKozaP4FvwYDsEDps zt5quVH2W<=p??s&>GgV|05s!rxgOU2@nWSi91b@c4N(A!L^HBv?(ukLvl+S&0-*Qj zs(2r-udgPP3Hb^Em?oW0CwEqv1{Mkdm{q1pE`a)Q4j}+eAaU4-!OXM7Y&Hu4@EM#y z7GOG^QdNV&AOv7`@EM#y98j;<{eHiwOz}uu44)CqK7W}^#^Z4y5Rh>n;E}i(6ZbSb zE|kybqtU2VtCayjb9iLAT*j1Wpv2zO=`_~TY&LNV+4sR}wYoVrPQa}GQXxp@wpOcA z8TL;0(P)G;5{ZObt(F0}1ullqkdayCWau45q8YkM-Kh*a$mMd<48_xD%PlXn$~n;c zog$wy6hq$qgX6T-N_$`!{Lz4W{1P!+mDL>Z_~dH b_#wam`@r0fWCuc}00000NkvXXu0mjfCNv}# diff --git a/skins/base/img/video.png b/skins/base/img/video.png index d83640a4ff69ce9505bf4320404a5296962ee2ee..74a1583cd529d261de4f4b5f5234d0002ec2262c 100644 GIT binary patch delta 563 zcmV-30?hr_1MmcpNPhwnNkl&=i{$`yPy4h`1$|W zKcJY0$37zi<9{%Z5he&^aI-MV^D??hvGcRxb0s4@6#-43ee;Kf7>m9T3ok2SpMC!Q z|KhvfCtm$cRmW!s!h$sqzDshlSc|ig6aq(H{(AZSU$6oP;eR*)hK!yNGpRwWC&cpL z^FK7fZI6F7o&Wm#-+vSfzWn)5Ovs=CK31l$e^5kDy!!Lt3n&hm(0sti$Vhpbx&Gnz z(U-rXl{uLh7}0}>>@wp&EV(`X`gijqpy|LkXM~wg4Ie@%w;*>{P_b!T?O2`=9^1^YIT- zfK$l_5UoP&Oc6@#>mL4m@$E0J`hbE!0s|Rt7GF8`Wq?Cy_$pj-vYYY5|jwa3MGe@Jyauu1@GL>93WV^!b*x%)3# zeemhmzgf@-Gb3(%cuo|(*l410|4q_)}2aafg46+RaRE^@$up3=f|h+KMZ{M@S(A>ao@guKx_UJ0f5SYih){y8u2JYSg>Tt z5}=0vBm$rophi3j5ODwu8DnE(QiB+%1*j2CaQ*uArKP36et-Q!iDY27^YQVKY5`CS zT7(@uco1SG6B85lQ_P*YQLb#f;{ zLgvkz2P|K)q#|JX{^`>vQi~&?7NABr7noSzzkfex&YXY${-OH-SbLm3dzMsJ1GNA( zB8%AB*+E30cF?-QVMK0t(W1&^9BtW+T0k)X2rvLnQxcl4WS-pL00000NkvXXu0mjf DG780E diff --git a/skins/base/img/voip.png b/skins/base/img/voip.png index 95f57411528d2cfad7186c8570c97a012c540917..4fd14ee4bc587235fc92c5bdbad67d0f792f77c2 100644 GIT binary patch delta 575 zcmV-F0>J&91pEY$NPhwzNkl z^Q1*Cx8(I<((_5{zqMpi048;?(DO;_J2G*b2KN8}Bn1Ej!99{Z12w2gezxUA%0?@8$J*N@oUoN?IV*X&psER31ODxVoKZfDIm`|j=; z_oeDC54Cg3Uhg}1vgXVPDOUKx7>&sX?+(22G+vpab$?H89J8t;SeI}nZM-~@%3AQg z>epQPXx54e&=KnGfv1`4L7viISDr7F=A4=*AJ1AT0`VD58|c`-oN)b7g&{~ASW`{8 zEk8Bb{HURcGk8!S;#G0x%bioMIeE7!Ze~c{CbzDV42^Izs6OTC*LGj_13z2(27pLA zFwx=FA2>ZkD)Os6S5LC)Ze@L@WK#IT%O>z-F8vn({^{HF{|ERXzyL=2p1SdM!aD!} N002ovPDHLkV1mko8B_oO delta 479 zcmV<50U-YT1f2wsNPhvpNkl3-sVltUjDwXYadxZl54)*bOLeKFFg@VK3xWa(|2m5M~7mGzG6uL_R z2m7kQe!ssx{^b&2|N3|Es|GB~>df*$`KiH625OtK+wHsE?ydkh*o*RM1A-uq$73K6 zn9t{T1;D{V1AnCvgJ3W?o6XQKo6Y9!C4c}23k{S;3}~80PY#E}$z-xts|kXDMhzTK ztbqUr+itg^G&m0$jfU6j&1SPd4V+G=BS})RSTtyWURJNyJswX!pGV&B6r5VE7P6O0 zCAHKBC)(+B>h*e~(I_5|qdz;H&dp|n@(zbXilWl#^jL!m>m8X0S(bU8UoMy9@i-cd z`u+Y`EarB*wRb8{2E#B<=|8>bJ^w}3Y87vex?Zo>E|*JP -

Directory

- (+) +
-
Users
+
Create Room
- (+) +
-
Rooms
+
Directory
+
+
+
+ +
+
Settings
diff --git a/skins/base/views/molecules/MessageComposer.js b/skins/base/views/molecules/MessageComposer.js index 7cecb79c2..4f033e99e 100644 --- a/skins/base/views/molecules/MessageComposer.js +++ b/skins/base/views/molecules/MessageComposer.js @@ -18,6 +18,7 @@ limitations under the License. var React = require('react'); +var MatrixClientPeg = require("../../../../src/MatrixClientPeg"); var MessageComposerController = require("../../../../src/controllers/molecules/MessageComposer"); module.exports = React.createClass({ @@ -25,16 +26,20 @@ module.exports = React.createClass({ mixins: [MessageComposerController], render: function() { + var me = this.props.room.getMember(MatrixClientPeg.get().credentials.userId); return (
- (+) +