diff --git a/src/js/components/toolbar.js b/src/js/components/toolbar.js
index 1ab3541..5afd9ae 100644
--- a/src/js/components/toolbar.js
+++ b/src/js/components/toolbar.js
@@ -10,8 +10,8 @@ export default class Toolbar extends Component {
render() {
return (
+
-
@@ -30,6 +30,15 @@ export default class Toolbar extends Component {
store.dispatch(showMenu('moreMenu', {style: {left, top, transform}}));
}
+ goUp() {
+ let current = store.getState().get('cwd');
+ let up = current.split('/').slice(0, -1).join('/');
+
+ if (up === current) return;
+
+ store.dispatch(changedir(up));
+ }
+
newFile() {
let cwd = store.getState().get('cwd');
let action = showDialog('createDialog', {
diff --git a/src/js/reducers/search.js b/src/js/reducers/search.js
index ee0ed0f..47c250f 100644
--- a/src/js/reducers/search.js
+++ b/src/js/reducers/search.js
@@ -1,4 +1,4 @@
-import { SEARCH } from 'actions/types';
+import { SEARCH, CHANGE_DIRECTORY, REFRESH } from 'actions/types';
import store from 'store';
import { reportError } from 'utils';
import { listFiles } from 'actions/files-view';
@@ -12,6 +12,10 @@ export default function(state = '', action) {
return action.keywords;
}
+ if (action.type === CHANGE_DIRECTORY || action.type === REFRESH) {
+ return '';
+ }
+
return state;
}
@@ -28,7 +32,7 @@ function search(keywords) {
// We don't want to show all the currently visible files from the
// first iteration
let once = true;
- children('/', true).then(function showResults(files) {
+ children('', true).then(function showResults(files) {
if (!store.getState().get('search')) return;
let current = once ? [] : store.getState().get('files');
diff --git a/src/js/tour.js b/src/js/tour.js
index 32ddd9e..cf74519 100644
--- a/src/js/tour.js
+++ b/src/js/tour.js
@@ -3,7 +3,7 @@ const MESSAGES = {
'icon-refresh': 'Refresh File List',
'icon-select': 'Select files for batch actions',
'icon-more': 'Actions used on selected files such as Copy, Delete, Move, …',
- 'icon-view': 'Toggle between List and Grid view',
+ 'icon-back': 'Navigate to top directory',
'drawer': 'Extra options, tools and links are here',
'icon-search': 'Search your storage for a certain file',
'swipe-instruction': 'Swipe from left to right to go to parent folder'
diff --git a/src/less/components/breadcrumb.less b/src/less/components/breadcrumb.less
index acf11f3..9c7219f 100644
--- a/src/less/components/breadcrumb.less
+++ b/src/less/components/breadcrumb.less
@@ -8,12 +8,12 @@
overflow-x: auto;
- padding: 8px;
-
box-sizing: border-box;
.light-medium;
+ padding-right: 8px;
+
background: @light-gray;
border-bottom: 1px solid @dark-transparent;
@@ -22,12 +22,43 @@
overflow-y: hidden;
white-space: nowrap;
- span {
- white-space: nowrap;
+ div {
+ display: flex;
+
+ align-items: center;
}
- i {
- margin: 0 2px;
+ span {
+ position: relative;
+
+ display: flex;
+ align-items: center;
+
+ height: 4.5rem;
+
+ white-space: nowrap;
+
+ padding: 0 5px 0 30px;
+ background: @gray;
+
+ filter: drop-shadow(1px 0 0 @dark-transparent);
+
+ &:first-of-type {
+ padding-left: 10px;
+ }
+
+ &::after {
+ position: absolute;
+ right: -46px;
+ top: 0;
+
+ content: '';
+
+ display: block;
+
+ border: 23px solid transparent;
+ border-left-color: @gray;
+ }
}
span.history {
diff --git a/src/less/icons.less b/src/less/icons.less
index 48b7151..b7f2e9c 100644
--- a/src/less/icons.less
+++ b/src/less/icons.less
@@ -72,19 +72,9 @@
}
}
-.icon-up {
+.icon-back {
.icon;
- display: inline-block;
-
- border: 11px solid transparent;
- border-right-color: @blue;
- border-top-width: 8px;
- border-bottom-width: 8px;
- border-radius: 3px;
-
- margin-right: 0.5rem;
-
- position: relative;
- top: 2px;
- right: 0.5rem;
+ background: url(/img/Back.svg) no-repeat;
+ width: 15px;
+ height: 24px;
}