OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Migrate GroupView away from Gemini 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2020-03-17 10:09:47 +00:00
parent 1b933b7bfe
commit 43f0013dda
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/css/structures/_GroupView.scss
View File

@ -341,8 +341,8 @@ limitations under the License.
display: none; display: none;
} }
.mx_GroupView_body .gm-scroll-view > * { .mx_GroupView_body .mx_AutoHideScrollbar_offset > * {
margin: 11px 50px 0px 68px; margin: 11px 50px 50px 68px;
} }
.mx_GroupView_groupDesc textarea { .mx_GroupView_groupDesc textarea {

1
res/css/structures/_MainSplit.scss
View File

@ -18,6 +18,7 @@ limitations under the License.
display: flex; display: flex;
flex-direction: row; flex-direction: row;
min-width: 0; min-width: 0;
height: 100%;
} }
// move hit area 5px to the right so it doesn't overlap with the timeline scrollbar // move hit area 5px to the right so it doesn't overlap with the timeline scrollbar

6
src/components/structures/GroupView.js
View File

@ -39,6 +39,7 @@ import {makeGroupPermalink, makeUserPermalink} from "../../utils/permalinks/Perm
import {Group} from "matrix-js-sdk"; import {Group} from "matrix-js-sdk";
import {allSettled, sleep} from "../../utils/promise"; import {allSettled, sleep} from "../../utils/promise";
import RightPanelStore from "../../stores/RightPanelStore"; import RightPanelStore from "../../stores/RightPanelStore";
import AutoHideScrollbar from "./AutoHideScrollbar";
const LONG_DESC_PLACEHOLDER = _td( const LONG_DESC_PLACEHOLDER = _td(
`<h1>HTML for your community's page</h1> `<h1>HTML for your community's page</h1>
@ -1173,7 +1174,6 @@ export default createReactClass({
render: function() { render: function() {
const GroupAvatar = sdk.getComponent("avatars.GroupAvatar"); const GroupAvatar = sdk.getComponent("avatars.GroupAvatar");
const Spinner = sdk.getComponent("elements.Spinner"); const Spinner = sdk.getComponent("elements.Spinner");
const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
if (this.state.summaryLoading && this.state.error === null || this.state.saving) { if (this.state.summaryLoading && this.state.error === null || this.state.saving) {
return <Spinner />; return <Spinner />;
@ -1332,10 +1332,10 @@ export default createReactClass({
<GroupHeaderButtons /> <GroupHeaderButtons />
</div> </div>
<MainSplit panel={rightPanel}> <MainSplit panel={rightPanel}>
<GeminiScrollbarWrapper className="mx_GroupView_body"> <AutoHideScrollbar className="mx_GroupView_body">
{ this._getMembershipSection() } { this._getMembershipSection() }
{ this._getGroupSection() } { this._getGroupSection() }
</GeminiScrollbarWrapper> </AutoHideScrollbar>
</MainSplit> </MainSplit>
</main> </main>
); );