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

Fix: Add title to user info header #9516

Merged
merged 5 commits into from
Jan 26, 2018
Merged

Fix: Add title to user info header #9516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
873fe82
Add title to user info header
karlprieb Jan 26, 2018
c16d207
fix tests
karlprieb Jan 26, 2018
782c925
Merge branch 'contextual-bar-redesign' into contextual-bar-user-info-…
karlprieb Jan 26, 2018
7b738d3
fix tests
karlprieb Jan 26, 2018
7475450
Merge branch 'contextual-bar-redesign' into contextual-bar-user-info-…
karlprieb Jan 26, 2018
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
4 changes: 2 additions & 2 deletions packages/rocketchat-theme/client/imports/components/userInfo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
display: flex;
flex-direction: column;

padding: 0 var(--default-padding);

background-color: var(--color-white);

&.animated {
Expand All @@ -36,6 +34,8 @@
overflow-y: auto;

flex: 1 1;

padding: 0 var(--default-padding);
}

&__banner {
Expand Down
4 changes: 4 additions & 0 deletions packages/rocketchat-ui-flextab/client/tabs/userInfo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<template name="userInfo">
{{#unless hideHeader}}
<header class="contextual-bar__header">
<div class="contextual-bar__header-data">
{{> icon icon="user" block="contextual-bar__header-icon"}}
<h1 class="contextual-bar__header-title">{{_ "User_Info"}}</h1>
</div>
<button class="contextual-bar__header-close js-close">
{{> icon block="contextual-bar__header-close-icon" icon="plus"}}
</button>
Expand Down
2 changes: 0 additions & 2 deletions tests/end-to-end/ui/12-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,6 @@ describe('[Api Settings Change]', () => {
const userEl = admin.getUserFromList(`setting${ username }`);
userEl.waitForVisible(5000);
userEl.click();
flexTab.userViewTabButton.click();
flexTab.usersView.waitForVisible(5000);
});

it('it should show the activate user btn', () => {
Expand Down
1 change: 0 additions & 1 deletion tests/pageobjects/flex-tab.page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ class FlexTab extends Page {
get emojiNewAliases() { return browser.element('#aliases'); }
get emojiNewImageInput() { return browser.element('#image'); }
get usersView() { return browser.element('.rc-user-info-action'); }
get userViewTabButton() { return browser.element('.tab-button-icon--user'); }
get usersActivate() { return browser.element('.rc-popover__item[data-id=activate]'); }
get usersDeactivate() { return browser.element('.rc-popover__item[data-id=deactivate]'); }

Expand Down