Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ui: Public Collections UI Nitpicks #2287

Merged
merged 10 commits into from
Jan 9, 2025
17 changes: 15 additions & 2 deletions frontend/src/components/ui/markdown-editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,14 @@ export class MarkdownEditor extends BtrixElement {
--ink-block-padding: var(--sl-input-spacing-small);
}

.ink-mde-textarea {
flex-grow: 1;
}

.ink-mde {
height: 100%;
}

.ink-mde {
border: solid var(--sl-input-border-width) var(--sl-input-border-color);
}
Expand Down Expand Up @@ -56,7 +64,8 @@ export class MarkdownEditor extends BtrixElement {
}

.cm-line:only-child {
min-height: 8em;
height: 100%;
min-height: 20em;
}
`;

Expand Down Expand Up @@ -111,7 +120,11 @@ export class MarkdownEditor extends BtrixElement {
render() {
const isInvalid = this.maxlength && this.value.length > this.maxlength;
return html`
<fieldset ?data-invalid=${isInvalid} ?data-user-invalid=${isInvalid}>
<fieldset
?data-invalid=${isInvalid}
?data-user-invalid=${isInvalid}
class="flex h-full flex-col"
>
${this.label && html`<label class="form-label">${this.label}</label>`}
<textarea id="editor-textarea"></textarea>
<div class="helpText flex items-baseline justify-between">
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/features/collections/collection-replay-dialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ export class CollectionStartPageDialog extends BtrixElement {
{ label: string; icon: NonNullable<SlIcon["name"]>; detail: string }
> = {
[HomeView.Pages]: {
label: msg("Default"),
label: msg("List of Pages"),
icon: "list-ul",
detail: `${msg("ReplayWeb.Page default view")}`,
},
[HomeView.URL]: {
label: msg("Page"),
icon: "file-earmark",
detail: msg("Load a single page URL"),
label: msg("Start Page"),
icon: "file-earmark-richtext",
detail: msg("Show a single URL snapshot"),
},
};

Expand Down Expand Up @@ -188,7 +188,7 @@ export class CollectionStartPageDialog extends BtrixElement {
<form @submit=${this.onSubmit}>
<sl-select
name="homeView"
label=${msg("Select View")}
label=${msg("Select Initial View")}
value=${this.homeView}
hoist
?disabled=${!this.replayLoaded}
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/features/collections/collections-grid.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ export class CollectionsGrid extends BtrixElement {
href=${this.navigate.isPublicPage
? `/${RouteNamespace.PublicOrgs}/${this.slug}/collections/${collection.id}`
: `/${RouteNamespace.PrivateOrgs}/${this.slug}/collections/view/${collection.id}`}
class="group block h-full rounded-lg transition-all hover:scale-[102%]"
class="group block h-full rounded-lg"
@click=${this.navigate.link}
>
<div
class="relative mb-4 rounded-lg shadow-md shadow-stone-600/10 ring-1 ring-stone-600/10 transition-shadow group-hover:shadow-sm"
class="relative mb-4 rounded-lg shadow-md shadow-stone-600/10 ring-1 ring-stone-600/10 transition group-hover:shadow-stone-800/20 group-hover:ring-stone-800/20"
>
<btrix-collection-thumbnail
src=${ifDefined(
Expand Down
15 changes: 7 additions & 8 deletions frontend/src/features/collections/share-collection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -252,11 +252,7 @@ export class ShareCollection extends BtrixElement {

<sl-tab-panel name=${Tab.Link}>
<div class="px-4 pb-4">
${when(
showSettings && this.collection,
this.renderSettings,
this.renderShareLink,
)}
${when(showSettings && this.collection, this.renderSettings)}
</div>
</sl-tab-panel>

Expand All @@ -266,7 +262,6 @@ export class ShareCollection extends BtrixElement {
</sl-tab-group>

<div slot="footer">
${when(showSettings, this.renderShareLink)}
<sl-button size="small" @click=${() => (this.showDialog = false)}>
${msg("Done")}
</sl-button>
Expand All @@ -287,6 +282,10 @@ export class ShareCollection extends BtrixElement {
);
}}
></btrix-select-collection-access>
${when(
this.collection?.access != CollectionAccess.Private,
this.renderShareLink,
)}
${when(
this.org &&
!this.org.enablePublicProfile &&
Expand Down Expand Up @@ -389,7 +388,7 @@ export class ShareCollection extends BtrixElement {
>
${isSelected
? html`<sl-icon
class="size-10 text-white drop-shadow-md"
class="size-10 stroke-black/50 text-white drop-shadow-md [paint-order:stroke]"
name="check-lg"
></sl-icon>`
: nothing}
Expand All @@ -410,7 +409,7 @@ export class ShareCollection extends BtrixElement {

private readonly renderShareLink = () => {
return html`
<div class="text-left">
<div class="mt-4 text-left">
<div class="form-label">${msg("Link to Share")}</div>
<btrix-copy-field
class="mb-3"
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/features/qa/page-list/helpers/iconFor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ export const iconFor = cached(
case "severe":
return html`<sl-icon
name="exclamation-triangle-fill"
class=${clsx("text-red-600", baseClasses, classList)}
class=${clsx("text-red-500", baseClasses, classList)}
></sl-icon>`;
case "moderate":
return html`<sl-icon
name="dash-square-fill"
class=${clsx("text-yellow-600", baseClasses, classList)}
class=${clsx("text-yellow-500", baseClasses, classList)}
></sl-icon>`;
case "good":
return html`<sl-icon
Expand All @@ -37,7 +37,7 @@ export const iconFor = cached(
case "rejected":
return html`<sl-icon
name="hand-thumbs-down-fill"
class=${clsx("text-red-600", baseClasses, classList)}
class=${clsx("text-red-500", baseClasses, classList)}
></sl-icon>`;
case "commentOnly":
// Comment icons are rendered separately
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/features/qa/page-list/helpers/severity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ export const textColorFromSeverity = cached((severity: Severity) => {
case "good":
return tw`text-green-600`;
case "moderate":
return tw`text-yellow-600`;
return tw`text-yellow-500`;
case "severe":
return tw`text-red-600`;
return tw`text-red-500`;
default:
return "";
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/layouts/page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export function page(
></btrix-document-title>

<div
class="mx-auto box-border flex min-h-full w-full max-w-screen-desktop flex-1 flex-col gap-3 p-3 lg:px-10"
class="mx-auto box-border flex min-h-full w-full max-w-screen-desktop flex-1 flex-col gap-3 p-3 lg:px-10 lg:pb-10"
>
${header.breadcrumbs ? html` ${pageNav(header.breadcrumbs)} ` : nothing}
${pageHeader(header)}
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/pages/collections/collection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ export class Collection extends BtrixElement {
`;
}

// TODO Consolidate with collection-detail.ts
private renderAbout(collection: PublicCollection) {
const dateRange = () => {
if (!collection.dateEarliest || !collection.dateLatest) {
Expand Down Expand Up @@ -243,13 +244,13 @@ export class Collection extends BtrixElement {
return html`
<div class="flex flex-1 flex-col gap-10 lg:flex-row">
<section
class="flex-1 py-3 leading-relaxed lg:rounded-lg lg:border lg:p-6"
class="w-full max-w-4xl py-3 leading-relaxed lg:rounded-lg lg:border lg:p-6"
>
<btrix-markdown-viewer
value=${collection.description}
></btrix-markdown-viewer>
</section>
<section class="min-w-60 lg:-mt-8">
<section class="flex-1 lg:-mt-8">
<btrix-section-heading>
<h3>${msg("Metadata")}</h3>
</btrix-section-heading>
Expand Down
Loading
Loading