From ba9406bf06edbef4fd5eb1b6892814ec4d06962f Mon Sep 17 00:00:00 2001 From: Sean Li Date: Tue, 17 Feb 2015 09:33:11 -0800 Subject: [PATCH] Added back button on preferences. --- src/Preferences.react.js | 7 ++++++- styles/preferences.less | 2 +- styles/theme.less | 7 +++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Preferences.react.js b/src/Preferences.react.js index 233ab721a1..f236cddb21 100644 --- a/src/Preferences.react.js +++ b/src/Preferences.react.js @@ -1,6 +1,7 @@ var React = require('react/addons'); var assign = require('object-assign'); var ipc = require('ipc'); +var Router = require('react-router'); // TODO: move this somewhere else if (localStorage.getItem('options')) { @@ -8,6 +9,7 @@ if (localStorage.getItem('options')) { } var Preferences = React.createClass({ + mixins: [Router.Navigation], getInitialState: function () { var data = JSON.parse(localStorage.getItem('options')); return assign({ @@ -31,11 +33,14 @@ var Preferences = React.createClass({ componentDidUpdate: function () { this.saveState(); }, + handleGoBackClick: function () { + this.goBack(); + }, render: function () { - console.log('render'); return (
+ Go Back
VM Settings
diff --git a/styles/preferences.less b/styles/preferences.less index bc30b0494f..1990f77d08 100644 --- a/styles/preferences.less +++ b/styles/preferences.less @@ -9,7 +9,7 @@ .preferences-content { flex: 1 auto; - margin-top: 20px; + margin-top: 45px; padding: 50px; max-width: 640px; display: flex; diff --git a/styles/theme.less b/styles/theme.less index c31c87d156..f575b111be 100644 --- a/styles/theme.less +++ b/styles/theme.less @@ -21,6 +21,13 @@ h4 { font-weight: 500; } +a { + transition: all 0.25s; + &:hover { + text-decoration: none; + } +} + .popover-content { color: @gray-normal; font-size: 13px;