nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into Relocate-the-"save"-button-in-mobile-editor

Browse Source
This commit is contained in:
niubility000 2021-10-20 05:50:26 +08:00 committed by GitHub
commit 81f82c16d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
frontend/src/components/Sidebar.vue
View File

@ -1,15 +1,15 @@
<template> <template>
<nav :class="{ active }"> <nav :class="{ active }">
<template v-if="isLogged"> <template v-if="isLogged">
<router-link <button
class="action" class="action"
to="/files/" @click="toRoot"
:aria-label="$t('sidebar.myFiles')" :aria-label="$t('sidebar.myFiles')"
:title="$t('sidebar.myFiles')" :title="$t('sidebar.myFiles')"
> >
<i class="material-icons">folder</i> <i class="material-icons">folder</i>
<span>{{ $t("sidebar.myFiles") }}</span> <span>{{ $t("sidebar.myFiles") }}</span>
</router-link> </button>
<div v-if="user.perm.create"> <div v-if="user.perm.create">
<button <button
@ -34,15 +34,15 @@
</div> </div>
<div> <div>
<router-link <button
class="action" class="action"
to="/settings" @click="toSettings"
:aria-label="$t('sidebar.settings')" :aria-label="$t('sidebar.settings')"
:title="$t('sidebar.settings')" :title="$t('sidebar.settings')"
> >
<i class="material-icons">settings_applications</i> <i class="material-icons">settings_applications</i>
<span>{{ $t("sidebar.settings") }}</span> <span>{{ $t("sidebar.settings") }}</span>
</router-link> </button>
<button <button
v-if="authMethod == 'json'" v-if="authMethod == 'json'"
@ -125,6 +125,14 @@ export default {
authMethod: () => authMethod, authMethod: () => authMethod,
}, },
methods: { methods: {
toRoot() {
this.$router.push({ path: "/files/" }, () => {});
this.$store.commit("closeHovers");
},
toSettings() {
this.$router.push({ path: "/settings" }, () => {});
this.$store.commit("closeHovers");
},
help() { help() {
this.$store.commit("showHover", "help"); this.$store.commit("showHover", "help");
}, },

3
frontend/src/css/header.css
View File

@ -84,7 +84,8 @@ header .menu-button {
#search #input { #search #input {
background-color: #f5f5f5; background-color: #f5f5f5;
display: flex; display: flex;
padding: 0.75em; height: 100%;
padding: 0em 0.75em;
border-radius: 0.3em; border-radius: 0.3em;
transition: .1s ease all; transition: .1s ease all;
align-items: center; align-items: center;

5
frontend/src/css/styles.css
View File

@ -291,18 +291,21 @@ main .spinner .bounce2 {
/* EDITOR */ /* EDITOR */
#editor-container { #editor-container {
display: flex;
flex-direction: column;
background-color: #fafafa; background-color: #fafafa;
position: fixed; position: fixed;
padding-top: 4em; padding-top: 4em;
top: 0; top: 0;
left: 0; left: 0;
height: 100%;
width: 100%; width: 100%;
z-index: 9999; z-index: 9999;
overflow: hidden; overflow: hidden;
} }
#editor-container #editor { #editor-container #editor {
height: calc(100vh - 8.4em); flex: 1;
} }
#editor-container .breadcrumbs { #editor-container .breadcrumbs {