Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make left panel better for new users (mk II) #3804

Merged
merged 9 commits into from
May 8, 2017
Merged

Make left panel better for new users (mk II) #3804

merged 9 commits into from
May 8, 2017

Conversation

dbkr
Copy link
Member

@dbkr dbkr commented May 4, 2017

Implements #3609

Adds RoleButton to reduce duplication as we now have up to 3 copies of the same button.

Requires matrix-org/matrix-react-sdk#859

@dbkr dbkr mentioned this pull request May 4, 2017
Merged
@dbkr
Copy link
Member Author

dbkr commented May 4, 2017

(Tests failing because of changes required in react-sdk)

lukebarnard1
lukebarnard1 reviewed May 4, 2017
View reviewed changes
src/components/structures/RoomSubList.js Outdated
@@ -468,16 +471,18 @@ var RoomSubList = React.createClass({

render: function() {
var connectDropTarget = this.props.connectDropTarget;
var RoomDropTarget = sdk.getComponent('rooms.RoomDropTarget');
var TruncatedList = sdk.getComponent('elements.TruncatedList');

var label = this.props.collapsed ? null : this.props.label;

//console.log("render: " + JSON.stringify(this.state.sortedList));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could remove this

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

lukebarnard1
lukebarnard1 suggested changes May 4, 2017
View reviewed changes
src/components/structures/RoomSubList.js Outdated
target = <RoomDropTarget label={ 'Drop here to ' + this.props.verb }/>;
let content;
if (this.state.sortedList.length == 0) {
//content = <RoomDropTarget label={ 'Drop here to ' + this.props.verb }/>;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This implies that it will always be "Drop here to ...". Not sure how useful that would be

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, yeah, removed

@lukebarnard1
Copy link
Contributor

@dbkr I forgot to mention that the padding around the text isn't even:
2017-05-04-175300_224x67_scrot

@lukebarnard1
Copy link
Contributor

And also, there's no chevron as per the design that points to the Room sublist header

@dbkr
Copy link
Member Author

dbkr commented May 4, 2017

Yeah, I've left Matthew to do the chevron as it'll require a special SVG to be drawn.

@dbkr
Copy link
Member Author

dbkr commented May 4, 2017

and I think the padding is even, it's just that it's left-justified - either way I was going to leave matthew to tweak the CSS

@lukebarnard1
Copy link
Contributor

Fair enough. @ara4n I think the buttons could do with vertical-align: -4px; when you get around to CSS tweaking.

@dbkr
Copy link
Member Author

dbkr commented May 4, 2017

Oh I see what you mean, yes (I went with -3 as it looked better to me, easy to tweak though)

@lukebarnard1 lukebarnard1 assigned dbkr and unassigned lukebarnard1 May 5, 2017
@dbkr dbkr merged commit e613382 into develop May 8, 2017
dbkr added a commit that referenced this pull request May 17, 2017
@dbkr
Revert "Merge pull request #3804 from vector-im/dbkr/left_panel_for_n…
3cead03 
…ewbies_2"

This reverts commit e613382, reversing
changes made to d1db602.
dbkr added a commit that referenced this pull request May 17, 2017
@dbkr
Revert "Revert "Merge pull request #3804 from vector-im/dbkr/left_pan…
894be95 
…el_for_newbies_2""

This reverts commit 3cead03.
@dbkr dbkr mentioned this pull request May 17, 2017
Closed
@lukebarnard1 lukebarnard1 mentioned this pull request May 25, 2017
Merged
@t3chguy t3chguy deleted the dbkr/left_panel_for_newbies_2 branch May 12, 2022 08:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lukebarnard1 lukebarnard1 lukebarnard1 approved these changes

Assignees

@dbkr dbkr

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dbkr @lukebarnard1 @lampholder