From 737d1d88438ac4f5153484ad4f17a0c68f04144c Mon Sep 17 00:00:00 2001 From: wmwragg Date: Fri, 16 Sep 2016 10:48:52 +0100 Subject: [PATCH] Changed the overflow tile styling, but there is no collpased state or mention count yet --- src/components/structures/RoomSubList.js | 16 +++-- .../matrix-react-sdk/views/rooms/RoomTile.css | 58 ++++++++++++++++++- .../css/vector-web/structures/RoomSubList.css | 1 + 3 files changed, 68 insertions(+), 7 deletions(-) diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js index 0fe45f4706..07fbb8f049 100644 --- a/src/components/structures/RoomSubList.js +++ b/src/components/structures/RoomSubList.js @@ -424,12 +424,20 @@ var RoomSubList = React.createClass({ _createOverflowTile: function(overflowCount, totalCount) { var BaseAvatar = sdk.getComponent('avatars.BaseAvatar'); // XXX: this is duplicated from RoomTile - factor it out +// return ( +//
+//
+// +//
+//
and { overflowCount } others...
+//
+// ); return (
-
- -
-
and { overflowCount } others...
+
+
more
+
+
); }, diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css index d9317743a1..2cc2755eb8 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css @@ -113,9 +113,61 @@ limitations under the License. text-overflow: ellipsis; } -.mx_RoomTile_ellipsis .mx_RoomTile_name { - font-style: italic; - color: #454545; +.mx_RoomTile_ellipsis { + line-height: 11px; + height: auto; + margin-bottom: 4px; +} + +.mx_RoomTile_line { + display: inline-block; + width: 159px; + border-top: dotted 2px #76cfa6; + vertical-align: middle; +} + +.mx_RoomTile_more { + display: inline-block; + text-transform: uppercase; + font-size: 10px; + font-weight: 600; + text-align: left; + color: #76cfa6; + padding-left: 7px; + padding-right: 7px; + padding-left: 7px; + vertical-align: middle; +} + +.mx_RoomTile_moreBadge { + display: inline-block; + min-width: 15px; + height: 13px; + position: absolute; + right: 8px; /*gutter */ + top: -2px; + border-radius: 8px; + border: solid 1px #76cfa6; + color: #fff; + font-weight: 600; + font-size: 10px; + text-align: center; + padding-top: 1px; + padding-left: 4px; + padding-right: 4px; + background-color: #fff; + vertical-align: middle; +} + +.mx_RoomTile_chevronDown { + width: 0; + height: 0; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 6px solid #76cfa6; + position: absolute; + top: 4px; + right: 16px; } .mx_RoomTile_invite { diff --git a/src/skins/vector/css/vector-web/structures/RoomSubList.css b/src/skins/vector/css/vector-web/structures/RoomSubList.css index 9e4162817a..43e77969bd 100644 --- a/src/skins/vector/css/vector-web/structures/RoomSubList.css +++ b/src/skins/vector/css/vector-web/structures/RoomSubList.css @@ -147,3 +147,4 @@ limitations under the License. border-left: 6px solid #76cfa6; border-bottom: 5px solid transparent; } +