matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

fix MyGroups scrollbar

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2020-03-17 13:28:07 +00:00
parent 8fd3b96b72
commit 638629c2fa
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/css/structures/_MyGroups.scss
View File

@@ -102,11 +102,6 @@ limitations under the License.
overflow-y: inherit; overflow-y: inherit;
} }
.mx_MyGroups_content,
.mx_MyGroups_scrollable {
overflow-y: scroll;
}
.mx_MyGroups_placeholder { .mx_MyGroups_placeholder {
background-color: $info-plinth-bg-color; background-color: $info-plinth-bg-color;
color: $info-plinth-fg-color; color: $info-plinth-fg-color;

5
src/components/structures/MyGroups.js
View File

@@ -22,6 +22,7 @@ import { _t } from '../../languageHandler';
import dis from '../../dispatcher'; import dis from '../../dispatcher';
import AccessibleButton from '../views/elements/AccessibleButton'; import AccessibleButton from '../views/elements/AccessibleButton';
import MatrixClientContext from "../../contexts/MatrixClientContext"; import MatrixClientContext from "../../contexts/MatrixClientContext";
import AutoHideScrollbar from "./AutoHideScrollbar";
export default createReactClass({ export default createReactClass({
displayName: 'MyGroups', displayName: 'MyGroups',
@@ -72,7 +73,7 @@ export default createReactClass({
}); });
contentHeader = groupNodes.length > 0 ? <h3>{ _t('Your Communities') }</h3> : <div />; contentHeader = groupNodes.length > 0 ? <h3>{ _t('Your Communities') }</h3> : <div />;
content = groupNodes.length > 0 ? content = groupNodes.length > 0 ?
<div className="mx_MyGroups_scrollable mx_AutoHideScrollbar"> <AutoHideScrollbar className="mx_MyGroups_scrollable">
<div className="mx_MyGroups_microcopy"> <div className="mx_MyGroups_microcopy">
<p> <p>
{ _t( { _t(
@@ -91,7 +92,7 @@ export default createReactClass({
<div className="mx_MyGroups_joinedGroups"> <div className="mx_MyGroups_joinedGroups">
{ groupNodes } { groupNodes }
</div> </div>
</div> : </AutoHideScrollbar> :
<div className="mx_MyGroups_placeholder"> <div className="mx_MyGroups_placeholder">
{ _t( { _t(
"You're not currently a member of any communities.", "You're not currently a member of any communities.",