diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss index 7abf86cb0e..c23c19699d 100644 --- a/res/css/views/rooms/_RoomList.scss +++ b/res/css/views/rooms/_RoomList.scss @@ -15,10 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -.mx_RoomList2_resizer { - cursor: ns-resize; -} - .mx_RoomList.mx_RoomList2 { overflow-y: auto; } diff --git a/src/components/views/rooms/RoomSublist2.tsx b/src/components/views/rooms/RoomSublist2.tsx index 84bcb1ea4d..15a0ff801b 100644 --- a/src/components/views/rooms/RoomSublist2.tsx +++ b/src/components/views/rooms/RoomSublist2.tsx @@ -217,11 +217,11 @@ export default class RoomSublist2 extends React.Component { handles = []; // no handles, we're at a minimum } + // TODO: Remove Math hacks let nVisible = Math.floor(layout.visibleTiles); if (localStorage.getItem("mx_rl_mathfn")) { nVisible = Math[localStorage.getItem("mx_rl_mathfn")](layout.visibleTiles); } - console.log({nVisible}) const visibleTiles = tiles.slice(0, nVisible); // If we're hiding rooms, show a 'show more' button to the user. This button @@ -235,15 +235,12 @@ export default class RoomSublist2 extends React.Component { // we +1 to account for the room we're about to hide with our 'show more' button const numMissing = (tiles.length - visibleTiles.length) + 1; - // TODO: Copy TBD // TODO: CSS TBD - // TODO: Show N more instead of infinity more? - // TODO: Safely use the same height of a tile, not hardcoded hacks - const moreTileHeightPx = `${layout.tileHeight}px`; + // TODO: Make this an actual tile visibleTiles.splice(visibleTiles.length - 1, 1, (
{_t("Show %(n)s more", {n: numMissing})} @@ -257,7 +254,6 @@ export default class RoomSublist2 extends React.Component { axis="y" minConstraints={[-1, minTilesPx]} maxConstraints={[-1, maxTilesPx]} - draggableOpts={{grid: [-1, 1]}} resizeHandles={handles} onResize={this.onResize} className="mx_RoomSublist2_resizeBox" diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index cf6dc2431a..1f70edc5d1 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1134,6 +1134,9 @@ "Securely back up your keys to avoid losing them. Learn more.": "Securely back up your keys to avoid losing them. Learn more.", "Not now": "Not now", "Don't ask me again": "Don't ask me again", + "Jump to first unread room.": "Jump to first unread room.", + "Jump to first invite.": "Jump to first invite.", + "Add room": "Add room", "Show %(n)s more": "Show %(n)s more", "Options": "Options", "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",