From 2024b583330345980a4bfe38b28c65688cf9fbea Mon Sep 17 00:00:00 2001 From: Rob Simpson Date: Mon, 15 Feb 2016 15:07:44 -0500 Subject: [PATCH] Update candidate view UI --- src/js/routes/Ballot/Candidate.jsx | 21 +++++++++++++-------- src/sass/base/_base.scss | 4 ++++ src/sass/components/_itemActionbar.scss | 2 +- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/js/routes/Ballot/Candidate.jsx b/src/js/routes/Ballot/Candidate.jsx index ff014d03e..a26f9fe38 100644 --- a/src/js/routes/Ballot/Candidate.jsx +++ b/src/js/routes/Ballot/Candidate.jsx @@ -12,7 +12,10 @@ import StarAction from '../../components/StarAction'; export default class Candidate extends Component { static propTypes = { //history: PropTypes.func.isRequired, + history: PropTypes.string, + oppose_on: PropTypes.boolean, params: PropTypes.object.isRequired, + support_on: PropTypes.boolean }; constructor(props) { @@ -41,8 +44,8 @@ export default class Candidate extends Component { } return ( -
-
+
+
{/*
@@ -97,14 +100,16 @@ export default class Candidate extends Component { Courtesy of Ballotpedia.org */}
-
-
Running for { candidate.office_display_name }
- +
+
+
Running for { candidate.office_display_name }
+
+
-
+
{/* Post privately box */} {/*
    diff --git a/src/sass/base/_base.scss b/src/sass/base/_base.scss index 04f69adf2..7c1adc5d1 100644 --- a/src/sass/base/_base.scss +++ b/src/sass/base/_base.scss @@ -7,6 +7,10 @@ html { box-sizing: border-box; } +#app { + height: 100%; +} + *, *::before, *::after { box-sizing: inherit; } diff --git a/src/sass/components/_itemActionbar.scss b/src/sass/components/_itemActionbar.scss index 7a0c2a22a..c17530878 100644 --- a/src/sass/components/_itemActionbar.scss +++ b/src/sass/components/_itemActionbar.scss @@ -1,4 +1,4 @@ -.item-actionbar { +.item-actionbar, .item-actionbar2 { border-top: 1px solid #DDD; padding:10px 5px;