Merge branch 'develop' into kegan/controller-merging4

src/skins/vector/css/atoms/MemberAvatar.css

@@ -15,8 +15,7 @@ limitations under the License.
 */
 
 .mx_MemberAvatar {
-    /* commenting this out as it breaks on FF seemingly */
-/*    position: relative; */
+    position: relative; 
 }
 
 .mx_MemberAvatar_initial {

src/skins/vector/css/common.css

@@ -22,7 +22,12 @@ html {
 }
 
 body {
-    font-family: 'Myriad Pro', Helvetica, Arial, Sans-Serif;
+    /* Myriad Pro lacks combining diacritics, so these will fall through
+       to the next font.  Helevetica's diacritics however do not combine
+       nicely with Myriad Pro (on OSX, at least) and result in a huge
+       horizontal mess.  Arial empirically gets it right, hence prioritising
+       Arial here. */
+    font-family: 'Myriad Pro', Arial, Helvetica, Sans-Serif;
     font-size: 16px;
     color: #454545;
     border: 0px;

src/skins/vector/css/molecules/EventAsTextTile.css

@@ -16,4 +16,5 @@ limitations under the License.
 
 .mx_EventAsTextTile {
     opacity: 0.5;
+    overflow-y: hidden;
 }

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

@@ -27,6 +27,7 @@ limitations under the License.
     margin-left: -73px;
     margin-top: -4px;
     float: left;
+    position: relative;
 }
 
 .mx_EventTile_avatar img {
@@ -44,6 +45,7 @@ limitations under the License.
     font-size: 14px;
     margin-bottom: 4px;
     display: block;
+    overflow-y: hidden;
 }
 
 .mx_EventTile .mx_MessageTimestamp {
@@ -63,6 +65,7 @@ limitations under the License.
 .mx_MessageTile_content {
     display: block;
     margin-right: 100px;
+    overflow-y: hidden;
 }
 
 /* Various markdown overrides */
@@ -87,6 +90,12 @@ limitations under the License.
     color: #76cfa6;
 }
 
+.mx_MessageTile_content .markdown-body .hljs {
+    display: inherit ! important;
+}
+
+/* end of overrides */
+
 .mx_MessageTile_searchHighlight {
     background-color: #76cfa6;
     color: #fff;

src/skins/vector/css/molecules/MemberInfo.css

@@ -37,8 +37,10 @@ limitations under the License.
 }
 
 .mx_MemberInfo_profileField {
-    opacity: 0.6;
+    font-color: #999999;    
     font-size: 14px;
+    position: relative;
+    background-color: #fff;
 }
 
 .mx_MemberInfo_buttons {

src/skins/vector/css/molecules/MemberTile.css

@@ -98,10 +98,6 @@ limitations under the License.
     opacity: 0.25;
 }
 
-.mx_MemberTile_zalgo {
-    font-family: Helvetica, Arial, Sans-Serif;
-}
-
 .mx_MemberTile:hover .mx_MessageTimestamp {
     display: block;
 }

src/skins/vector/css/molecules/MessageComposer.css

@@ -59,7 +59,7 @@ limitations under the License.
     box-shadow: none;
 
     /* needed for FF */
-    font-family: 'Myriad Pro', Helvetica, Arial, Sans-Serif;
+    font-family: 'Myriad Pro', Arial, Helvetica, Sans-Serif;
 }
 
 /* hack for FF as vertical alignment of custom placeholder text is broken */

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

@@ -111,6 +111,7 @@ limitations under the License.
 
 .mx_RoomHeader_nametext {
     display: inline-block;
+    overflow-y: hidden;
 }
 
 .mx_RoomHeader_settingsButton {

src/skins/vector/css/molecules/SenderProfile.css

@@ -13,8 +13,3 @@ 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_SenderProfile_zalgo {
-    font-family: Helvetica, Arial, Sans-Serif;
-    display: table-row ! important;
-}

src/skins/vector/css/organisms/MemberList.css

@@ -45,7 +45,7 @@ limitations under the License.
 }
 
 .mx_MemberList_invite {
-    font-family: 'Myriad Pro', Helvetica, Arial, Sans-Serif;
+    font-family: 'Myriad Pro', Arial, Helvetica, Sans-Serif;
     border-radius: 3px;
     border: 1px solid #f0f0f0;
     padding: 9px;

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

@@ -125,7 +125,7 @@ limitations under the License.
     clear: both;
 }
 
-.mx_RoomView_MessageList > h2 {
+.mx_RoomView_MessageList h2 {
     clear: both;
     margin-top: 32px;
     margin-bottom: 8px;

src/skins/vector/skindex.js

@@ -50,12 +50,10 @@ skin['messages.TextualEvent'] = require('matrix-react-sdk/lib/components/views/m
 skin['messages.MRoomMemberEvent'] = require('matrix-react-sdk/lib/components/views/messages/MRoomMemberEvent');
 skin['messages.Event'] = require('matrix-react-sdk/lib/components/views/messages/Event');
 skin['messages.Message'] = require('matrix-react-sdk/lib/components/views/messages/Message');
-skin['messages.MEmoteMessage'] = require('matrix-react-sdk/lib/components/views/messages/MEmoteMessage');
 skin['messages.MFileMessage'] = require('matrix-react-sdk/lib/components/views/messages/MFileMessage');
 skin['messages.MImageMessage'] = require('matrix-react-sdk/lib/components/views/messages/MImageMessage');
-skin['messages.MNoticeMessage'] = require('matrix-react-sdk/lib/components/views/messages/MNoticeMessage');
-skin['messages.MTextMessage'] = require('matrix-react-sdk/lib/components/views/messages/MTextMessage');
 skin['messages.MVideoMessage'] = require('matrix-react-sdk/lib/components/views/messages/MVideoMessage');
+skin['messages.TextualMessage'] = require('matrix-react-sdk/lib/components/views/messages/TextualMessage');
 skin['messages.UnknownMessage'] = require('matrix-react-sdk/lib/components/views/messages/UnknownMessage');
 
 skin['rooms.MemberInfo'] = require('matrix-react-sdk/lib/components/views/rooms/MemberInfo');
@@ -101,4 +99,4 @@ skin['organisms.ViewSource'] = require('./views/organisms/ViewSource');
 skin['pages.CompatibilityPage'] = require('./views/pages/CompatibilityPage');
 skin['pages.MatrixChat'] = require('./views/pages/MatrixChat');
 
-module.exports = skin;
+module.exports = skin;

src/skins/vector/views/molecules/SenderProfile.js

@@ -17,11 +17,6 @@ limitations under the License.
 'use strict';
 
 var React = require('react');
-var classNames = require("classnames");
-
-// The Lato WOFF doesn't include sensible combining diacritics, so Chrome chokes on rendering them.
-// Revert to Arial when this happens, which on OSX works at least.
-var zalgo = /[\u0300-\u036f\u1ab0-\u1aff\u1dc0-\u1dff\u20d0-\u20ff\ufe20-\ufe2f]/;
 
 module.exports = React.createClass({
     displayName: 'SenderProfile',
@@ -30,18 +25,12 @@ module.exports = React.createClass({
         var mxEvent = this.props.mxEvent;
         var name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
 
-        var classes = classNames({
-            mx_SenderProfile: true,
-            // taken from https://en.wikipedia.org/wiki/Combining_character
-            mx_SenderProfile_zalgo: zalgo.test(name),
-        });
-
         var msgtype = mxEvent.getContent().msgtype;
         if (msgtype && msgtype == 'm.emote') {
             name = ''; // emote message must include the name so don't duplicate it
         }
         return (
-            <span className={classes}>
+            <span className="mx_SenderProfile">
                 {name} { this.props.aux }
             </span>
         );

src/skins/vector/views/organisms/RoomView.js

@@ -206,7 +206,7 @@ module.exports = React.createClass({
                 if (this.state.syncState === "ERROR") {
                     statusBar = (
                         <div className="mx_RoomView_connectionLostBar">
-                            <img src="img/warning2.png" width="30" height="30" alt="/!\"/>
+                            <img src="img/warning2.png" width="30" height="30" alt="/!\ "/>
                             <div className="mx_RoomView_connectionLostBar_textArea">
                                 <div className="mx_RoomView_connectionLostBar_title">
                                     Connectivity to the server has been lost.
@@ -221,7 +221,7 @@ module.exports = React.createClass({
                 else if (this.state.hasUnsentMessages) {
                     statusBar = (
                         <div className="mx_RoomView_connectionLostBar">
-                            <img src="img/warning2.png" width="30" height="30" alt="/!\"/>
+                            <img src="img/warning2.png" width="30" height="30" alt="/!\ "/>
                             <div className="mx_RoomView_connectionLostBar_textArea">
                                 <div className="mx_RoomView_connectionLostBar_title">
                                     Some of your messages have not been sent.
@@ -291,6 +291,12 @@ module.exports = React.createClass({
                                  </div>;
             }
 
+            var messageComposer;
+            if (!this.state.searchResults) {
+                messageComposer =
+                    <MessageComposer room={this.state.room} roomView={this} uploadFile={this.uploadFile} />
+            }
+
             return (
                 <div className="mx_RoomView">
                     <RoomHeader ref="header" room={this.state.room} editing={this.state.editingRoomSettings} onSearchClick={this.onSearchClick}
@@ -313,10 +319,10 @@ module.exports = React.createClass({
                     <div className="mx_RoomView_statusArea">
                         <div className="mx_RoomView_statusAreaBox">
                             <div className="mx_RoomView_statusAreaBox_line"></div>
-                            {statusBar}
+                            { this.state.searchResults ? null : statusBar }
                         </div>
                     </div>
-                    <MessageComposer room={this.state.room} roomView={this} uploadFile={this.uploadFile} />
+                    { messageComposer }
                 </div>
             );
         }