mirror of https://github.com/vector-im/riot-web
				
				
				
			Merge pull request #6124 from matrix-org/t3chguy/fix/rs5394
Respect newlines in space topicspull/21833/head
						commit
						349d0daef7
					
				| 
						 | 
				
			
			@ -328,6 +328,7 @@ $SpaceRoomViewInnerWidth: 428px;
 | 
			
		|||
            font-size: $font-15px;
 | 
			
		||||
            margin-top: 12px;
 | 
			
		||||
            margin-bottom: 16px;
 | 
			
		||||
            white-space: pre;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        > hr {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -417,9 +417,13 @@ const SpaceLanding = ({ space }) => {
 | 
			
		|||
            { inviteButton }
 | 
			
		||||
            { settingsButton }
 | 
			
		||||
        </div>
 | 
			
		||||
        <div className="mx_SpaceRoomView_landing_topic">
 | 
			
		||||
            <RoomTopic room={space} />
 | 
			
		||||
        </div>
 | 
			
		||||
        <RoomTopic room={space}>
 | 
			
		||||
            {(topic, ref) => (
 | 
			
		||||
                <div className="mx_SpaceRoomView_landing_topic" ref={ref}>
 | 
			
		||||
                    { topic }
 | 
			
		||||
                </div>
 | 
			
		||||
            )}
 | 
			
		||||
        </RoomTopic>
 | 
			
		||||
        <SpaceFeedbackPrompt />
 | 
			
		||||
        <hr />
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -437,7 +441,6 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
 | 
			
		|||
    const [error, setError] = useState("");
 | 
			
		||||
    const numFields = 3;
 | 
			
		||||
    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 fields = new Array(numFields).fill(0).map((_, i) => {
 | 
			
		||||
        const name = "roomName" + i;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue