Merge pull request #5549 from vector-im/rxl881/roomTopic

Fix wrapping of long room topics (and overlap with apps)
element-hq · Nov 9, 2017 · a0b0b6f · a0b0b6f
2 parents 88cd46b + 092ec1c
commit a0b0b6f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/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;
@@ -69,6 +68,10 @@ limitations under the License.
     // display: inline-block;
 }
 
+.mx_AppTile, .mx_AppTileFullWidth {
+    margin-bottom: 3px;
+}
+
 .mx_AppTileMenuBar {
     // height: 15px;
     margin: 0;
@@ -116,8 +119,8 @@ limitations under the License.
     display: block;
 }
 
-.mx_CloseAppWidget {
-}
+// .mx_CloseAppWidget {
+// }
 
 .mx_AppTileMenuBarWidgetPadding {
     margin-right: 5px;

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
@@ -176,7 +176,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;
@@ -185,6 +185,7 @@ limitations under the License.
     overflow: hidden;
     text-overflow: ellipsis;
     border-bottom: 1px solid transparent;
+    column-width: 960px;
 }
 
 .mx_RoomHeader_avatar {