Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 13:14:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Misc cleanup

Browse Source
This commit is contained in:
Travis Ralston 2020-06-04 21:43:33 -06:00
parent 0694637b06
commit e90e70bd77
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/css/views/rooms/_RoomList.scss
View File

@ -15,10 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
.mx_RoomList2_resizer {
cursor: ns-resize;
}
.mx_RoomList.mx_RoomList2 { .mx_RoomList.mx_RoomList2 {
overflow-y: auto; overflow-y: auto;
} }

2
res/css/views/rooms/_RoomSublist2.scss
View File

@ -17,5 +17,5 @@ limitations under the License.
@import "../../../../node_modules/react-resizable/css/styles.css"; @import "../../../../node_modules/react-resizable/css/styles.css";
.mx_RoomList2 .mx_RoomSubList_labelContainer { .mx_RoomList2 .mx_RoomSubList_labelContainer {
z-index: 12; z-index: 12;
} }

7
src/components/views/rooms/RoomSublist2.tsx
View File

@ -239,17 +239,15 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
// we +1 to account for the room we're about to hide with our 'show more' button // we +1 to account for the room we're about to hide with our 'show more' button
const numMissing = (tiles.length - visibleTiles.length) + 1; const numMissing = (tiles.length - visibleTiles.length) + 1;
// TODO: Copy TBD
// TODO: CSS TBD // TODO: CSS TBD
// TODO: Show N more instead of infinity more? // TODO: Make this an actual tile
// TODO: Safely use the same height of a tile, not hardcoded hacks
visibleTiles.splice(visibleTiles.length - 1, 1, ( visibleTiles.splice(visibleTiles.length - 1, 1, (
<div <div
onClick={this.onShowAllClick} onClick={this.onShowAllClick}
style={{height: '34px', lineHeight: '34px', cursor: 'pointer'}} style={{height: '34px', lineHeight: '34px', cursor: 'pointer'}}
key='showall' key='showall'
> >
{_t("Show %(n)s more rooms", {n: numMissing})} {_t("Show %(n)s more", {n: numMissing})}
</div> </div>
)); ));
} }
@ -260,7 +258,6 @@ export default class RoomSublist2 extends React.Component<IProps, IState> {
axis="y" axis="y"
minConstraints={[-1, minTilesPx]} minConstraints={[-1, minTilesPx]}
maxConstraints={[-1, maxTilesPx]} maxConstraints={[-1, maxTilesPx]}
draggableOpts={{grid: [-1, 1]}}
resizeHandles={handles} resizeHandles={handles}
onResize={this.onResize} onResize={this.onResize}
className="mx_RoomSublist2_resizeBox" className="mx_RoomSublist2_resizeBox"

2
src/i18n/strings/en_EN.json
View File

@ -1136,7 +1136,7 @@
"Jump to first unread room.": "Jump to first unread room.", "Jump to first unread room.": "Jump to first unread room.",
"Jump to first invite.": "Jump to first invite.", "Jump to first invite.": "Jump to first invite.",
"Add room": "Add room", "Add room": "Add room",
"Show %(n)s more rooms": "Show %(n)s more rooms", "Show %(n)s more": "Show %(n)s more",
"Options": "Options", "Options": "Options",
"%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.", "%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
"%(count)s unread messages including mentions.|one": "1 unread mention.", "%(count)s unread messages including mentions.|one": "1 unread mention.",