From e54eb5ddadffa7cee0b65b908651327e1ce7aace Mon Sep 17 00:00:00 2001
From: Adam Butterworth <adamjbutterworth@gmail.com>
Date: Mon, 11 Mar 2019 11:57:34 -0400
Subject: [PATCH] fix: order and vertical alignment of columns (#69)

---
 src/components/ProfilePage.jsx            | 48 ++++++++++++++++-------
 src/components/ProfilePage/DateJoined.jsx | 20 +++++-----
 src/index.scss                            |  1 -
 3 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/src/components/ProfilePage.jsx b/src/components/ProfilePage.jsx
index c33145b..3acef92 100644
--- a/src/components/ProfilePage.jsx
+++ b/src/components/ProfilePage.jsx
@@ -104,13 +104,32 @@ export class ProfilePage extends React.Component {
 
     const shouldShowAgeMessage = requiresParentalConsent && isCurrentUserProfile;
 
+    // Inserted into the DOM in two places (for responsive layout)
+    const headingLockup = (
+      <React.Fragment>
+        <h1 className="h2 mb-0">{username}</h1>
+        <DateJoined date={dateJoined} />
+      </React.Fragment>
+    );
+
+    const photoUploadErrorMessage = ((error) => {
+      if (error === null) return null;
+      return (
+        <Row>
+          <Col md={4} lg={3}>
+            <Alert color="danger">{error.userMessage}</Alert>
+          </Col>
+        </Row>
+      );
+    })(photoUploadError);
+
     return (
       <div className="profile-page">
         <div className="bg-banner bg-program-micro-masters d-none d-md-block p-relative" />
         <Container fluid>
-          <Row>
-            <Col md={4} lg={3}>
-              <div className="d-flex align-items-center d-md-block mt-4 mt-md-0">
+          <Row className="align-items-center pt-4 mb-4 pt-md-0 mb-md-0">
+            <Col xs="auto" md={4} lg={3}>
+              <div className="d-flex align-items-center d-md-block">
                 <ProfileAvatar
                   className="mb-md-3"
                   src={profileImage.src}
@@ -120,16 +139,20 @@ export class ProfilePage extends React.Component {
                   savePhotoState={this.props.savePhotoState}
                   isEditable={this.props.isCurrentUserProfile}
                 />
-                <div>
-                  {photoUploadError !== null ? <Alert color="danger">{photoUploadError.userMessage}</Alert> : null}
-                  <h1 className="h2 mb-0">{username}</h1>
-                  <DateJoined date={dateJoined} />
-                </div>
               </div>
             </Col>
+            <Col xs="auto" className="pl-0 d-md-none">
+              {headingLockup}
+            </Col>
           </Row>
+
+          {photoUploadErrorMessage}
+
           <Row>
-            <Col xs={{ order: 2 }} md={{ size: 4, order: 1 }} lg={3} className="mt-md-4">
+            <Col md={4} lg={3}>
+              <div className="d-none d-md-block mb-4">
+                {headingLockup}
+              </div>
               <Name
                 name={name}
                 visibilityName={visibilityName}
@@ -162,12 +185,7 @@ export class ProfilePage extends React.Component {
                 {...commonFormProps}
               />
             </Col>
-            <Col
-              xs={{ order: 1 }}
-              md={{ size: 8, order: 2 }}
-              lg={{ size: 8, offset: 1 }}
-              className="mt-4 mt-md-n5"
-            >
+            <Col md={8} className="pt-md-3">
               {shouldShowAgeMessage ? <AgeMessage accountURL="#account" /> : null}
               <Bio
                 bio={bio}
diff --git a/src/components/ProfilePage/DateJoined.jsx b/src/components/ProfilePage/DateJoined.jsx
index b2651d9..d340906 100644
--- a/src/components/ProfilePage/DateJoined.jsx
+++ b/src/components/ProfilePage/DateJoined.jsx
@@ -6,16 +6,16 @@ function DateJoined({ date }) {
   if (date == null) return null;
 
   return (
-    <FormattedMessage
-      id="profile.datejoined.member.since"
-      defaultMessage="Member since {year}"
-      description="A label for how long the user has been a member"
-      values={{
-        year: <FormattedDate value={new Date(date)} year="numeric" />,
-      }}
-      tagName="p"
-      className="mb-0"
-    />
+    <p className="mb-0">
+      <FormattedMessage
+        id="profile.datejoined.member.since"
+        defaultMessage="Member since {year}"
+        description="A label for how long the user has been a member"
+        values={{
+          year: <FormattedDate value={new Date(date)} year="numeric" />,
+        }}
+      />
+    </p>
   );
 }
 
diff --git a/src/index.scss b/src/index.scss
index d286a06..7e1b217 100755
--- a/src/index.scss
+++ b/src/index.scss
@@ -47,7 +47,6 @@ $fa-font-path: "~font-awesome/fonts";
 
 
   .profile-avatar-wrap {
-    margin-right: 1rem;
 
     @include media-breakpoint-up(md) {
       max-width: 12rem;