From c0fca14f922838265ea3fdc03e6a7c8aebf9d463 Mon Sep 17 00:00:00 2001 From: Rob Simpson Date: Sat, 13 Feb 2016 09:58:05 -0500 Subject: [PATCH] support for size changes on phone --- src/js/components/Ballot/CandidateItem.jsx | 4 ++-- src/js/components/ItemActionbar.jsx | 14 +++++++----- src/sass/components/_candidate.scss | 26 ++++++++-------------- src/sass/components/_itemActionbar.scss | 6 +++++ 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/js/components/Ballot/CandidateItem.jsx b/src/js/components/Ballot/CandidateItem.jsx index 3750e0d20..1bedb269e 100644 --- a/src/js/components/Ballot/CandidateItem.jsx +++ b/src/js/components/Ballot/CandidateItem.jsx @@ -78,7 +78,7 @@ export default class Candidate extends Component {
{/* adding inline style to img until Rob can style... */} @@ -95,7 +95,7 @@ export default class Candidate extends Component { }
-
+

{this.state.is_support ? - + Support @@ -62,7 +62,7 @@ export default class ItemActionbar extends Component { : - + Support @@ -71,7 +71,7 @@ export default class ItemActionbar extends Component { } {this.state.is_oppose ? - + Oppose @@ -79,7 +79,7 @@ export default class ItemActionbar extends Component { : - + Oppose @@ -87,9 +87,11 @@ export default class ItemActionbar extends Component { } - + + + +  Share -  Share

); diff --git a/src/sass/components/_candidate.scss b/src/sass/components/_candidate.scss index 46f0a2b66..b0f3686bc 100644 --- a/src/sass/components/_candidate.scss +++ b/src/sass/components/_candidate.scss @@ -5,33 +5,25 @@ $largeFont: 2em; .candidate { .oppose { } - .oppose-emphasis-small { + .oppose-emphasis-small, .support-emphasis-small { font-size: $smallFont; font-weight: 300; + @media all and (max-width: 480px) { + font-size: 1em; + } } - .oppose-emphasis-medium { - color: red; + .oppose-emphasis-medium, .support-emphasis-large { + color: rgba(215, 73, 55, 1); + } + .oppose-emphasis-medium, .support-emphasis-medium { font-size: $mediumFont; font-weight: 500; } - .oppose-emphasis-large { - color: red; + .oppose-emphasis-large, .support-emphasis-large { font-size: $largeFont; font-weight: 700; } .support { padding-right: 1em; } - .support-emphasis-small { - font-size: $smallFont; - font-weight: 300; - } - .support-emphasis-medium { - font-size: $mediumFont; - font-weight: 500; - } - .support-emphasis-large { - font-size: $largeFont; - font-weight: 700; - } } diff --git a/src/sass/components/_itemActionbar.scss b/src/sass/components/_itemActionbar.scss index a9c4a939e..7a0c2a22a 100644 --- a/src/sass/components/_itemActionbar.scss +++ b/src/sass/components/_itemActionbar.scss @@ -6,4 +6,10 @@ width: 25%; } + @media all and (max-width: 480px) { + .inline-phone { + font-size: .9em; + } + } + }