github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-28 10:28:10 -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

6
src/components/v-checkbox/v-checkbox.vue
View File

@@ -133,7 +133,6 @@ body {
.label:not(:empty) {
margin-left: 8px;
color: var(--foreground-subdued);
transition: color var(--fast) var(--transition);
input {
@@ -169,9 +168,6 @@ body {
.checkbox {
--v-icon-color: var(--foreground-normal);
}
.label {
color: var(--foreground-normal);
}
}
&.block {
@@ -179,7 +175,7 @@ body {
width: 100%;
height: var(--input-height);
padding: 10px; // 14 - 4 (border)
border: 2px solid var(--background-subdued);
border: 2px solid var(--border-subdued);
border-radius: var(--border-radius);
&::before {

21
src/components/v-icon/custom-icons/folder_move.vue Normal file
View File

@@ -0,0 +1,21 @@
<template functional>
<svg
viewBox="0 0 24 24"
width="24"
height="24"
fill="none"
fill-rule="evenodd"
clip-rule="evenodd"
stroke-linejoin="round"
stroke-miterlimit="2"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M20 6h-8l-2-2H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V8c0-1.1-.9-2-2-2zm.295 7l-5-5v2.852H11v4.296h4.295V18l5-5z"
/>
</svg>
</template>
<script lang="ts">
export default {};
</script>

3
src/components/v-icon/v-icon.vue
View File

@@ -28,6 +28,7 @@ import CustomIconSignalWifi2Bar from './custom-icons/signal_wifi_2_bar.vue';
import CustomIconSignalWifi3Bar from './custom-icons/signal_wifi_3_bar.vue';
import CustomIconFlipHorizontal from './custom-icons/flip_horizontal.vue';
import CustomIconFlipVertical from './custom-icons/flip_vertical.vue';
import CustomIconFolderMove from './custom-icons/folder_move.vue';
const customIcons: string[] = [
'box',
@@ -43,6 +44,7 @@ const customIcons: string[] = [
'signal_wifi_3_bar',
'flip_horizontal',
'flip_vertical',
'folder_move',
];
export default defineComponent({
@@ -60,6 +62,7 @@ export default defineComponent({
CustomIconSignalWifi3Bar,
CustomIconFlipHorizontal,
CustomIconFlipVertical,
CustomIconFolderMove,
},
props: {
name: {

5
src/interfaces/repeater/repeater-row-form.vue
View File

@@ -31,13 +31,14 @@ export default defineComponent({
@import '@/styles/mixins/type-styles.scss';
.form {
--form-vertical-gap: 24px;
--form-horizontal-gap: 12px;
--v-form-vertical-gap: 24px;
--v-form-horizontal-gap: 24px;
padding: 12px;
padding-top: 0;
::v-deep .type-label {
font-weight: 600;
@include type-text;
}
}

8
src/interfaces/repeater/repeater-row.vue
View File

@@ -53,10 +53,18 @@ export default defineComponent({
<style lang="scss" scoped>
.row {
background-color: var(--background-subdued);
border: 2px solid var(--border-subdued);
border-radius: var(--border-radius);
& + .row {
margin-top: 8px;
}
.repeater {
.row {
background-color: var(--background-page);
border-color: var(--border-normal);
}
}
}
</style>

7
src/lang/en-US/index.json
View File

@@ -73,7 +73,7 @@
"confirm_revert": "Confirm Revert",
"confirm_revert_body": "This will revert the item to the selected state.",
"editing_role": "Editing {role} Role",
"editing_role": "{role} Role",
"editing_webhook": "Editing Webhook",
"code": "Code",
@@ -600,6 +600,7 @@
"editing_file": "Editing File: {title}",
"changes_are_immediate_and_permanent": "Changes are immediate and permanent",
"preset_name_placeholder": "Name of bookmark...",
"editing_preset": "Editing Preset",
"layout_preview": "Layout Preview",
"layout_setup": "Layout Setup",
@@ -616,13 +617,13 @@
"page_help_activity_detail": "**Activity Detail** — Shows accountability info, revision data, and the update message for this activity record.",
"page_help_files_browse": "**File Library** — Lists all file assets uploaded to this project. Customize layout, filters, and sorting to tailor your view, and even save bookmarks of these different configurations for quick access.",
"page_help_files_detail": "**File Detail** — A form for managing file metadata, editing the original asset, and updating access settings.",
"page_help_settings_project": "**Project Settings** — Your project's global configuration options.",
"page_help_settings_project": "**Project Settings** — Your project's global configuration options.<br><br><a href='https://docs.directus.io/guides/admin-guide.html#global-settings' target='_blank'>Learn More</a>",
"page_help_settings_datamodel_collections": "**Data Model: Collections** — Lists all collections available. This includes visible, hidden, and system collections, as well as unmanaged database tables that can be added.",
"page_help_settings_datamodel_fields": "**Data Model: Collection** — A form for managing this collection and its fields.",
"page_help_settings_roles_browse": "**Browse Roles** — Lists the Admin, Public and custom User Roles.",
"page_help_settings_roles_detail": "**Role Detail** — Manage a role's permissions and other settings.",
"page_help_settings_presets_browse": "**Browse Presets** — Lists all presets in the project, including: user, role, and global bookmarks, as well as default views.",
"page_help_settings_presets_detail": "**Preset Detail** — A form for managing bookmarks and default collection presets.",
"page_help_settings_presets_detail": "**Preset Detail** — A form for managing bookmarks and default collection presets.<br><br>To create a default preset, choose a role... TK TK",
"page_help_settings_webhooks_browse": "**Browse Webhooks** — Lists all webhooks within the project.",
"page_help_settings_webhooks_detail": "**Webhook Detail** — A form for creating and managing project webhooks.",
"page_help_users_browse": "**User Directory** — Lists all system users within this project.",

10
src/layouts/cards/components/card.vue
View File

@@ -221,6 +221,16 @@ export default defineComponent({
opacity: 0;
transition: opacity var(--fast) var(--transition);
&::before {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-image: linear-gradient(-180deg, rgba(38, 50, 56, 0.2) 10%, rgba(38, 50, 56, 0));
content: '';
}
&.select-mode {
opacity: 1;
}

63
src/layouts/cards/components/header.vue
View File

@@ -1,11 +1,14 @@
<template>
<div class="cards-header">
<div class="start">
<div class="selected" v-if="_selection.length > 0">
<v-icon name="close" @click="_selection = []" />
{{ $tc('n_items_selected', _selection.length) }}
<div class="selected" v-if="_selection.length > 0" @click="_selection = []">
<v-icon name="cancel" />
<span class="label">{{ $tc('n_items_selected', _selection.length) }}</span>
</div>
<button class="select-all" v-else @click="$emit('select-all')">{{ $t('select_all') }}</button>
<button class="select-all" v-else @click="$emit('select-all')">
<v-icon name="check_circle" />
<span class="label">{{ $t('select_all') }}</span>
</button>
</div>
<div class="end">
<v-icon
@@ -131,6 +134,27 @@ export default defineComponent({
box-shadow: 0 0 0 2px var(--background-page);
}
.start {
.label {
display: inline-block;
margin-left: 4px;
transform: translateY(1px);
}
.select-all {
color: var(--foreground-subdued);
transition: color var(--fast) var(--transition);
&:hover {
color: var(--foreground-normal);
}
}
.selected {
cursor: pointer;
}
}
.end {
display: flex;
align-items: center;
@@ -138,25 +162,34 @@ export default defineComponent({
.size-selector {
margin-right: 16px;
transition: color var(--fast) var(--transition);
&:hover {
color: var(--foreground-normal);
}
}
.sort-selector {
margin-right: 8px;
transition: color var(--fast) var(--transition);
&:hover {
color: var(--foreground-normal);
cursor: pointer;
}
}
.sort-selector:hover {
color: var(--foreground-normal);
cursor: pointer;
}
.sort-direction {
transition: color var(--fast) var(--transition);
&.descending {
transform: scaleY(-1);
}
.sort-direction.descending {
transform: scaleY(-1);
}
&:hover {
--v-icon-color: var(--foreground-normal);
.sort-direction:hover {
--v-icon-color: var(--foreground-normal);
cursor: pointer;
cursor: pointer;
}
}
}
</style>

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" />

6
src/views/private/components/revisions-drawer-detail/revision-item.vue
View File

@@ -78,7 +78,7 @@ export default defineComponent({
.revision-item {
position: relative;
margin-bottom: 16px;
margin-left: 20px;
margin-left: 16px;
.header {
position: relative;
@@ -88,7 +88,7 @@ export default defineComponent({
.dot {
position: absolute;
top: 6px;
left: -22px;
left: -18px;
z-index: 2;
width: 12px;
height: 12px;
@@ -113,7 +113,7 @@ export default defineComponent({
&:not(.last)::after {
position: absolute;
top: 12px;
left: -17px;
left: -13px;
z-index: 1;
width: 2px;
height: calc(100% + 12px);

4
src/views/private/components/revisions-drawer-detail/revisions-drawer-detail.vue
View File

@@ -20,7 +20,7 @@
</template>
<template v-if="loading === false && hasCreate === false">
<v-divider />
<v-divider v-if="revisionsByDate.length > 0" />
<div class="external">
{{ $t('revision_delta_created_externally') }}
</div>
@@ -201,7 +201,7 @@ export default defineComponent({
.v-divider {
position: sticky;
top: 0;
z-index: 2;
z-index: 3;
margin-top: 8px;
margin-bottom: 8px;
padding-top: 8px;