OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Fix wrapping of long room topics (and overlap with apps)
pull/5561/head
Luke Barnard 2017-11-09 17:40:55 +00:00 committed by GitHub
parent 88cd46bfcf 092ec1cc6c
commit a0b0b6f053
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
.mx_AppsDrawer { // .mx_AppsDrawer {
margin-bottom: 3px; // }
}
.mx_AppsContainer { .mx_AppsContainer {
display: flex; display: flex;
@ -69,6 +68,10 @@ limitations under the License.
// display: inline-block; // display: inline-block;
} }
.mx_AppTile, .mx_AppTileFullWidth {
margin-bottom: 3px;
}
.mx_AppTileMenuBar { .mx_AppTileMenuBar {
// height: 15px; // height: 15px;
margin: 0; margin: 0;
@ -116,8 +119,8 @@ limitations under the License.
display: block; display: block;
} }
.mx_CloseAppWidget { // .mx_CloseAppWidget {
} // }
.mx_AppTileMenuBarWidgetPadding { .mx_AppTileMenuBarWidgetPadding {
margin-right: 5px; margin-right: 5px;

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

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