Merge remote-tracking branch 'origin/develop' into notif_sync

src/components/structures/RoomSubList.js

@@ -268,7 +268,7 @@ var RoomSubList = React.createClass({
             <h2 onClick={ this.onClick } className="mx_RoomSubList_label">
                 { this.props.collapsed ? '' : this.props.label }
                 <img className="mx_RoomSubList_chevron"
-                    src={ this.state.hidden ? "img/list-open.svg" : "img/list-close.svg" }
+                    src={ this.state.hidden ? "img/list-close.svg" : "img/list-open.svg" }
                     width="10" height="10" />
             </h2>
         );

src/skins/vector/css/molecules/EventTile.css

@@ -106,6 +106,11 @@ limitations under the License.
     padding: 4px;
 }
 
+.mx_MessageTile_searchHighlight a {
+    background-color: #76cfa6;
+    color: #fff;    
+}
+
 .mx_EventTile_sending {
     color: #ddd;
 }

src/skins/vector/css/molecules/RoomHeader.css

@@ -118,7 +118,6 @@ limitations under the License.
 .mx_RoomHeader_searchStatus {
     display: inline-block;
     font-weight: normal;
-    overflow-y: hidden;
     opacity: 0.6;
 }
 

src/skins/vector/css/molecules/SearchBar.css

@@ -18,7 +18,9 @@ limitations under the License.
     padding-top: 5px;
     padding-bottom: 5px;
     display: flex;
+    display: -webkit-flex;
     align-items: center;
+    -webkit-align-items: center;
 }
 
 .mx_SearchBar_input {
@@ -30,6 +32,7 @@ limitations under the License.
     padding-left: 11px;
     width: auto;
     flex: 1 1 0;
+    -webkit-flex: 1 1 0;
 }
 
 .mx_SearchBar_searchButton {
@@ -43,12 +46,12 @@ limitations under the License.
 
 @keyframes pulsate {
     0% { opacity: 1.0; }
-    50% { opacity: 0.25; }
+    50% { opacity: 0.1; }
     100% { opacity: 1.0; }
 }
 
 .mx_SearchBar_searching img {
-    animation: pulsate 0.75s ease-out;
+    animation: pulsate 0.5s ease-out;
     animation-iteration-count: infinite; 
 }
 

src/skins/vector/css/molecules/TabCompleteBar.css

@@ -0,0 +1,35 @@
+/*
+Copyright 2015 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_TabCompleteBar {
+    overflow: hidden;
+}
+
+.mx_TabCompleteBar_item {
+    display: inline-block;
+    margin-right: 15px;
+}
+
+.mx_TabCompleteBar_item img {
+    border-radius: 24px;
+    margin-right: 8px;
+    vertical-align: middle;
+}
+
+.mx_TabCompleteBar_text {
+    color: #4a4a4a;
+    opacity: 0.5;
+}

src/skins/vector/css/molecules/voip/IncomingCallbox.css

@@ -41,12 +41,14 @@ limitations under the License.
 
 .mx_IncomingCallBox_buttons {
     display: flex;
+    display: -webkit-flex;
 }
 
 .mx_IncomingCallBox_buttons_cell {
     vertical-align: middle;
     padding: 6px;
     flex: 1;
+    -webkit-flex: 1;
 }
 
 .mx_IncomingCallBox_buttons_decline,

src/skins/vector/css/organisms/RoomView.css

@@ -249,6 +249,12 @@ limitations under the License.
     cursor: pointer;
 }
 
+.mx_RoomView_tabCompleteBar {
+    margin-top: 5px;
+    margin-left: 65px;
+    color: #4a4a4a;
+}
+
 .mx_RoomView_typingBar {
     margin-top: 6px;
     margin-left: 65px;
@@ -256,18 +262,46 @@ limitations under the License.
     opacity: 0.5;
 }
 
+.mx_RoomView_tabCompleteImage,
 .mx_RoomView_typingImage {
     display: inline;
-    margin-left: -47px;
+    margin-left: -50px;
     margin-top: -4px;
     float: left;
 }
 
+.mx_RoomView_tabCompleteImage {
+    opacity: 0.5;    
+}
+
 .mx_RoomView_typingText {
     overflow-y: hidden;
     display: block;
 }
 
+.mx_RoomView_tabCompleteWrapper {
+    display: flex;
+    display: -webkit-flex;
+    height: 24px;
+}
+
+.mx_RoomView_tabCompleteWrapper .mx_TabCompleteBar {
+    flex: 1 1 auto;
+    -webkit-flex: 1 1 auto;
+}
+
+.mx_RoomView_tabCompleteEol {
+    flex: 0 0 auto;
+    -webkit-flex: 0 0 auto;
+    color: #76CFA6;
+}
+
+.mx_RoomView_tabCompleteEol img {
+    vertical-align: middle;
+    margin-right: 8px;
+    margin-top: -2px;
+}
+
 .mx_RoomView .mx_MessageComposer {
     -webkit-box-ordinal-group: 5;
     -moz-box-ordinal-group: 5;
@@ -276,8 +310,8 @@ limitations under the License.
     order: 5;
 
     width: 100%;
-    -webkit-flex: 0;
-    flex: 0;
+    -webkit-flex: 0 0 auto;
+    flex: 0 0 auto;
     margin-right: 2px;
 }
 

src/skins/vector/img/eol.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="22px" height="16px" viewBox="-1 -1 22 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: sketchtool 3.4 (381) - http://www.bohemiancoding.com/sketch -->
+    <title>icon_eol</title>
+    <desc>Created with sketchtool.</desc>
+    <defs></defs>
+    <g id="03-Input" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="03_2-Mentions-autocomplete" sketch:type="MSArtboardGroup" transform="translate(-772.000000, -670.000000)">
+            <g id="icon_eol" sketch:type="MSLayerGroup" transform="translate(772.000000, 670.000000)">
+                <path d="M0,7.5 L17,7.5" id="Path-118" stroke="#76CFA6" sketch:type="MSShapeGroup"></path>
+                <path d="M13,2 L18,7.38056399 L13,12.761128" id="Path-119" stroke="#76CFA6" sketch:type="MSShapeGroup"></path>
+                <path d="M19.5,0 L19.5,14" id="Path-120" stroke="#80CEF4" sketch:type="MSShapeGroup"></path>
+            </g>
+        </g>
+    </g>
+</svg>