From 28868e60f870afb53675145e2ec11cb08e642ec7 Mon Sep 17 00:00:00 2001 From: Ben Haynes Date: Fri, 10 Sep 2021 15:01:58 -0400 Subject: [PATCH] Various style updates (#7972) * fix card selection dot always being on * new mapbox styles * updated styles for field notes * update bookmark icon * increase currrent user avatar opactiy * Clean up info notes * divider style updates * divider rule styling * notice styling * update revision drawer pane order * tighten up revision drawer list * notice copy updates * revision spacing * revision date divider styling * shorter revision date in drawer dropdown * add no value to revision diffs * v-detail icons * revisions styling * fix sort icon hover * adjust global and private vertical form spacing * reduce navigation and v-list sizing * slightly reduce module and info sidebar size --- app/src/components/v-avatar/v-avatar.vue | 2 +- app/src/components/v-button/v-button.vue | 2 +- app/src/components/v-detail/v-detail.vue | 2 +- app/src/components/v-form/form-field.vue | 7 ++-- app/src/components/v-info/v-info.vue | 1 + app/src/components/v-list/v-list-item.vue | 4 +-- app/src/components/v-notice/v-notice.vue | 5 +++ .../presentation-divider.vue | 4 ++- app/src/lang/translations/en-US.yaml | 9 ++--- app/src/layouts/cards/components/card.vue | 34 +++++++++++++------ app/src/layouts/cards/components/header.vue | 3 +- .../components/navigation-bookmark.vue | 2 +- app/src/styles/_type-styles.scss | 4 +++ app/src/styles/_variables.scss | 2 +- app/src/styles/mixins/type-styles.scss | 9 +++++ app/src/utils/geometry/basemap.ts | 4 +-- .../components/header-bar/header-bar.vue | 4 +-- .../module-bar-avatar/module-bar-avatar.vue | 2 +- .../module-bar-logo/module-bar-logo.vue | 12 +++---- .../components/module-bar/module-bar.vue | 2 +- .../components/project-info/project-info.vue | 2 +- .../revisions-drawer-detail/revision-item.vue | 4 +-- .../revisions-drawer-detail.vue | 11 ++++-- .../revisions-drawer-picker.vue | 2 +- .../revisions-drawer-updates-change.vue | 22 +++++++++--- .../revisions-drawer-updates.vue | 2 +- .../revisions-drawer.vue | 12 +++---- .../sidebar-button/sidebar-button.vue | 4 +-- .../sidebar-detail/sidebar-detail.vue | 8 ++--- app/src/views/private/private-view.vue | 11 +++--- 30 files changed, 120 insertions(+), 72 deletions(-) diff --git a/app/src/components/v-avatar/v-avatar.vue b/app/src/components/v-avatar/v-avatar.vue index 3257c69630..ec1e5f1ecf 100644 --- a/app/src/components/v-avatar/v-avatar.vue +++ b/app/src/components/v-avatar/v-avatar.vue @@ -65,7 +65,7 @@ body { } .large { - --v-avatar-size: 64px; + --v-avatar-size: 60px; } .x-large { diff --git a/app/src/components/v-button/v-button.vue b/app/src/components/v-button/v-button.vue index e94c11012d..764030538a 100644 --- a/app/src/components/v-button/v-button.vue +++ b/app/src/components/v-button/v-button.vue @@ -314,7 +314,7 @@ export default defineComponent({ } .x-large { - --v-button-height: 64px; + --v-button-height: 60px; --v-button-font-size: 18px; --v-button-min-width: 180px; diff --git a/app/src/components/v-detail/v-detail.vue b/app/src/components/v-detail/v-detail.vue index fca5a29c9f..03167c464c 100644 --- a/app/src/components/v-detail/v-detail.vue +++ b/app/src/components/v-detail/v-detail.vue @@ -2,7 +2,7 @@
- + {{ label }} diff --git a/app/src/components/v-form/form-field.vue b/app/src/components/v-form/form-field.vue index f5730b0e50..19833c6777 100644 --- a/app/src/components/v-form/form-field.vue +++ b/app/src/components/v-form/form-field.vue @@ -50,7 +50,7 @@ - + {{ validationMessage }} @@ -217,12 +217,11 @@ export default defineComponent({ position: relative; } -.note { +.type-note { + position: relative; display: block; max-width: 520px; margin-top: 4px; - color: var(--foreground-subdued); - font-style: italic; } .invalid { diff --git a/app/src/components/v-info/v-info.vue b/app/src/components/v-info/v-info.vue index cd269a0fa5..f4ab85a386 100644 --- a/app/src/components/v-info/v-info.vue +++ b/app/src/components/v-info/v-info.vue @@ -79,6 +79,7 @@ export default defineComponent({ .content { max-width: 300px; color: var(--foreground-subdued); + line-height: 22px; &:not(:last-child) { margin-bottom: 24px; diff --git a/app/src/components/v-list/v-list-item.vue b/app/src/components/v-list/v-list-item.vue index 82678525cb..1e1ef3aad0 100644 --- a/app/src/components/v-list/v-list-item.vue +++ b/app/src/components/v-list/v-list-item.vue @@ -130,11 +130,11 @@ export default defineComponent({ body { --v-list-item-padding-large: 0 8px; --v-list-item-padding: 0 8px 0 calc(8px + var(--v-list-item-indent, 0px)); - --v-list-item-margin-large: 4px 0; + --v-list-item-margin-large: 2px 0; --v-list-item-margin: 2px 0; --v-list-item-min-width: none; --v-list-item-max-width: none; - --v-list-item-min-height-large: 40px; + --v-list-item-min-height-large: 36px; --v-list-item-min-height: 32px; --v-list-item-max-height: auto; --v-list-item-border-radius: var(--border-radius); diff --git a/app/src/components/v-notice/v-notice.vue b/app/src/components/v-notice/v-notice.vue index 39800654e4..e22ad5719d 100644 --- a/app/src/components/v-notice/v-notice.vue +++ b/app/src/components/v-notice/v-notice.vue @@ -64,6 +64,7 @@ body { min-height: var(--input-height); padding: 12px 16px; color: var(--v-notice-color); + line-height: 22px; background-color: var(--v-notice-background-color); border-radius: var(--border-radius); } @@ -72,6 +73,10 @@ body { --v-icon-color: var(--v-notice-icon-color); } +.v-icon.left { + margin-right: 16px; +} + .info { --v-notice-icon-color: var(--primary); --v-notice-background-color: var(--background-normal); diff --git a/app/src/interfaces/presentation-divider/presentation-divider.vue b/app/src/interfaces/presentation-divider/presentation-divider.vue index b5d6ef0e76..d182c916a4 100644 --- a/app/src/interfaces/presentation-divider/presentation-divider.vue +++ b/app/src/interfaces/presentation-divider/presentation-divider.vue @@ -3,6 +3,7 @@ :class="{ margin: icon || title }" :style="{ '--v-divider-label-color': color, + '--v-divider-color': 'var(--border-subdued)', }" large :inline-title="inlineTitle" @@ -39,6 +40,7 @@ export default defineComponent({ diff --git a/app/src/lang/translations/en-US.yaml b/app/src/lang/translations/en-US.yaml index 1ff37c5142..07c0ffb751 100644 --- a/app/src/lang/translations/en-US.yaml +++ b/app/src/lang/translations/en-US.yaml @@ -150,9 +150,9 @@ fields_for_role: 'Fields the {role} Role can {action}.' validation_for_role: 'Field {action} rules the {role} Role must obey.' presets_for_role: 'Field value defaults for the {role} Role.' presentation_and_aliases: Presentation & Aliases -revision_post_update: Here is what this item looked like after the update... -changes_made: These are the specific changes that were made... -no_relational_data: Keep in mind that this does not include relational data. +revision_post_update: Here is what this item looked like after the update. +changes_made: Below are the specific changes made in this revision. +no_relational_data: Keep in mind that relational data is not included here. hide_field_on_detail: Hide Field on Detail show_field_on_detail: Show Field on Detail delete_field: Delete Field @@ -391,7 +391,7 @@ no_files_copy: There are no files here. user_count: 'No Users | One User | {count} Users' no_users_copy: There are no users in this role yet. webhooks_count: 'No Webhooks | One Webhook | {count} Webhooks' -no_webhooks_copy: There are no webhooks yet. +no_webhooks_copy: No webhooks have been configured yet. Get started by creating one below. all_items: All Items any: Any csv: CSV @@ -992,6 +992,7 @@ field_options: actions_delete: Delete actions_login: Login no_fields_in_collection: 'There are no fields in "{collection}" yet' +no_value: No value do_nothing: Do Nothing generate_and_save_uuid: Generate and Save UUID save_current_user_id: Save Current User ID diff --git a/app/src/layouts/cards/components/card.vue b/app/src/layouts/cards/components/card.vue index 2517b2320f..df32c5a4ea 100644 --- a/app/src/layouts/cards/components/card.vue +++ b/app/src/layouts/cards/components/card.vue @@ -1,12 +1,12 @@