summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSriram Viswanathan <sriramv@thoughtworks.com>2017-04-05 14:16:52 -0300
committerSriram Viswanathan <sriramv@thoughtworks.com>2017-04-05 14:16:52 -0300
commit1635fca0ddf659f43ce5185b144cad215117c0c9 (patch)
tree18f41d69ea9633f528692ff364e0f2c9e6752362
parent161af0e198d98fa4855c8846924e37ae756923d0 (diff)
[#938] Replaces RaisedButton with FlatButton for backup-account link
with @anikarni
-rw-r--r--web-ui/src/common/link_button/link_button.js32
-rw-r--r--web-ui/src/common/link_button/link_button.scss32
-rw-r--r--web-ui/src/common/link_button/link_button.spec.js4
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 }) => (
- <div className='submit-button link-button'>
- <RaisedButton
+ <div className='link-button'>
+ <FlatButton
href={href}
containerElement='a'
label={buttonText}
labelStyle={labelStyle}
- buttonStyle={buttonStyle}
- overlayStyle={overlayStyle}
- style={style}
- fullWidth
+ hoverColor={'#ff9c00'}
+ style={linkButtonStyle}
/>
</div>
);
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 <http://www.gnu.org/licenses/>.
*/
-.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');
});
});