From ad4906b7203b436116a2d516e26e0ab1f0abc88f Mon Sep 17 00:00:00 2001 From: rijkvanzanten Date: Thu, 11 Jun 2020 11:40:39 -0400 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit aa2876a64653f3cca2f35e513fdd1c370da14438 Merge: ee219e87 fd5ccb5e Author: rijkvanzanten Date: Thu Jun 11 11:39:49 2020 -0400 Merge branch 'master' into tweaks commit ee219e872b4b41f3e0673dc673c8bb643e5f5f20 Merge: bf3dca79 16cb51de Author: rijkvanzanten Date: Thu Jun 11 11:39:34 2020 -0400 Merge branch 'master' into tweaks commit bf3dca7906f031fea771c3a20c0529782416056d Merge: 1e114c0b 51c59cda Author: Ben Haynes Date: Thu Jun 11 10:59:51 2020 -0400 Merge branch 'master' into tweaks commit 1e114c0b5660a25574c3a0551fc4e87261d45e20 Author: Ben Haynes Date: Thu Jun 11 10:59:25 2020 -0400 preset field styling commit 43f3fbc98a68b6898294ed4c68a6240c1f8a72e8 Author: Ben Haynes Date: Thu Jun 11 10:58:56 2020 -0400 differentiate nested repeaters commit 6a4d9c9df64efd9161ce862d8b29c3be04dc90cb Author: Ben Haynes Date: Thu Jun 11 10:58:27 2020 -0400 repeater sizing commit ec136f0d3b1314f941afaeade6458b36266634fc Author: Ben Haynes Date: Wed Jun 10 19:37:25 2020 -0400 checkbox contract and hover styling commit 0118c0c76f7a650d567965accea972e68336e1d7 Author: Ben Haynes Date: Wed Jun 10 19:36:32 2020 -0400 increase repeater item edge contrast commit dc852c4e78989dc421c61b71f13058add86077f3 Author: Ben Haynes Date: Wed Jun 10 19:13:54 2020 -0400 fix repeater field spacing commit 23da947ad5f1b84127411f6b9e271414140348a3 Author: Ben Haynes Date: Wed Jun 10 19:13:42 2020 -0400 no “editing” on role title commit d84eaa7f3a8ec2a25d67514d5507a46e24521a6a Merge: 0f512448 79f1f13a Author: Ben Haynes Date: Wed Jun 10 18:29:01 2020 -0400 Merge branch 'master' into tweaks commit 0f512448b76ab2c53f1a9059e2a130d52cc52b60 Merge: 7974bd2a 0c5b0a6f Author: Ben Haynes Date: Wed Jun 10 16:18:01 2020 -0400 Merge branch 'master' into tweaks commit 7974bd2a81e2be5b4a2e1b24bf3ede017562bcf8 Author: Ben Haynes Date: Wed Jun 10 16:17:30 2020 -0400 project settings link to docs commit de46007be6eb5ff59332571b7c18caaba4ed815c Author: Ben Haynes Date: Wed Jun 10 14:50:05 2020 -0400 use new folder_move icon commit 0ac93d84f0f577d6cedda9a7498dd4caa3064fc9 Author: Ben Haynes Date: Wed Jun 10 14:49:46 2020 -0400 add custom “folder move” icon commit dd057f0c6fda81b5c1aa696f893c8e2e53d83ed7 Merge: 4034025c 51b939be Author: Ben Haynes Date: Wed Jun 10 14:36:19 2020 -0400 Merge branch 'master' into tweaks commit 4034025cb3577def69f4540d1160c8be23b98c4a Author: Ben Haynes Date: Wed Jun 10 14:35:32 2020 -0400 more room for revision text commit c840e622db5d83db02ff279736eb9bc5c0fcd98d Author: Ben Haynes Date: Wed Jun 10 14:35:15 2020 -0400 fix revision header layering commit 3e5804a9fc6db0f7c7b5e35a4f6ea9f0aae563b5 Author: Ben Haynes Date: Wed Jun 10 14:34:50 2020 -0400 hide user box when new commit 485bc26f887198f0726e62efb71c94c9140eccaf Author: Ben Haynes Date: Wed Jun 10 13:44:49 2020 -0400 fix select all/none on cards commit bdc3615fbbe9ab29b5a132eeda1e2ced6aece4b7 Author: Ben Haynes 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 Date: Wed Jun 10 10:39:56 2020 -0400 Merge branch 'master' into tweaks commit dfd006a57f9a72718a4adcd6528bb45206542ea2 Merge: 01100fea e2e86957 Author: Ben Haynes Date: Tue Jun 9 18:20:08 2020 -0400 Merge branch 'master' into tweaks commit 01100fead3ef23fcb6b447544f17cb08e49e0d7a Merge: 809e7900 945a19ca Author: Ben Haynes 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 Date: Tue Jun 9 17:15:07 2020 -0400 Merge branch 'master' into tweaks commit 84e484b163db2b055e07c8e08a9bfbe09d3df20a Author: Ben Haynes Date: Mon Jun 8 18:58:28 2020 -0400 fix missing card hover shadow --- src/components/v-checkbox/v-checkbox.vue | 6 +- .../v-icon/custom-icons/folder_move.vue | 21 +++++++ src/components/v-icon/v-icon.vue | 3 + src/interfaces/repeater/repeater-row-form.vue | 5 +- src/interfaces/repeater/repeater-row.vue | 8 +++ src/lang/en-US/index.json | 7 ++- src/layouts/cards/components/card.vue | 10 +++ src/layouts/cards/components/header.vue | 63 ++++++++++++++----- src/modules/files/routes/browse/browse.vue | 2 +- src/modules/files/routes/detail/detail.vue | 2 +- .../settings/routes/presets/detail/detail.vue | 4 ++ src/modules/users/routes/detail/detail.vue | 2 +- .../revisions-drawer-detail/revision-item.vue | 6 +- .../revisions-drawer-detail.vue | 4 +- 14 files changed, 110 insertions(+), 33 deletions(-) create mode 100644 src/components/v-icon/custom-icons/folder_move.vue diff --git a/src/components/v-checkbox/v-checkbox.vue b/src/components/v-checkbox/v-checkbox.vue index 125460d21c..2a56e22788 100644 --- a/src/components/v-checkbox/v-checkbox.vue +++ b/src/components/v-checkbox/v-checkbox.vue @@ -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 { diff --git a/src/components/v-icon/custom-icons/folder_move.vue b/src/components/v-icon/custom-icons/folder_move.vue new file mode 100644 index 0000000000..0fdd11415f --- /dev/null +++ b/src/components/v-icon/custom-icons/folder_move.vue @@ -0,0 +1,21 @@ + + + diff --git a/src/components/v-icon/v-icon.vue b/src/components/v-icon/v-icon.vue index 73d269e712..d7792fb696 100644 --- a/src/components/v-icon/v-icon.vue +++ b/src/components/v-icon/v-icon.vue @@ -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: { diff --git a/src/interfaces/repeater/repeater-row-form.vue b/src/interfaces/repeater/repeater-row-form.vue index 35f8c9fd6b..d647915c7a 100644 --- a/src/interfaces/repeater/repeater-row-form.vue +++ b/src/interfaces/repeater/repeater-row-form.vue @@ -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; } } diff --git a/src/interfaces/repeater/repeater-row.vue b/src/interfaces/repeater/repeater-row.vue index a674734d30..531d66c881 100644 --- a/src/interfaces/repeater/repeater-row.vue +++ b/src/interfaces/repeater/repeater-row.vue @@ -53,10 +53,18 @@ export default defineComponent({ diff --git a/src/lang/en-US/index.json b/src/lang/en-US/index.json index e10e5551e6..4afd41d821 100644 --- a/src/lang/en-US/index.json +++ b/src/lang/en-US/index.json @@ -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.

Learn More", "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.

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.", diff --git a/src/layouts/cards/components/card.vue b/src/layouts/cards/components/card.vue index cab8cc737c..c83daef6b6 100644 --- a/src/layouts/cards/components/card.vue +++ b/src/layouts/cards/components/card.vue @@ -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; } diff --git a/src/layouts/cards/components/header.vue b/src/layouts/cards/components/header.vue index 46a651fd8e..702dccd32e 100644 --- a/src/layouts/cards/components/header.vue +++ b/src/layouts/cards/components/header.vue @@ -1,11 +1,14 @@
-
+
diff --git a/src/views/private/components/revisions-drawer-detail/revision-item.vue b/src/views/private/components/revisions-drawer-detail/revision-item.vue index 127adf9206..9faa5ab8d7 100644 --- a/src/views/private/components/revisions-drawer-detail/revision-item.vue +++ b/src/views/private/components/revisions-drawer-detail/revision-item.vue @@ -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); diff --git a/src/views/private/components/revisions-drawer-detail/revisions-drawer-detail.vue b/src/views/private/components/revisions-drawer-detail/revisions-drawer-detail.vue index ed1dbc86d7..b5b4658622 100644 --- a/src/views/private/components/revisions-drawer-detail/revisions-drawer-detail.vue +++ b/src/views/private/components/revisions-drawer-detail/revisions-drawer-detail.vue @@ -20,7 +20,7 @@