From 4775a35488ca1bac1031de2b7b6219fe2d629e74 Mon Sep 17 00:00:00 2001 From: Jori Lallo Date: Sun, 5 Jun 2016 20:07:02 -0700 Subject: [PATCH] Implemented "cancel" for edit --- src/components/DropdownMenu/DropdownMenu.scss | 12 ++++++++++-- src/scenes/DocumentEdit/DocumentEdit.js | 8 ++++++++ src/scenes/DocumentEdit/DocumentEditStore.js | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/components/DropdownMenu/DropdownMenu.scss b/src/components/DropdownMenu/DropdownMenu.scss index 1b927eaf8..ac78ee9ee 100644 --- a/src/components/DropdownMenu/DropdownMenu.scss +++ b/src/components/DropdownMenu/DropdownMenu.scss @@ -21,22 +21,30 @@ z-index: 1000; border: 1px solid #eee; min-width: 150px; - padding: 5px 0; } } .menuItem { margin: 0; padding: 5px 10px; - height: 24px; + height: 32px; display: flex; justify-content: space-between; align-items: center; cursor: pointer; + border-left: 2px solid transparent; + + span { + margin-top: 2px; + } a { color: $textColor; text-decoration: none; } + + &:hover { + border-left: 2px solid #2196F3; + } } \ No newline at end of file diff --git a/src/scenes/DocumentEdit/DocumentEdit.js b/src/scenes/DocumentEdit/DocumentEdit.js index 371e9441f..bfcc30991 100644 --- a/src/scenes/DocumentEdit/DocumentEdit.js +++ b/src/scenes/DocumentEdit/DocumentEdit.js @@ -1,5 +1,6 @@ import React, { Component } from 'react'; import { observer } from 'mobx-react'; +import { browserHistory } from 'react-router'; import store from './DocumentEditStore'; @@ -50,6 +51,10 @@ class DocumentEdit extends Component { } } + onCancel = () => { + browserHistory.goBack(); + } + state = { scrollTop: 0, } @@ -85,6 +90,9 @@ class DocumentEdit extends Component { Preview + + Cancel + ); diff --git a/src/scenes/DocumentEdit/DocumentEditStore.js b/src/scenes/DocumentEdit/DocumentEditStore.js index 89b276210..5e568c342 100644 --- a/src/scenes/DocumentEdit/DocumentEditStore.js +++ b/src/scenes/DocumentEdit/DocumentEditStore.js @@ -1,7 +1,7 @@ import { observable, action, computed, autorun } from 'mobx'; import { client } from 'utils/ApiClient'; import localforage from 'localforage'; -import { browserHistory } from 'react-router' +import { browserHistory } from 'react-router'; const DOCUMENT_EDIT_SETTINGS = 'DOCUMENT_EDIT_SETTINGS';