diff --git a/app/controllers/index.js b/app/controllers/index.js index e93241e..dd98fb7 100644 --- a/app/controllers/index.js +++ b/app/controllers/index.js @@ -65,7 +65,7 @@ export default Controller.extend({ deleteDocuments () { const documentCount = this.get('documentCount'); - const msg = `This will delete all ${documentCount} documents/files in the current directory. Are you sure?`; + const msg = `Delete all ${documentCount} documents/files in the current directory?`; if (! window.confirm(msg)) { return false; } const client = this.get('storage.client'); diff --git a/app/controllers/inspect.js b/app/controllers/inspect.js index e143377..d3937d6 100644 --- a/app/controllers/inspect.js +++ b/app/controllers/inspect.js @@ -41,7 +41,7 @@ export default Controller.extend({ }, deleteItem () { - if (window.confirm('Sure?')) { + if (window.confirm('Delete?')) { this.get('storage.client') .remove(this.get('path')).then(() => { this.transitionToRoute('index', { diff --git a/app/styles/_buttons.scss b/app/styles/_buttons.scss index 52e0e4c..056cc16 100644 --- a/app/styles/_buttons.scss +++ b/app/styles/_buttons.scss @@ -9,17 +9,31 @@ div.button-group + div.button-group { header { button { - padding: 0.4rem 0.8rem 0.3rem; + padding: 0.4rem 0 0.3rem; border: 1px solid $dark-grey-2; border-radius: 0.2em; background-color: #fff; color: $dark-grey-2; font-size: 0.8rem; text-transform: uppercase; + width: 3rem; + + svg { + height: 1rem; + path { + fill: $dark-grey-2; + } + } &:hover { background-color: $dark-grey-2; color: #fff; + + svg { + path { + fill: #fff; + } + } } &:disabled, @@ -27,6 +41,12 @@ header { border-color: $dark-grey-3; background-color: #fff; color: $dark-grey-3; + + svg { + path { + fill: $dark-grey-3; + } + } } } } diff --git a/app/styles/_layout.scss b/app/styles/_layout.scss index 732dc46..7a0dd8c 100644 --- a/app/styles/_layout.scss +++ b/app/styles/_layout.scss @@ -77,6 +77,7 @@ nav.actions { grid-column-start: 3; text-align: right; + margin-top: -0.4rem; } } } diff --git a/app/styles/app.scss b/app/styles/app.scss index 3c16b6d..7745c37 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -5,7 +5,7 @@ body { background-color: white; - font-size: 16px; + font-size: 15px; font-family: Open Sans, sans-serif; color: $dark-grey-1; margin: 0; diff --git a/app/styles/vendor/_json-tree-view.scss b/app/styles/vendor/_json-tree-view.scss index d72fb77..dc74337 100644 --- a/app/styles/vendor/_json-tree-view.scss +++ b/app/styles/vendor/_json-tree-view.scss @@ -1,8 +1,8 @@ .jsonView{ margin-left: 20px; font-family: Consolas, "Lucida Console", Menlo, "dejavu sans mono", monospace; - font-size: 16px; - line-height: 16px; + font-size: 15px; + line-height: 15px; padding: 2px; cursor: default; color: rgb(66, 66, 66); @@ -146,4 +146,4 @@ .jsonView>.insert:hover{ color: rgb(0, 0, 0); background: rgb(220, 220, 220); -} \ No newline at end of file +} diff --git a/app/templates/icons/arrow-from-left.hbs b/app/templates/icons/arrow-from-left.hbs new file mode 100644 index 0000000..24cdf14 --- /dev/null +++ b/app/templates/icons/arrow-from-left.hbs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/templates/icons/arrow-from-right.hbs b/app/templates/icons/arrow-from-right.hbs new file mode 100644 index 0000000..1a3f79e --- /dev/null +++ b/app/templates/icons/arrow-from-right.hbs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/templates/icons/arrow-to-left.hbs b/app/templates/icons/arrow-to-left.hbs new file mode 100644 index 0000000..0f0d795 --- /dev/null +++ b/app/templates/icons/arrow-to-left.hbs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/templates/icons/arrow-to-right.hbs b/app/templates/icons/arrow-to-right.hbs new file mode 100644 index 0000000..0006702 --- /dev/null +++ b/app/templates/icons/arrow-to-right.hbs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/templates/icons/code.hbs b/app/templates/icons/code.hbs new file mode 100644 index 0000000..c9c41b0 --- /dev/null +++ b/app/templates/icons/code.hbs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/templates/icons/list.hbs b/app/templates/icons/list.hbs new file mode 100644 index 0000000..40a6bc5 --- /dev/null +++ b/app/templates/icons/list.hbs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/templates/icons/sitemap.hbs b/app/templates/icons/sitemap.hbs new file mode 100644 index 0000000..b2ceb60 --- /dev/null +++ b/app/templates/icons/sitemap.hbs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/templates/icons/trash.hbs b/app/templates/icons/trash.hbs new file mode 100644 index 0000000..39641f3 --- /dev/null +++ b/app/templates/icons/trash.hbs @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/templates/index.hbs b/app/templates/index.hbs index a7df2ca..ed67877 100644 --- a/app/templates/index.hbs +++ b/app/templates/index.hbs @@ -2,7 +2,8 @@ {{breadcrumb-nav currentDirPath=currentDirPath}} diff --git a/app/templates/inspect.hbs b/app/templates/inspect.hbs index b62994d..245972b 100644 --- a/app/templates/inspect.hbs +++ b/app/templates/inspect.hbs @@ -3,16 +3,35 @@ diff --git a/public/img/icons/arrow-from-left.svg b/public/img/icons/arrow-from-left.svg new file mode 100644 index 0000000..24cdf14 --- /dev/null +++ b/public/img/icons/arrow-from-left.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icons/arrow-from-right.svg b/public/img/icons/arrow-from-right.svg new file mode 100644 index 0000000..1a3f79e --- /dev/null +++ b/public/img/icons/arrow-from-right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icons/arrow-to-left.svg b/public/img/icons/arrow-to-left.svg new file mode 100644 index 0000000..0f0d795 --- /dev/null +++ b/public/img/icons/arrow-to-left.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icons/arrow-to-right.svg b/public/img/icons/arrow-to-right.svg new file mode 100644 index 0000000..0006702 --- /dev/null +++ b/public/img/icons/arrow-to-right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icons/code.svg b/public/img/icons/code.svg new file mode 100644 index 0000000..c9c41b0 --- /dev/null +++ b/public/img/icons/code.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icons/link.svg b/public/img/icons/link.svg new file mode 100644 index 0000000..264f3d9 --- /dev/null +++ b/public/img/icons/link.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icons/list.svg b/public/img/icons/list.svg new file mode 100644 index 0000000..40a6bc5 --- /dev/null +++ b/public/img/icons/list.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icons/power-off.svg b/public/img/icons/power-off.svg new file mode 100644 index 0000000..19bc352 --- /dev/null +++ b/public/img/icons/power-off.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icons/search.svg b/public/img/icons/search.svg new file mode 100644 index 0000000..de0d9c1 --- /dev/null +++ b/public/img/icons/search.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icons/sign-out.svg b/public/img/icons/sign-out.svg new file mode 100644 index 0000000..77feb77 --- /dev/null +++ b/public/img/icons/sign-out.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icons/sitemap.svg b/public/img/icons/sitemap.svg new file mode 100644 index 0000000..b2ceb60 --- /dev/null +++ b/public/img/icons/sitemap.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icons/sort-alpha-down.svg b/public/img/icons/sort-alpha-down.svg new file mode 100644 index 0000000..7650004 --- /dev/null +++ b/public/img/icons/sort-alpha-down.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icons/sort-alpha-up.svg b/public/img/icons/sort-alpha-up.svg new file mode 100644 index 0000000..2fe7a7b --- /dev/null +++ b/public/img/icons/sort-alpha-up.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icons/sync.svg b/public/img/icons/sync.svg new file mode 100644 index 0000000..212660e --- /dev/null +++ b/public/img/icons/sync.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icons/trash-alt.svg b/public/img/icons/trash-alt.svg new file mode 100644 index 0000000..39641f3 --- /dev/null +++ b/public/img/icons/trash-alt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/public/img/icons/trash.svg b/public/img/icons/trash.svg new file mode 100644 index 0000000..73eb1e6 --- /dev/null +++ b/public/img/icons/trash.svg @@ -0,0 +1 @@ + \ No newline at end of file