diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 4aa98553..0a0660f8 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -268,7 +268,7 @@ var RoomSubList = React.createClass({
{ this.props.collapsed ? '' : this.props.label }
);
diff --git a/src/skins/vector/css/molecules/EventTile.css b/src/skins/vector/css/molecules/EventTile.css
index e3956bdb..17d1599e 100644
--- a/src/skins/vector/css/molecules/EventTile.css
+++ b/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;
}
diff --git a/src/skins/vector/css/molecules/RoomHeader.css b/src/skins/vector/css/molecules/RoomHeader.css
index 31d6539a..70d9bf31 100644
--- a/src/skins/vector/css/molecules/RoomHeader.css
+++ b/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;
}
diff --git a/src/skins/vector/css/molecules/SearchBar.css b/src/skins/vector/css/molecules/SearchBar.css
index 3698c852..27096b0e 100644
--- a/src/skins/vector/css/molecules/SearchBar.css
+++ b/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;
}
diff --git a/src/skins/vector/css/molecules/TabCompleteBar.css b/src/skins/vector/css/molecules/TabCompleteBar.css
new file mode 100644
index 00000000..51ac4198
--- /dev/null
+++ b/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;
+}
diff --git a/src/skins/vector/css/molecules/voip/IncomingCallbox.css b/src/skins/vector/css/molecules/voip/IncomingCallbox.css
index 163ec43f..80e49202 100644
--- a/src/skins/vector/css/molecules/voip/IncomingCallbox.css
+++ b/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,
diff --git a/src/skins/vector/css/organisms/RoomView.css b/src/skins/vector/css/organisms/RoomView.css
index 2358bc09..3ec5bbdc 100644
--- a/src/skins/vector/css/organisms/RoomView.css
+++ b/src/skins/vector/css/organisms/RoomView.css
@@ -182,7 +182,7 @@ limitations under the License.
}
.mx_RoomView_inCall .mx_RoomView_statusAreaBox {
- background-color: #76CFA6;
+ background-color: #76CFA6;
color: #fff;
position: relative;
}
@@ -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;
}
diff --git a/src/skins/vector/img/eol.svg b/src/skins/vector/img/eol.svg
new file mode 100644
index 00000000..a331b3e4
--- /dev/null
+++ b/src/skins/vector/img/eol.svg
@@ -0,0 +1,16 @@
+
+