diff --git a/build/img/Back.svg b/build/img/Back.svg new file mode 100644 index 0000000..8374b8f --- /dev/null +++ b/build/img/Back.svg @@ -0,0 +1,16 @@ + + + + Back + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/build/main.js b/build/main.js index 08ec7f7..7d83842 100644 --- a/build/main.js +++ b/build/main.js @@ -30294,16 +30294,6 @@ var Breadcrumb = (function (_Component) { ) ); } - }, { - key: 'goUp', - value: function goUp() { - var current = store.getState().get('cwd'); - var up = current.split('/').slice(0, -1).join('/'); - - if (up === current) return; - - store.dispatch((0, _actionsChangedir2['default'])(up)); - } }, { key: 'componentDidUpdate', value: function componentDidUpdate() { @@ -31087,6 +31077,35 @@ var Navigation = (function (_Component) { ) ) ), + _react2['default'].createElement( + 'p', + null, + 'View' + ), + _react2['default'].createElement( + 'ul', + null, + _react2['default'].createElement( + 'li', + null, + _react2['default'].createElement('input', { id: 'view-list', name: 'view', 'data-value': 'list', type: 'radio', defaultChecked: settings.filter === 'list' }), + _react2['default'].createElement( + 'label', + { htmlFor: 'view-list' }, + 'List' + ) + ), + _react2['default'].createElement( + 'li', + null, + _react2['default'].createElement('input', { id: 'view-grid', name: 'view', 'data-value': 'grid', type: 'radio', defaultChecked: settings.filter === 'grid' }), + _react2['default'].createElement( + 'label', + { htmlFor: 'view-grid' }, + 'Grid' + ) + ) + ), _react2['default'].createElement( 'p', null, @@ -31551,8 +31570,8 @@ var Toolbar = (function (_Component) { return _react2['default'].createElement( 'div', { className: 'toolbar' }, + _react2['default'].createElement('button', { className: 'icon-back tour-item', onClick: this.goUp }), _react2['default'].createElement('button', { className: 'icon-plus tour-item', onClick: this.newFile }), - _react2['default'].createElement('button', { className: 'icon-view tour-item', onClick: this.toggleView }), _react2['default'].createElement('button', { className: 'icon-refresh tour-item', onClick: (0, _store.bind)((0, _actionsFilesView.refresh)()) }), _react2['default'].createElement('button', { className: 'icon-select tour-item', onClick: (0, _store.bind)((0, _actionsFilesView.selectView)('toggle')) }), _react2['default'].createElement('button', { className: 'icon-more tour-item', onClick: this.showMore.bind(this), ref: 'more' }) @@ -31573,6 +31592,16 @@ var Toolbar = (function (_Component) { var transform = 'translate(0, -100%)'; _store2['default'].dispatch((0, _actionsMenu.show)('moreMenu', { style: { left: left, top: top, transform: transform } })); } + }, { + key: 'goUp', + value: function goUp() { + var current = _store2['default'].getState().get('cwd'); + var up = current.split('/').slice(0, -1).join('/'); + + if (up === current) return; + + _store2['default'].dispatch(changedir(up)); + } }, { key: 'newFile', value: function newFile() { @@ -32612,7 +32641,7 @@ var 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/build/style.css b/build/style.css index c495d5c..d9b8d58 100644 --- a/build/style.css +++ b/build/style.css @@ -59,18 +59,11 @@ .icon-cross svg * { fill: white; } -.icon-up { +.icon-back { display: block; - display: inline-block; - border: 11px solid transparent; - border-right-color: #63b0cd; - 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; } .regular-medium { font-weight: normal; diff --git a/design/userinterface.sketch b/design/userinterface.sketch index 8397d7f..68faaa9 100644 Binary files a/design/userinterface.sketch and b/design/userinterface.sketch differ diff --git a/releases/hawk-1.0.0.zip b/releases/hawk-1.0.0.zip index dfa9206..69aa2e8 100644 Binary files a/releases/hawk-1.0.0.zip and b/releases/hawk-1.0.0.zip differ diff --git a/src/img/Back.svg b/src/img/Back.svg new file mode 100644 index 0000000..8374b8f --- /dev/null +++ b/src/img/Back.svg @@ -0,0 +1,16 @@ + + + + Back + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/src/js/components/breadcrumb.js b/src/js/components/breadcrumb.js index ece5935..b2cfb64 100644 --- a/src/js/components/breadcrumb.js +++ b/src/js/components/breadcrumb.js @@ -57,15 +57,6 @@ export default class Breadcrumb extends Component { ); } - goUp() { - let current = store.getState().get('cwd'); - let up = current.split('/').slice(0, -1).join('/'); - - if (up === current) return; - - store.dispatch(changedir(up)); - } - componentDidUpdate() { let container = React.findDOMNode(this.refs.container); let currents = container.querySelectorAll('span:not(.history)'); diff --git a/src/js/components/navigation.js b/src/js/components/navigation.js index 3c97ba0..2c7457f 100644 --- a/src/js/components/navigation.js +++ b/src/js/components/navigation.js @@ -40,6 +40,18 @@ export default class Navigation extends Component { +

View

+ +

Tools