PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #6124 from matrix-org/t3chguy/fix/rs5394

Browse source 
Respect newlines in space topics
This commit is contained in:
Michael Telatynski 2021-06-01 12:06:57 +01:00 committed by GitHub
commit 349d0daef7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/css/structures/_SpaceRoomView.scss
View file

@ -328,6 +328,7 @@ $SpaceRoomViewInnerWidth: 428px;
font-size: $font-15px; font-size: $font-15px;
margin-top: 12px; margin-top: 12px;
margin-bottom: 16px; margin-bottom: 16px;
white-space: pre;
} }
> hr { > hr {

11
src/components/structures/SpaceRoomView.tsx
View file

@ -417,9 +417,13 @@ const SpaceLanding = ({ space }) => {
{ inviteButton } { inviteButton }
{ settingsButton } { settingsButton }
</div> </div>
<div className="mx_SpaceRoomView_landing_topic"> <RoomTopic room={space}>
<RoomTopic room={space} /> {(topic, ref) => (
</div> <div className="mx_SpaceRoomView_landing_topic" ref={ref}>
{ topic }
</div>
)}
</RoomTopic>
<SpaceFeedbackPrompt /> <SpaceFeedbackPrompt />
<hr /> <hr />
@ -437,7 +441,6 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
const [error, setError] = useState(""); const [error, setError] = useState("");
const numFields = 3; const numFields = 3;
const placeholders = [_t("General"), _t("Random"), _t("Support")]; const placeholders = [_t("General"), _t("Random"), _t("Support")];
// TODO vary default prefills for "Just Me" spaces
const [roomNames, setRoomName] = useStateArray(numFields, [_t("General"), _t("Random"), ""]); const [roomNames, setRoomName] = useStateArray(numFields, [_t("General"), _t("Random"), ""]);
const fields = new Array(numFields).fill(0).map((_, i) => { const fields = new Array(numFields).fill(0).map((_, i) => {
const name = "roomName" + i; const name = "roomName" + i;