Make aspects of the HTML easier to style

ts/components/conversation/ModeratorsAddDialog.tsx

@@ -124,37 +124,42 @@ export class AddModeratorsDialog extends React.Component<Props, State> {
 
   public render() {
     const i18n = window.i18n;
-    const titleText = `${i18n('addModerators')} ${this.props.chatName}`;
 
     const hasFriends = this.state.friendList.length !== 0;
 
     return (
       <div className="content">
-        <p className="titleText">{titleText}</p>
+        <p className="titleText">
-        Add Moderator:
+          ${i18n('addModerators')} <span>${this.props.chatName}</span>
-        <input
+        </p>
-          type="text"
+        <div className="addModeratorBox">
-          ref={this.inputRef}
+          <p>Add Moderator:</p>
-          className="module-main-header__search__input"
+          <input
-          placeholder={i18n('search')}
+            type="text"
-          dir="auto"
+            ref={this.inputRef}
-          onChange={this.updateSearchBound}
+            className="module-main-header__search__input"
-        />
+            placeholder={i18n('search')}
-        <button className="add" tabIndex={0} onClick={this.add}>
+            dir="auto"
-          {i18n('add')}
+            onChange={this.updateSearchBound}
-        </button>
-        From friends:
-        <div className="friend-selection-list">
-          <MemberList
-            members={this.state.friendList}
-            selected={{}}
-            i18n={i18n}
-            onMemberClicked={this.onMemberClicked}
           />
+          <button className="add" tabIndex={0} onClick={this.add}>
+            {i18n('add')}
+          </button>
+        </div>
+        <div className="moderatorList">
+          <p>From friends:</p>
+          <div className="friend-selection-list">
+            <MemberList
+              members={this.state.friendList}
+              selected={{}}
+              i18n={i18n}
+              onMemberClicked={this.onMemberClicked}
+            />
+          </div>
+          {hasFriends ? null : (
+            <p className="no-friends">{i18n('noFriendsToAdd')}</p>
+          )}
         </div>
-        {hasFriends ? null : (
-          <p className="no-friends">{i18n('noFriendsToAdd')}</p>
-        )}
         <div className="buttons">
           <button className="cancel" tabIndex={0} onClick={this.closeDialog}>
             {i18n('cancel')}

ts/components/conversation/ModeratorsRemoveDialog.tsx

@@ -58,25 +58,27 @@ export class RemoveModeratorsDialog extends React.Component<Props, State> {
 
   public render() {
     const i18n = window.i18n;
-    const titleText = `${i18n('removeModerators')} ${this.props.chatName}`;
-
     const hasMods = this.state.modList.length !== 0;
 
     return (
       <div className="content">
-        <p className="titleText">{titleText}</p>
+        <p className="titleText">
-        Existing moderators:
+          ${i18n('removeModerators')} <span>${this.props.chatName}</span>
-        <div className="friend-selection-list">
+        </p>
-          <MemberList
+        <div className="moderatorList">
-            members={this.state.modList}
+          <p>Existing moderators:</p>
-            selected={{}}
+          <div className="friend-selection-list">
-            i18n={i18n}
+            <MemberList
-            onMemberClicked={this.onModClicked}
+              members={this.state.modList}
-          />
+              selected={{}}
+              i18n={i18n}
+              onMemberClicked={this.onModClicked}
+            />
+          </div>
+          {hasMods ? null : (
+            <p className="no-friends">{i18n('noModeratorsToRemove')}</p>
+          )}
         </div>
-        {hasMods ? null : (
-          <p className="no-friends">{i18n('noModeratorsToRemove')}</p>
-        )}
         <div className="buttons">
           <button className="cancel" tabIndex={0} onClick={this.closeDialog}>
             {i18n('cancel')}