Merge pull request wevote#36 from pertrai1/ballot-candidate

wevote#3 - Ballot candidate page
CTI-CodeDay · Feb 16, 2016 · 34956eb · 34956eb
2 parents 56bc3b1 + a088d99
commit 34956eb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/src/js/routes/Ballot/Candidate.jsx b/src/js/routes/Ballot/Candidate.jsx
@@ -70,7 +70,7 @@ export default class Candidate extends Component {
           is_starred={candidate.is_starred} />
         <div className="row" style={{ paddingBottom: '10px' }}>
           <div
-            className="col-xs-4"
+            className="col-xs-6"
             style={candidate.candidate_photo_url ? {} : {height:'95px'}}>
 
             {
@@ -86,29 +86,20 @@ export default class Candidate extends Component {
 
             }
           </div>
-          <div className="col-xs-8">
+          <div className="col-xs-6">
             <h4 className="bufferNone">
               <Link className="linkLight"
                     to={"/candidate/" + candidate.we_vote_id }
                     onlyActiveOnIndex={false}>
                       { candidate.ballot_item_display_name }
               </Link>
             </h4>
-            <div>
-                {/* Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur posuere vulputate massa ut efficitur.
-                Duis a eros fringilla, dictum leo vitae, vulputate mi. Nunc vitae neque nec erat fermentum... (more)<br />
-                Courtesy of Ballotpedia.org */}
-            </div>
+            <p>Running for <span className="running-for-office-emphasis">{ candidate.office_display_name }</span></p>
           </div>
-          <div className="row" style={{ "paddingBottom": "10" }}>
-            <div className="col-xs-8">
-              <div>Running for <span className="running-for-office-emphasis">{ candidate.office_display_name }</span></div>
-            </div>
-          </div>
-          <ItemActionBar2 we_vote_id={candidate.we_vote_id}
-                         is_support={candidate.is_support} is_oppose={candidate.is_oppose}
-                          supportCount={candidate.supportCount} opposeCount={candidate.opposeCount} />
         </div>
+        <ItemActionBar2 we_vote_id={candidate.we_vote_id}
+                       is_support={candidate.is_support} is_oppose={candidate.is_oppose}
+                        supportCount={candidate.supportCount} opposeCount={candidate.opposeCount} />
         <div className="container-fluid well-90">
           {/* Post privately box */}
           {/*
@@ -126,12 +117,12 @@ export default class Candidate extends Component {
             {/* One organization's Position on this Candidate */}
             <li className="list-group-item">
                 <div className="row">
-                  <div className="pull-left col-xs-2 col-md-4">
-                      <Link to="ballot_candidate_one_org_position" params={{id: 2, org_id: 27}}>
+                  <div className="col-xs-3 col-md-2">
+                      <Link to="ballot_candidate_one_org_position" params={{id: 2, org_id: 27}} className="transparent">
                         <i className="icon-org-lg icon-icon-org-placeholder-6-2 icon-org-resting-color"></i>
                       </Link>
                   </div>
-                  <div className="pull-right col-xs-10  col-md-8">
+                  <div className="col-xs-9 col-md-10">
                       <h4 className="">
                           <Link className="" to="ballot_candidate_one_org_position" params={{id: 2, org_id: 27}}>
                               Organization Name<br />{/* TODO icon-org-placeholder */}

diff --git a/src/sass/utils/_app.scss b/src/sass/utils/_app.scss
@@ -5,3 +5,7 @@
         }
     }
 }
+
+.transparent, .transparent:hover {
+  color: transparent;
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,7 @@ @@
             }
         }
     }
+    .transparent, .transparent:hover {
+      color: transparent;
+    }