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/common/link_button/link_button.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'web-ui/src/common/link_button/link_button.js') 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 />
-- 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 +++++++++------------------- 1 file changed, 10 insertions(+), 22 deletions(-) (limited to 'web-ui/src/common/link_button/link_button.js') 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 }) => ( -
- +
); -- 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(-) (limited to 'web-ui/src/common/link_button/link_button.js') 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