From 161af0e198d98fa4855c8846924e37ae756923d0 Mon Sep 17 00:00:00 2001 From: Sriram Viswanathan Date: Wed, 5 Apr 2017 12:08:00 -0300 Subject: [#938] Fixes styling of title & button on backup-account step --- web-ui/src/account_recovery/page.scss | 1 + web-ui/src/common/link_button/link_button.js | 11 ++++++++++- web-ui/src/common/link_button/link_button.scss | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/web-ui/src/account_recovery/page.scss b/web-ui/src/account_recovery/page.scss index c61c855e..378bf63c 100644 --- a/web-ui/src/account_recovery/page.scss +++ b/web-ui/src/account_recovery/page.scss @@ -59,6 +59,7 @@ section { h1 { font-size: 1.3em; font-weight: 600; + text-align: center; } p { diff --git a/web-ui/src/common/link_button/link_button.js b/web-ui/src/common/link_button/link_button.js index e18903f2..17391ce6 100644 --- a/web-ui/src/common/link_button/link_button.js +++ b/web-ui/src/common/link_button/link_button.js @@ -33,6 +33,14 @@ const buttonStyle = { backgroundColor: '#fff' }; +const overlayStyle = { + height: '48px' +}; + +const style = { + boxShadow: 'none' +}; + const LinkButton = ({ buttonText, href }) => (
( label={buttonText} labelStyle={labelStyle} buttonStyle={buttonStyle} - overlayStyle={buttonStyle} + overlayStyle={overlayStyle} + style={style} fullWidth />
diff --git a/web-ui/src/common/link_button/link_button.scss b/web-ui/src/common/link_button/link_button.scss index 9318e08e..ccea5523 100644 --- a/web-ui/src/common/link_button/link_button.scss +++ b/web-ui/src/common/link_button/link_button.scss @@ -17,5 +17,5 @@ .link-button > div { margin-top: 2em; - border: 1px solid #ff9c00; + border: 2px solid #ff9c00; } -- cgit v1.2.3 From 1635fca0ddf659f43ce5185b144cad215117c0c9 Mon Sep 17 00:00:00 2001 From: Sriram Viswanathan Date: Wed, 5 Apr 2017 14:16:52 -0300 Subject: [#938] Replaces RaisedButton with FlatButton for backup-account link with @anikarni --- web-ui/src/common/link_button/link_button.js | 32 +++++++---------------- web-ui/src/common/link_button/link_button.scss | 32 +++++++++++++++++++++-- web-ui/src/common/link_button/link_button.spec.js | 4 +-- 3 files changed, 42 insertions(+), 26 deletions(-) diff --git a/web-ui/src/common/link_button/link_button.js b/web-ui/src/common/link_button/link_button.js index 17391ce6..05e86a9f 100644 --- a/web-ui/src/common/link_button/link_button.js +++ b/web-ui/src/common/link_button/link_button.js @@ -16,42 +16,30 @@ */ import React from 'react'; -import RaisedButton from 'material-ui/RaisedButton'; +import FlatButton from 'material-ui/FlatButton'; -import '../submit_button/submit_button.scss'; import './link_button.scss'; const labelStyle = { textTransform: 'none', - fontSize: '1em', - lineHeight: '48px', - color: '#ff9c00' + color: 'inherit', + fontSize: 'inherit' }; -const buttonStyle = { - height: '48px', - backgroundColor: '#fff' -}; - -const overlayStyle = { - height: '48px' -}; - -const style = { - boxShadow: 'none' +const linkButtonStyle = { + color: 'inherit', + borderRadius: '0' }; const LinkButton = ({ buttonText, href }) => ( -
- +
); diff --git a/web-ui/src/common/link_button/link_button.scss b/web-ui/src/common/link_button/link_button.scss index ccea5523..3b4a534c 100644 --- a/web-ui/src/common/link_button/link_button.scss +++ b/web-ui/src/common/link_button/link_button.scss @@ -15,7 +15,35 @@ * along with Pixelated. If not, see . */ -.link-button > div { +@import "~scss/base/colors"; + +.link-button > a { + width: 100%; +} + +.link-button { + width: 100%; margin-top: 2em; - border: 2px solid #ff9c00; + border: 2px solid $light_orange; + border-radius: 2px; + font-size: 1em; + color: $light_orange; + &:hover { + color: $white; + } +} + +@media only screen and (min-width : 500px) { + .link-button { + width: 70%; + align-self: center; + } +} + +@media only screen and (min-width : 960px) { + .link-button { + width: 300px; + margin-bottom: 1em; + font-size: 0.8em; + } } diff --git a/web-ui/src/common/link_button/link_button.spec.js b/web-ui/src/common/link_button/link_button.spec.js index dd040d28..945afffe 100644 --- a/web-ui/src/common/link_button/link_button.spec.js +++ b/web-ui/src/common/link_button/link_button.spec.js @@ -11,10 +11,10 @@ describe('LinkButton', () => { }); it('renders link button with given button text', () => { - expect(linkButton.find('RaisedButton').props().label).toEqual('Go To Link'); + expect(linkButton.find('FlatButton').props().label).toEqual('Go To Link'); }); it('renders link button with given href', () => { - expect(linkButton.find('RaisedButton').props().href).toEqual('/some-link'); + expect(linkButton.find('FlatButton').props().href).toEqual('/some-link'); }); }); -- cgit v1.2.3 From 2f99b6fef90f5a395094c72b05cef1395ab83deb Mon Sep 17 00:00:00 2001 From: Sriram Viswanathan Date: Wed, 5 Apr 2017 15:14:21 -0300 Subject: [#938] Fixes padding of text on the link button on backup-account step with @anikarni --- web-ui/src/common/link_button/link_button.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/web-ui/src/common/link_button/link_button.js b/web-ui/src/common/link_button/link_button.js index 05e86a9f..e7fd80b0 100644 --- a/web-ui/src/common/link_button/link_button.js +++ b/web-ui/src/common/link_button/link_button.js @@ -23,12 +23,18 @@ import './link_button.scss'; const labelStyle = { textTransform: 'none', color: 'inherit', - fontSize: 'inherit' + fontSize: 'inherit', + width: '100%', + padding: '0' }; const linkButtonStyle = { color: 'inherit', - borderRadius: '0' + borderRadius: '0', + minHeight: '36px', + height: 'auto', + lineHeight: '20px', + padding: '12px 0' }; const LinkButton = ({ buttonText, href }) => ( -- cgit v1.2.3