Review bits for travis

res/css/views/dialogs/_RoomSettingsDialog.scss

@@ -56,66 +56,3 @@ limitations under the License.
     mask-position: center;
 }
 
-.mx_RoomSettingsDialog_BridgeList {
-    padding: 0;
-}
-
-.mx_RoomSettingsDialog_BridgeList li {
-    list-style-type: none;
-    padding: 5px;
-    margin-bottom: 8px;
-    border-width: 1px 1px;
-    border-color: $primary-hairline-color;
-    border-style: solid;
-    border-radius: 5px;
-
-    .protocol-icon {
-        float: left;
-        margin-right: 5px;
-        img {
-            border-radius: 5px;
-            border-width: 1px 1px;
-            border-color: $primary-hairline-color;
-        }
-        span {
-            /* Correct letter placement */
-            left: auto;
-        }
-    }
-
-    h3 {
-        margin-top: 0;
-        margin-bottom: 4px;
-        font-size: 16pt;
-    }
-
-    .column-icon {
-        float: left;
-    }
-
-    .column-data {
-        display: inline-block;
-        width: 85%;
-    }
-
-    .workspace-channel-details {
-        margin-top: 0;
-        color: $primary-fg-color;
-    }
-
-    .metadata {
-        color: $muted-fg-color;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        margin-bottom: 0;
-    }
-
-    .metadata.visible {
-        overflow-y: visible;
-        text-overflow: ellipsis;
-        white-space: normal;
-    }
-    
-}
-

res/css/views/dialogs/_RoomSettingsDialogBridges.scss

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 New Vector Ltd.
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ limitations under the License.
         display: inline;
         margin: 0;
         padding: 0;
-        float: left;
     }
 }
 
@@ -75,6 +74,10 @@ limitations under the License.
     .workspace-channel-details {
         margin-top: 0;
         color: $primary-fg-color;
+
+        .channel {
+            margin-left: 15px;
+        }
     }
 
     .metadata {

src/components/views/settings/BridgeTile.js

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 New Vector Ltd
+Copyright 2020 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,7 +23,8 @@ import Pill from "../elements/Pill";
 import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
 import BaseAvatar from "../avatars/BaseAvatar";
 import AccessibleButton from "../elements/AccessibleButton";
-
+import {replaceableComponent} from "../../../utils/replaceableComponent";
+@replaceableComponent("views.settings.BridgeTile")
 export default class BridgeTile extends React.PureComponent {
     static propTypes = {
         ev: PropTypes.object.isRequired,
@@ -88,11 +89,6 @@ export default class BridgeTile extends React.PureComponent {
             networkIcon = <div class="noProtocolIcon"></div>;
         }
 
-
-        const workspaceChannelDetails = _t("Workspace: %(networkName)s      Channel: %(channelName)s", {
-            networkName,
-            channelName,
-        });
         const id = this.props.ev.getId();
         const metadataClassname = "metadata" + (this.state.visible ? " visible" : "");
         return (<li key={id}>
@@ -102,7 +98,8 @@ export default class BridgeTile extends React.PureComponent {
             <div className="column-data">
                 <h3>{protocolName}</h3>
                 <p className="workspace-channel-details">
-                    {workspaceChannelDetails}
+                    <span>{_t("Workspace: %(networkName)s", {networkName})}</span>
+                    <span className="channel">{_t("Channel: %(channelName)s", {channelName})}</span>
                 </p>
                 <p className={metadataClassname}>
                     {creator} {bot}

src/components/views/settings/tabs/room/BridgeSettingsTab.js

@@ -30,10 +30,6 @@ export default class BridgeSettingsTab extends React.Component {
         roomId: PropTypes.string.isRequired,
     };
 
-    constructor() {
-        super();
-    }
-
     _renderBridgeCard(event, room) {
         const content = event.getContent();
         if (!content || !content.channel || !content.protocol) {
@@ -70,7 +66,7 @@ export default class BridgeSettingsTab extends React.Component {
                     {
                         // TODO: We don't have this link yet: this will prevent the translators
                         // having to re-translate the string when we do.
-                        a: sub => '',
+                        a: sub => sub,
                     },
                 )}</p>
                 <ul className="mx_RoomSettingsDialog_BridgeList">
@@ -84,7 +80,7 @@ export default class BridgeSettingsTab extends React.Component {
                 {
                     // TODO: We don't have this link yet: this will prevent the translators
                     // having to re-translate the string when we do.
-                    a: sub => '',
+                    a: sub => sub,
                 },
             )}</p>;
         }

src/i18n/strings/en_EN.json

@@ -523,7 +523,8 @@
     "Remove": "Remove",
     "This bridge was provisioned by <user />.": "This bridge was provisioned by <user />.",
     "This bridge is managed by <user />.": "This bridge is managed by <user />.",
-    "Workspace: %(networkName)s      Channel: %(channelName)s": "Workspace: %(networkName)s      Channel: %(channelName)s",
+    "Workspace: %(networkName)s": "Workspace: %(networkName)s",
+    "Channel: %(channelName)s": "Channel: %(channelName)s",
     "Show less": "Show less",
     "Show more": "Show more",
     "Failed to upload profile picture!": "Failed to upload profile picture!",