diff --git a/models/lead/src/index.ts b/models/lead/src/index.ts index 2fd6a7dd7b..e7d2763578 100644 --- a/models/lead/src/index.ts +++ b/models/lead/src/index.ts @@ -324,7 +324,6 @@ export function createModel (builder: Builder): void { sortingKey: '$lookup.attachedTo.name', props: { _class: lead.mixin.Customer, - inline: true, maxWidth: '10rem' } }, diff --git a/models/lead/src/plugin.ts b/models/lead/src/plugin.ts index d3933d974d..7d95cb3b20 100644 --- a/models/lead/src/plugin.ts +++ b/models/lead/src/plugin.ts @@ -29,7 +29,6 @@ export default mergeIds(leadId, lead, { Funnel: '' as IntlString, Funnels: '' as IntlString, LeadApplication: '' as IntlString, - Lead: '' as IntlString, Title: '' as IntlString, ManageFunnelStatuses: '' as IntlString, GotoLeadApplication: '' as IntlString, diff --git a/models/recruit/src/index.ts b/models/recruit/src/index.ts index 0e66e96b9b..9c9d4b37fe 100644 --- a/models/recruit/src/index.ts +++ b/models/recruit/src/index.ts @@ -695,8 +695,7 @@ export function createModel (builder: Builder): void { label: recruit.string.Talent, sortingKey: '$lookup.attachedTo.name', props: { - _class: recruit.mixin.Candidate, - inline: true + _class: recruit.mixin.Candidate } }, { key: 'attachments', displayProps: { key: 'attachments', suffix: true } }, @@ -712,7 +711,6 @@ export function createModel (builder: Builder): void { key: '$lookup.space.company', displayProps: { fixed: 'left', key: 'company' }, props: { - inline: true, maxWidth: '10rem' } }, diff --git a/packages/presentation/src/components/NavLink.svelte b/packages/presentation/src/components/NavLink.svelte index 0a917f4414..698ec93d29 100644 --- a/packages/presentation/src/components/NavLink.svelte +++ b/packages/presentation/src/components/NavLink.svelte @@ -91,21 +91,24 @@ &:not(.colorInherit) { color: var(--theme-content-color); } - &.colorInherit { + &.colorInherit, + &.inline { color: inherit; } &.inline { display: inline-flex; align-items: center; + text-decoration: none; } &.noUnderline { + text-decoration: none; &:not(.colorInherit) { color: var(--theme-caption-color); } } - &:not(.noUnderline) { + &:not(.noUnderline, .inline) { &:hover { text-decoration: underline; &:not(.colorInherit) { diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss index b8754a518f..87bcea3305 100644 --- a/packages/theme/styles/_layouts.scss +++ b/packages/theme/styles/_layouts.scss @@ -278,6 +278,12 @@ input.search { .flex-gap-1-5 { gap: .375rem; } .flex-gap-1 { gap: .25rem; } +.flex-between-half-content > * { + flex-basis: 50%; + + &:last-child { justify-content: flex-end; } +} + .flex-break { flex-basis: 100%; height: 0; diff --git a/plugins/chunter-resources/src/components/Message.svelte b/plugins/chunter-resources/src/components/Message.svelte index 1d8328d4f5..e2e79aaee3 100644 --- a/plugins/chunter-resources/src/components/Message.svelte +++ b/plugins/chunter-resources/src/components/Message.svelte @@ -208,7 +208,7 @@