github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-02-03 17:05:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit aa2876a64653f3cca2f35e513fdd1c370da14438
Merge: ee219e87 fd5ccb5e
Author: rijkvanzanten <rijkvanzanten@me.com>
Date:   Thu Jun 11 11:39:49 2020 -0400

    Merge branch 'master' into tweaks

commit ee219e872b4b41f3e0673dc673c8bb643e5f5f20
Merge: bf3dca79 16cb51de
Author: rijkvanzanten <rijkvanzanten@me.com>
Date:   Thu Jun 11 11:39:34 2020 -0400

    Merge branch 'master' into tweaks

commit bf3dca7906f031fea771c3a20c0529782416056d
Merge: 1e114c0b 51c59cda
Author: Ben Haynes <ben@rngr.org>
Date:   Thu Jun 11 10:59:51 2020 -0400

    Merge branch 'master' into tweaks

commit 1e114c0b5660a25574c3a0551fc4e87261d45e20
Author: Ben Haynes <ben@rngr.org>
Date:   Thu Jun 11 10:59:25 2020 -0400

    preset field styling

commit 43f3fbc98a68b6898294ed4c68a6240c1f8a72e8
Author: Ben Haynes <ben@rngr.org>
Date:   Thu Jun 11 10:58:56 2020 -0400

    differentiate nested repeaters

commit 6a4d9c9df64efd9161ce862d8b29c3be04dc90cb
Author: Ben Haynes <ben@rngr.org>
Date:   Thu Jun 11 10:58:27 2020 -0400

    repeater sizing

commit ec136f0d3b1314f941afaeade6458b36266634fc
Author: Ben Haynes <ben@rngr.org>
Date:   Wed Jun 10 19:37:25 2020 -0400

    checkbox contract and hover styling

commit 0118c0c76f7a650d567965accea972e68336e1d7
Author: Ben Haynes <ben@rngr.org>
Date:   Wed Jun 10 19:36:32 2020 -0400

    increase repeater item edge contrast

commit dc852c4e78989dc421c61b71f13058add86077f3
Author: Ben Haynes <ben@rngr.org>
Date:   Wed Jun 10 19:13:54 2020 -0400

    fix repeater field spacing

commit 23da947ad5f1b84127411f6b9e271414140348a3
Author: Ben Haynes <ben@rngr.org>
Date:   Wed Jun 10 19:13:42 2020 -0400

    no “editing” on role title

commit d84eaa7f3a8ec2a25d67514d5507a46e24521a6a
Merge: 0f512448 79f1f13a
Author: Ben Haynes <ben@rngr.org>
Date:   Wed Jun 10 18:29:01 2020 -0400

    Merge branch 'master' into tweaks

commit 0f512448b76ab2c53f1a9059e2a130d52cc52b60
Merge: 7974bd2a 0c5b0a6f
Author: Ben Haynes <ben@rngr.org>
Date:   Wed Jun 10 16:18:01 2020 -0400

    Merge branch 'master' into tweaks

commit 7974bd2a81e2be5b4a2e1b24bf3ede017562bcf8
Author: Ben Haynes <ben@rngr.org>
Date:   Wed Jun 10 16:17:30 2020 -0400

    project settings link to docs

commit de46007be6eb5ff59332571b7c18caaba4ed815c
Author: Ben Haynes <ben@rngr.org>
Date:   Wed Jun 10 14:50:05 2020 -0400

    use new folder_move icon

commit 0ac93d84f0f577d6cedda9a7498dd4caa3064fc9
Author: Ben Haynes <ben@rngr.org>
Date:   Wed Jun 10 14:49:46 2020 -0400

    add custom “folder move” icon

commit dd057f0c6fda81b5c1aa696f893c8e2e53d83ed7
Merge: 4034025c 51b939be
Author: Ben Haynes <ben@rngr.org>
Date:   Wed Jun 10 14:36:19 2020 -0400

    Merge branch 'master' into tweaks

commit 4034025cb3577def69f4540d1160c8be23b98c4a
Author: Ben Haynes <ben@rngr.org>
Date:   Wed Jun 10 14:35:32 2020 -0400

    more room for revision text

commit c840e622db5d83db02ff279736eb9bc5c0fcd98d
Author: Ben Haynes <ben@rngr.org>
Date:   Wed Jun 10 14:35:15 2020 -0400

    fix revision header layering

commit 3e5804a9fc6db0f7c7b5e35a4f6ea9f0aae563b5
Author: Ben Haynes <ben@rngr.org>
Date:   Wed Jun 10 14:34:50 2020 -0400

    hide user box when new

commit 485bc26f887198f0726e62efb71c94c9140eccaf
Author: Ben Haynes <ben@rngr.org>
Date:   Wed Jun 10 13:44:49 2020 -0400

    fix select all/none on cards

commit bdc3615fbbe9ab29b5a132eeda1e2ced6aece4b7
Author: Ben Haynes <ben@rngr.org>
Date:   Wed Jun 10 13:44:27 2020 -0400

    only show divider if there are other revisions

commit 1bdb9644be621adbd6edca1d9ce49825518c02a0
Merge: dfd006a5 aa23da68
Author: Ben Haynes <ben@rngr.org>
Date:   Wed Jun 10 10:39:56 2020 -0400

    Merge branch 'master' into tweaks

commit dfd006a57f9a72718a4adcd6528bb45206542ea2
Merge: 01100fea e2e86957
Author: Ben Haynes <ben@rngr.org>
Date:   Tue Jun 9 18:20:08 2020 -0400

    Merge branch 'master' into tweaks

commit 01100fead3ef23fcb6b447544f17cb08e49e0d7a
Merge: 809e7900 945a19ca
Author: Ben Haynes <ben@rngr.org>
Date:   Tue Jun 9 18:06:04 2020 -0400

    Merge branch 'master' of https://github.com/directus/app-next into tweaks

commit 809e7900b8b5e04e389c61b78daa8c0237ce17d9
Merge: 84e484b1 b4491602
Author: Ben Haynes <ben@rngr.org>
Date:   Tue Jun 9 17:15:07 2020 -0400

    Merge branch 'master' into tweaks

commit 84e484b163db2b055e07c8e08a9bfbe09d3df20a
Author: Ben Haynes <ben@rngr.org>
Date:   Mon Jun 8 18:58:28 2020 -0400

    fix missing card hover shadow
This commit is contained in:
rijkvanzanten
2020-06-11 11:40:39 -04:00
parent fd5ccb5ee8
commit ad4906b720
14 changed files with 110 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/files/routes/browse/browse.vue
View File

@@ -18,7 +18,7 @@
<v-dialog v-model="moveToDialogActive" v-if="selection.length > 0">
<template #activator="{ on }">
<v-button rounded icon @click="on" class="folder">
<v-icon name="folder" />
<v-icon name="folder_move" />
</v-button>
</template>

2
src/modules/files/routes/detail/detail.vue
View File

@@ -35,7 +35,7 @@
<v-dialog v-model="moveToDialogActive" v-if="isNew === false">
<template #activator="{ on }">
<v-button rounded icon :disabled="item === null" @click="on" class="folder">
<v-icon name="folder" />
<v-icon name="folder_move" />
</v-button>
</template>

4
src/modules/settings/routes/presets/detail/detail.vue
View File

@@ -469,6 +469,9 @@ export default defineComponent({
name: i18n.t('name'),
interface: 'text-input',
width: 'half',
options: {
placeholder: i18n.t('preset_name_placeholder'),
},
},
{
field: 'divider',
@@ -477,6 +480,7 @@ export default defineComponent({
width: 'fill',
options: {
title: i18n.t('layout_preview'),
color: '#2F80ED',
},
},
]);

2
src/modules/users/routes/detail/detail.vue
View File

@@ -51,7 +51,7 @@
</template>
<div class="user-detail">
<div class="user-box">
<div class="user-box" v-if="isNew === false">
<div class="avatar">
<v-skeleton-loader v-if="loading || previewLoading" />
<img v-else-if="avatarSrc" :src="avatarSrc" :alt="item.first_name" />