From 293c286d2297bcb26c78eb49c8f6f6a0e7d0710e Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Sun, 8 May 2016 03:03:26 +0900 Subject: [PATCH] update color option and enhance UX of FolderItem --- browser/lib/consts.js | 14 ++++++-------- browser/main/HomePage/SideNav/FolderItem.js | 6 ++++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/browser/lib/consts.js b/browser/lib/consts.js index 400ffb78..c6afc3b7 100644 --- a/browser/lib/consts.js +++ b/browser/lib/consts.js @@ -1,22 +1,20 @@ const consts = { FOLDER_COLORS: [ - '#3460C7', - '#2BA5F7', + '#E10051', '#FF8E00', '#E8D252', '#3FD941', - '#1FAD85', - '#E10051', + '#30D5C8', + '#2BA5F7', '#B013A4' ], FOLDER_COLOR_NAMES: [ - 'Cerulean Blue', - 'Dodger Blue', + 'Razzmatazz', 'Pizazz', 'Confetti', 'Emerald', - 'Mountain Meadow', - 'Razzmatazz', + 'Turquoise', + 'Dodger Blue', 'Violet Eggplant' ] } diff --git a/browser/main/HomePage/SideNav/FolderItem.js b/browser/main/HomePage/SideNav/FolderItem.js index c9164225..5be3ab12 100644 --- a/browser/main/HomePage/SideNav/FolderItem.js +++ b/browser/main/HomePage/SideNav/FolderItem.js @@ -89,6 +89,7 @@ class FolderItem extends React.Component { name: this.props.folder.name }, () => { this.refs.nameInput.focus() + this.refs.nameInput.select() }) } @@ -124,7 +125,9 @@ class FolderItem extends React.Component { return (
+ styleName='root' + onContextMenu={(e) => this.handleContextButtonClick(e)} + >
{folder.name}
@@ -181,7 +184,6 @@ class FolderItem extends React.Component { return (
this.handleContextButtonClick(e)} >