From cfc988b84b1ffe831c9df72f94f6ab6ec0f20ec8 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Wed, 5 Jul 2017 08:34:04 +0100 Subject: [PATCH] Add Error prompt Former-commit-id: ac75b90cefc3fc0c3e218e25b9af0293929251d8 [formerly fd3edcdc810da676212ff074d67ba3b359809f13] [formerly 0657c60399c1084665a8e2e8dd128d823eb4389c [formerly 5b3b5aecaf986b40d24cb4af0b1d11331ca28c25]] Former-commit-id: 1b2fd9847dd0914c1d92558db35b0581e679627c [formerly fb35e2a1d0ef76f0008694b1fbca90afe149d4b4] Former-commit-id: 0348afb904b3dada892d7b22868266d48e939d4d --- _assets/package.json | 1 + _assets/src/components/Main.vue | 1 + _assets/src/components/prompts/Error.vue | 23 ++++++++++++++++++++++ _assets/src/components/prompts/Prompts.vue | 4 ++++ _assets/src/css/mobile.css | 4 ++-- _assets/src/css/prompts.css | 16 +++++++++++++++ 6 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 _assets/src/components/prompts/Error.vue diff --git a/_assets/package.json b/_assets/package.json index a8d63b3f..15cab355 100644 --- a/_assets/package.json +++ b/_assets/package.json @@ -10,6 +10,7 @@ "lint": "eslint --ext .js,.vue src" }, "dependencies": { + "codemirror": "^5.27.4", "filesize": "^3.5.10", "hammerjs": "^2.0.8", "moment": "^2.18.1", diff --git a/_assets/src/components/Main.vue b/_assets/src/components/Main.vue index 2205cc2e..e67d69c6 100644 --- a/_assets/src/components/Main.vue +++ b/_assets/src/components/Main.vue @@ -171,6 +171,7 @@ export default { }, created () { this.fetchData() + this.$store.commit('showHover', 'error') }, watch: { '$route': 'fetchData', diff --git a/_assets/src/components/prompts/Error.vue b/_assets/src/components/prompts/Error.vue new file mode 100644 index 00000000..9610aca0 --- /dev/null +++ b/_assets/src/components/prompts/Error.vue @@ -0,0 +1,23 @@ + + + diff --git a/_assets/src/components/prompts/Prompts.vue b/_assets/src/components/prompts/Prompts.vue index f3de27a7..13926fa6 100644 --- a/_assets/src/components/prompts/Prompts.vue +++ b/_assets/src/components/prompts/Prompts.vue @@ -8,6 +8,7 @@ +
@@ -20,6 +21,7 @@ import Delete from './Delete' import Rename from './Rename' import Download from './Download' import Move from './Move' +import Error from './Error' import NewFile from './NewFile' import NewDir from './NewDir' import { mapState } from 'vuex' @@ -30,6 +32,7 @@ export default { Info, Delete, Rename, + Error, Download, Move, NewFile, @@ -38,6 +41,7 @@ export default { }, computed: { ...mapState(['show']), + showError: function () { return this.show === 'error' }, showInfo: function () { return this.show === 'info' }, showHelp: function () { return this.show === 'help' }, showDelete: function () { return this.show === 'delete' }, diff --git a/_assets/src/css/mobile.css b/_assets/src/css/mobile.css index 0d231783..84b91207 100644 --- a/_assets/src/css/mobile.css +++ b/_assets/src/css/mobile.css @@ -17,10 +17,10 @@ z-index: 99999; background: #fff; height: 100%; - width: 13em; + width: 16em; box-shadow: 0 0 5px rgba(0, 0, 0, 0.1); transition: .1s ease left; - left: -14em; + left: -17em; } nav.active { left: 0; diff --git a/_assets/src/css/prompts.css b/_assets/src/css/prompts.css index f5c7f739..3c7b87f8 100644 --- a/_assets/src/css/prompts.css +++ b/_assets/src/css/prompts.css @@ -64,6 +64,22 @@ background-color: #e9eaeb; } +.prompt.error i { + color: #F44336; + display: block; + margin: 0 auto .15em; + text-align: center; + font-size: 5em; +} + +.prompt.error h3 { + text-align: center; +} + +.prompt.error button:not(.cancel) { + background-color: #F44336 +} + /* * * * * * * * * * * * * * * * * PROMPT - MOVE *