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

Remove 'welcome' from top-left menu #2641

Merged
merged 2 commits into from Feb 14, 2019
Merged

Remove 'welcome' from top-left menu #2641

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7845a63
Remove 'welcome' from top-left menu
dbkr Feb 14, 2019
93350c4
Put back this bind - it's an unrelated fix
dbkr Feb 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions res/css/views/context_menus/_TopLeftMenu.scss
View file
Open in desktop
Expand Up @@ -31,10 +31,6 @@ limitations under the License.
mask-image: url('$(res)/img/feather-icons/home.svg');
}

li.mx_TopLeftMenu_icon_welcome::after {
mask-image: url('$(res)/img/feather-icons/gift.svg');
}

li.mx_TopLeftMenu_icon_settings::after {
mask-image: url('$(res)/img/feather-icons/settings.svg');
}
Expand Down
1 change: 0 additions & 1 deletion res/img/feather-icons/gift.svg
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions src/components/views/context_menus/TopLeftMenu.js
View file
Open in desktop
Expand Up @@ -25,8 +25,6 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
export class TopLeftMenu extends React.Component {
constructor() {
super();
this.viewHomePage = this.viewHomePage.bind(this);
Copy link
Collaborator

Choose a reason for hiding this comment

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

The viewHomePage line is a related bug fix that I think we want to keep. (I should have made a separate commit...)

this.viewWelcomePage = this.viewWelcomePage.bind(this);
this.openSettings = this.openSettings.bind(this);
this.signIn = this.signIn.bind(this);
this.signOut = this.signOut.bind(this);
Expand Down Expand Up @@ -67,9 +65,6 @@ export class TopLeftMenu extends React.Component {

return <div className="mx_TopLeftMenu">
{homePageSection}
<ul className="mx_TopLeftMenu_section">
<li className="mx_TopLeftMenu_icon_welcome" onClick={this.viewWelcomePage}>{_t("Welcome")}</li>
</ul>
<ul className="mx_TopLeftMenu_section">
<li className="mx_TopLeftMenu_icon_settings" onClick={this.openSettings}>{_t("Settings")}</li>
</ul>
Expand All @@ -82,11 +77,6 @@ export class TopLeftMenu extends React.Component {
this.closeMenu();
}

viewWelcomePage() {
dis.dispatch({action: 'view_welcome_page'});
this.closeMenu();
}

openSettings() {
dis.dispatch({action: 'view_user_settings'});
this.closeMenu();
Expand Down
1 change: 0 additions & 1 deletion src/i18n/strings/en_EN.json
View file
Open in desktop
Expand Up @@ -1221,7 +1221,6 @@
"View Community": "View Community",
"Hide": "Hide",
"Sign in": "Sign in",
"Welcome": "Welcome",
"Login": "Login",
"powered by Matrix": "powered by Matrix",
"Robot check is currently unavailable on desktop - please use a <a>web browser</a>": "Robot check is currently unavailable on desktop - please use a <a>web browser</a>",
Expand Down