Merge remote-tracking branch 'origin/develop' into matthew/status

src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss

@@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_AppsDrawer {
-    margin-bottom: 3px;
-}
+// .mx_AppsDrawer {
+// }
 
 .mx_AppsContainer {
     display: flex;
@@ -51,11 +50,13 @@ limitations under the License.
 .mx_AppTile {
     max-width: 960px;
     width: 50%;
-    margin: 0 5px 2px 0;
+    margin-right: 5px;
     border: 1px solid $primary-hairline-color;
     border-radius: 2px;
-    // height: 350px;
-    // display: inline-block;
+}
+
+.mx_AppTile:last-child {
+    margin-right: 1px;
 }
 
 .mx_AppTileFullWidth {
@@ -69,6 +70,10 @@ limitations under the License.
     // display: inline-block;
 }
 
+.mx_AppTile, .mx_AppTileFullWidth {
+    margin-top: 3px;
+}
+
 .mx_AppTileMenuBar {
     // height: 15px;
     margin: 0;
@@ -116,8 +121,8 @@ limitations under the License.
     display: block;
 }
 
-.mx_CloseAppWidget {
-}
+// .mx_CloseAppWidget {
+// }
 
 .mx_AppTileMenuBarWidgetPadding {
     margin-right: 5px;
@@ -235,3 +240,7 @@ form.mx_Custom_Widget_Form div {
     align-items: center;
     font-weight: bold;
 }
+
+.mx_AppLoading iframe {
+  display: none;
+}

src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss

@@ -168,7 +168,7 @@ limitations under the License.
 .mx_RoomHeader_topic {
     vertical-align: bottom;
     float: left;
-    max-height: 42px;
+    max-height: 38px;
     color: $settings-grey-fg-color;
     font-weight: 300;
     font-size: 13px;
@@ -177,6 +177,7 @@ limitations under the License.
     overflow: hidden;
     text-overflow: ellipsis;
     border-bottom: 1px solid transparent;
+    column-width: 960px;
 }
 
 .mx_RoomHeader_avatar {