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

Wmwragg/multi invite bugfix #2198

Merged
merged 3 commits into from
Sep 14, 2016
Merged

Wmwragg/multi invite bugfix #2198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3706121
The scrollbars are nolonger always visible for the AddressSelector an…
wmwragg Sep 14, 2016
66ef521
Increased hitbox area to the whole invite section, not just the icon
wmwragg Sep 14, 2016
efa574c
The invite group, will no longer be shown when the directory listing …
wmwragg Sep 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/components/structures/RightPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ module.exports = React.createClass({
var FilePanel = sdk.getComponent('structures.FilePanel');
var TintableSvg = sdk.getComponent("elements.TintableSvg");
var buttonGroup;
var inviteGroup;
var panel;

var filesHighlight;
Expand Down Expand Up @@ -210,6 +211,14 @@ module.exports = React.createClass({
{ notificationsHighlight }
</div>
</div>;

inviteGroup =
<div className="mx_RightPanel_invite" onClick={ this.onInviteButtonClick } >
<div className="mx_RightPanel_icon" >
<TintableSvg src="img/icon-invite-people.svg" width="35" height="35" />
</div>
<div className="mx_RightPanel_message">Invite to this room</div>
</div>;
}

if (!this.props.collapsed) {
Expand Down Expand Up @@ -244,12 +253,7 @@ module.exports = React.createClass({
</div>
{ panel }
<div className="mx_RightPanel_footer">
<div className="mx_RightPanel_invite" >
<div className="mx_RightPanel_icon" onClick={ this.onInviteButtonClick } >
<TintableSvg src="img/icon-invite-people.svg" width="35" height="35" />
</div>
<div className="mx_RightPanel_message">Invite to this room</div>
</div>
{ inviteGroup }
</div>
</aside>
);
Expand Down
2 changes: 1 addition & 1 deletion src/skins/vector/css/matrix-react-sdk/views/dialogs/ChatInviteDialog.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ limitations under the License.
padding-bottom: 1px;
max-height: 150px;
overflow-x: hidden;
overflow-y: scroll;
overflow-y: auto;
}

.mx_ChatInviteDialog_error {
Expand Down
2 changes: 1 addition & 1 deletion src/skins/vector/css/matrix-react-sdk/views/elements/AddressSelector.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ limitations under the License.
background-color: #fff;
width: 485px;
max-height: 116px;
overflow-y: scroll;
overflow-y: auto;
border-radius: 3px;
background-color: #fff;
border: solid 1px #76cfa6;
Expand Down
2 changes: 1 addition & 1 deletion src/skins/vector/css/vector-web/structures/RightPanel.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ limitations under the License.
color: #4A4A4A;
padding-top: 13px;
padding-left: 5px;
cursor: pointer;
}

.collapsed .mx_RightPanel_footer .mx_RightPanel_invite {
Expand All @@ -118,7 +119,6 @@ limitations under the License.

.mx_RightPanel_invite .mx_RightPanel_icon {
display: inline-block;
cursor: pointer;
}

.mx_RightPanel_invite .mx_RightPanel_icon object {
Expand Down