From 4edd995c761571f50a00d3a8068fa82e64c4690f Mon Sep 17 00:00:00 2001
From: Ahmad Abdolsaheb <ahmad.abdolsaheb@gmail.com>
Date: Fri, 15 Feb 2019 17:52:45 +0300
Subject: [PATCH] fix: standarize form field UI

---
 .../src/components/formHelpers/FormFields.js  | 14 ++---
 .../__snapshots__/Form.test.js.snap           | 10 +--
 .../components/formHelpers/form-fields.css    |  6 --
 .../src/templates/Challenges/backend/Show.js  | 63 +++++++++----------
 4 files changed, 36 insertions(+), 57 deletions(-)
 delete mode 100644 client/src/components/formHelpers/form-fields.css

diff --git a/client/src/components/formHelpers/FormFields.js b/client/src/components/formHelpers/FormFields.js
index bb2246cb45..930078e438 100644
--- a/client/src/components/formHelpers/FormFields.js
+++ b/client/src/components/formHelpers/FormFields.js
@@ -6,11 +6,10 @@ import {
   Col,
   ControlLabel,
   FormControl,
+  FormGroup,
   HelpBlock
 } from '@freecodecamp/react-bootstrap';
 
-import './form-fields.css';
-
 const propTypes = {
   errors: PropTypes.objectOf(PropTypes.string),
   fields: PropTypes.objectOf(
@@ -48,15 +47,12 @@ function FormFields(props) {
           const key = kebabCase(name);
           const type = name in types ? types[name] : 'text';
           return (
-            <div className='inline-form-field' key={key}>
-              <Col sm={3} xs={12}>
+            <Col key={key} xs={12}>
+              <FormGroup>
                 {type === 'hidden' ? null : (
                   <ControlLabel htmlFor={key}>{startCase(name)}</ControlLabel>
                 )}
-              </Col>
-              <Col sm={9} xs={12}>
                 <FormControl
-                  bsSize='lg'
                   componentClass={type === 'textarea' ? type : 'input'}
                   id={key}
                   name={name}
@@ -72,8 +68,8 @@ function FormFields(props) {
                     <Alert bsStyle='danger'>{errors[name]}</Alert>
                   </HelpBlock>
                 ) : null}
-              </Col>
-            </div>
+              </FormGroup>
+            </Col>
           );
         })}
     </div>
diff --git a/client/src/components/formHelpers/__snapshots__/Form.test.js.snap b/client/src/components/formHelpers/__snapshots__/Form.test.js.snap
index fa181bdbbd..e315158b47 100644
--- a/client/src/components/formHelpers/__snapshots__/Form.test.js.snap
+++ b/client/src/components/formHelpers/__snapshots__/Form.test.js.snap
@@ -11,10 +11,10 @@ exports[`<DynamicForm /> snapshot 1`] = `
 >
   <div>
     <div
-      className="inline-form-field"
+      className="col-xs-12"
     >
       <div
-        className="col-sm-3 col-xs-12"
+        className="form-group"
       >
         <label
           className="control-label"
@@ -22,12 +22,8 @@ exports[`<DynamicForm /> snapshot 1`] = `
         >
           Name
         </label>
-      </div>
-      <div
-        className="col-sm-9 col-xs-12"
-      >
         <input
-          className="form-control input-lg"
+          className="form-control"
           id="name"
           name="name"
           onChange={[Function]}
diff --git a/client/src/components/formHelpers/form-fields.css b/client/src/components/formHelpers/form-fields.css
deleted file mode 100644
index f21ab7456d..0000000000
--- a/client/src/components/formHelpers/form-fields.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.inline-form-field {
-  height: 100%;
-  display: flex;
-  align-items: center;
-  margin-bottom: 5px;
-}
\ No newline at end of file
diff --git a/client/src/templates/Challenges/backend/Show.js b/client/src/templates/Challenges/backend/Show.js
index 91e5c26d7a..8fc2cdd5b4 100644
--- a/client/src/templates/Challenges/backend/Show.js
+++ b/client/src/templates/Challenges/backend/Show.js
@@ -161,42 +161,35 @@ export class BackEnd extends Component {
       <LearnLayout>
         <Grid>
           <Row>
-            <Col xs={12}>
+            <Col md={8} mdOffset={2} sm={10} smOffset={1} xs={12} >
               <Spacer />
-              <div>
-                <ChallengeTitle>{blockNameTitle}</ChallengeTitle>
-                <ChallengeDescription
-                  description={description}
-                  instructions={instructions}
-                />
-              </div>
-              <div>
-                <Form
-                  buttonText={buttonCopy + '(Ctrl + Enter)'}
-                  formFields={formFields}
-                  id={backendNS}
-                  options={options}
-                  submit={executeChallenge}
-                />
-                <ProjectToolPanel guideUrl={createGuideUrl(slug)} />
-              </div>
-              <div>
-                <br />
-                <Output
-                  defaultOutput={`/**
-  *
-  * Test output will go here
-  *
-  *
-  */`}
-                  dimensions={this.state}
-                  height={150}
-                  output={output}
-                />
-              </div>
-              <div>
-                <TestSuite tests={tests} />
-              </div>
+              <ChallengeTitle>{blockNameTitle}</ChallengeTitle>
+              <ChallengeDescription
+                description={description}
+                instructions={instructions}
+              />
+              <Form
+                buttonText={buttonCopy + '(Ctrl + Enter)'}
+                formFields={formFields}
+                id={backendNS}
+                options={options}
+                submit={executeChallenge}
+              />
+              <ProjectToolPanel guideUrl={createGuideUrl(slug)} />
+              <br />
+              <Output
+                defaultOutput={`/**
+*
+* Test output will go here
+*
+*
+*/`}
+                dimensions={this.state}
+                height={150}
+                output={output}
+              />
+              <TestSuite tests={tests} />
+
               <Spacer />
             </Col>
             <CompletionModal />