Skip to content

High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.

Improve styles of grey buttons on grey bg floating outside white cards.

Kailash Nadh7ae3b975962b
diff --git a/static/admin/assets/css/style.css b/static/admin/assets/css/style.css
index 84b712b4..1b148b22 100644
--- a/static/admin/assets/css/style.css
+++ b/static/admin/assets/css/style.css
@@ -116,6 +116,20 @@ a {
}
}
+:is(.button, button).external {
+ background-color: var(--card);
+ border-color: var(--primary);
+
+ &:not([data-variant="danger"]):not([data-variant="secondary"]) {
+ border-color: light-dark(#ddd, var(--input));
+ }
+
+ &:hover:not(:disabled):not([aria-disabled="true"]) {
+ border-color: var(--primary);
+ color: var(--primary);
+ }
+}
+
textarea.monospace {
font-family: var(--font-mono);
}
@@ -176,6 +190,7 @@ ot-tabs:not(:defined) {
[role="tablist"][data-variant="primary"] {
margin-bottom: var(--space-4);
+ background-color: light-dark(#ededee, var(--muted));
}
fieldset {
diff --git a/static/admin/partials/list-form.html b/static/admin/partials/list-form.html
index 80109a9f..aab0bff3 100644
--- a/static/admin/partials/list-form.html
+++ b/static/admin/partials/list-form.html
@@ -55,7 +55,7 @@
{{- end }}
</div>
<div class="hstack gap-3 justify-end">
- <a href="{{ URI "/admin/lists" }}" class="button outline">{{ $root.L.T "globals.buttons.back" }}</a>
+ <a href="{{ URI "/admin/lists" }}" class="button outline external">{{ $root.L.T "globals.buttons.back" }}</a>
{{- if $canSave }}
<button type="submit" data-variant="primary" data-testid="btn-save" data-spinner="small" :disabled="isLoading('lists.save')" :aria-busy="isLoading('lists.save')">{{ $root.L.T "globals.buttons.save" }}</button>
{{- end }}
diff --git a/static/admin/partials/media-gallery.html b/static/admin/partials/media-gallery.html
index 8666b372..caff8de9 100644
--- a/static/admin/partials/media-gallery.html
+++ b/static/admin/partials/media-gallery.html
@@ -20,7 +20,7 @@
{{- $d.Page.FormFields "query" -}}
<fieldset class="group">
<input name="query" aria-label="Search" data-cy="query" placeholder="Search" value="{{ $d.Page.Query }}" autofocus />
- <button type="submit" class="outline" data-cy="btn-query" aria-label="Search">{{ Icon "search" }}</button>
+ <button type="submit" class="outline external" data-cy="btn-query" aria-label="Search">{{ Icon "search" }}</button>
</fieldset>
</form>
{{- if $canManage }}
diff --git a/static/admin/partials/subscriber-activity.html b/static/admin/partials/subscriber-activity.html
index 90d26262..e33a6ca7 100644
--- a/static/admin/partials/subscriber-activity.html
+++ b/static/admin/partials/subscriber-activity.html
@@ -1,14 +1,15 @@
{{ define "subscriber-activity" -}}
{{- $d := .Data -}}
-<div class="card page-content content activity">
- <div class="row">
+<div class="page-content content activity">
+ <div class="row mt-4">
<div class="col-4"><div class="card stat-card"><small class="text-light">{{ .L.T "globals.terms.campaigns" }}</small><div class="stat-value">{{ len $d.CampaignViews }}</div></div></div>
<div class="col-4"><div class="card stat-card"><small class="text-light">{{ .L.T "campaigns.views" }}</small><div class="stat-value">{{ $d.TotalViews }}</div></div></div>
<div class="col-4"><div class="card stat-card"><small class="text-light">{{ .L.T "campaigns.clicks" }}</small><div class="stat-value">{{ $d.TotalClicks }}</div></div></div>
</div>
{{- if $d.CampaignViews }}
- <h5 class="mt-6">{{ .L.T "campaigns.views" }}</h5>
+ <div class="card mt-6">
+ <h5>{{ .L.T "campaigns.views" }}</h5>
<table>
<thead><tr><th>{{ .L.T "globals.terms.campaign" }}</th><th width="10%">{{ .L.T "campaigns.views" }}</th><th width="20%">{{ .L.T "globals.fields.createdAt" }}</th></tr></thead>
<tbody>
@@ -21,10 +22,12 @@
{{- end }}
</tbody>
</table>
+ </div>
{{- end }}
{{- if $d.LinkClicks }}
- <h5 class="mt-6">{{ .L.T "campaigns.clicks" }}</h5>
+ <div class="card mt-6">
+ <h5>{{ .L.T "campaigns.clicks" }}</h5>
<table>
<thead><tr><th>{{ .L.T "globals.terms.campaign" }}</th><th>{{ .L.T "globals.terms.url" }}</th><th width="10%">{{ .L.T "campaigns.clicks" }}</th><th width="20%">{{ .L.T "globals.fields.createdAt" }}</th></tr></thead>
<tbody>
@@ -38,6 +41,7 @@
{{- end }}
</tbody>
</table>
+ </div>
{{- end }}
</div>
{{- end }}
diff --git a/static/admin/partials/subscriber-form.html b/static/admin/partials/subscriber-form.html
index 9506215d..e8f92f62 100644
--- a/static/admin/partials/subscriber-form.html
+++ b/static/admin/partials/subscriber-form.html
@@ -39,7 +39,7 @@
{{- end }}
</div>
<div class="hstack gap-3 justify-end">
- <a href="{{ URI "/admin/subscribers" }}" class="button outline">{{ $root.L.T "globals.buttons.back" }}</a>
+ <a href="{{ URI "/admin/subscribers" }}" class="button outline external">{{ $root.L.T "globals.buttons.back" }}</a>
{{- if $canSave }}
<button type="submit" data-variant="primary" data-testid="btn-save" :disabled="isLoading('subscribers.save')" :aria-busy="isLoading('subscribers.save')">{{ $root.L.T "globals.buttons.save" }}</button>
{{- end }}
diff --git a/static/admin/partials/subscriber-lists.html b/static/admin/partials/subscriber-lists.html
index 08c87eed..153f42c9 100644
--- a/static/admin/partials/subscriber-lists.html
+++ b/static/admin/partials/subscriber-lists.html
@@ -19,7 +19,7 @@
{{- if .Restricted }}
<span class="text-light">{{ .Name }}</span>
{{- else }}
- <a href="{{ URI "/admin/lists" }}/{{ .ID }}">{{ .Name }}</a>
+ <a href="{{ URI "/admin/lists" }}/{{ .ID }}" class="unstyled">{{ .Name }}</a>
{{- end }}
</td>
<td data-label="{{ $root.L.T "lists.optin" }}">
diff --git a/static/admin/views/campaign.html b/static/admin/views/campaign.html
index f4e22f15..3347a147 100644
--- a/static/admin/views/campaign.html
+++ b/static/admin/views/campaign.html
@@ -37,7 +37,7 @@
{{- if $showRight }}
<div class="col-6 col-end hstack justify-end">
{{- if $showPreview }}
- <button type="button" class="outline" data-cy="btn-preview" @click="onPreviewContent" aria-keyshortcuts="F9">{{ Icon "eye" }} {{ .L.T "campaigns.preview" }}</button>
+ <button type="button" class="outline external" data-cy="btn-preview" @click="onPreviewContent" aria-keyshortcuts="F9">{{ Icon "eye" }} {{ .L.T "campaigns.preview" }}</button>
{{- end }}
{{- if $showActions }}
<button type="button" data-variant="primary" data-cy="btn-save" x-show="canEdit" @click="onSave" :disabled="isLoading('campaigns')" data-spinner="small" :aria-busy="isLoading('campaigns')">{{ Icon "save" }} {{ .L.T "globals.buttons.saveChanges" }}</button>
@@ -58,7 +58,7 @@
{{ template "campaign-form" dict "Root" . "IsNew" $isNew "CanManage" $canManage "CanSend" $canSend }}
{{- else }}
<ot-tabs data-anchor="tab">
- <div role="tablist">
+ <div role="tablist" data-variant="primary">
<button type="button" role="tab" id="campaign">{{ Icon "send" }} {{ .L.Tc "globals.terms.campaign" 1 }}</button>
<button type="button" role="tab" id="content">{{ Icon "align-left" }} {{ .L.T "campaigns.content" }}</button>
<button type="button" role="tab" id="attribs">{{ Icon "code" }} {{ .L.T "globals.terms.attribs" }} <span x-cloak x-show="form.attribsStr.trim() !== '' && form.attribsStr.trim() !== '{}'">{{ Icon "check-circle" }}</span></button>
@@ -67,7 +67,7 @@
</div>
<ot-dropdown class="content-settings" x-cloak x-show="activeTab === 'content'">
- <button type="button" class="outline small" popovertarget="content-settings" :title="contentSettingsLabel">{{ Icon "settings" }} <span class="content-settings-label" x-text="contentSettingsLabel"></span></button>
+ <button type="button" class="outline small external" popovertarget="content-settings" :title="contentSettingsLabel">{{ Icon "settings" }} <span class="content-settings-label" x-text="contentSettingsLabel"></span></button>
<div popover id="content-settings" class="content-settings-menu">
<div data-field>
<label>{{ .L.T "campaigns.format" }}</label>
diff --git a/static/admin/views/campaigns.html b/static/admin/views/campaigns.html
index 4bb562f6..5553be9b 100644
--- a/static/admin/views/campaigns.html
+++ b/static/admin/views/campaigns.html
@@ -23,7 +23,7 @@
{{- $d.Page.FormFields "query" "page" -}}
<fieldset class="group">
<input name="query" aria-label="Search" data-cy="query" placeholder="{{ .L.T "campaigns.queryPlaceholder" }}" value="{{ $d.Page.Query }}" autofocus />
- <button type="submit" class="outline" data-cy="btn-query" aria-label="Search">{{ Icon "search" }}</button>
+ <button type="submit" class="outline external" data-cy="btn-query" aria-label="Search">{{ Icon "search" }}</button>
</fieldset>
</form>
{{- if $d.Can "campaigns:manage" "campaigns:manage_all" }}
diff --git a/static/admin/views/forms.html b/static/admin/views/forms.html
index 307be249..181ec87b 100644
--- a/static/admin/views/forms.html
+++ b/static/admin/views/forms.html
@@ -10,7 +10,7 @@
</div>
<div class="col-8 col-end align-right hstack justify-end">
{{- if $.ConfigJS.PublicSubscription.Enabled }}
- <a href="{{ $.ConfigJS.RootURL }}/subscription/form" target="_blank" rel="noopener noreferrer" class="button outline small" data-testid="url" title="{{ $.ConfigJS.RootURL }}/subscription/form">
+ <a href="{{ $.ConfigJS.RootURL }}/subscription/form" target="_blank" rel="noopener noreferrer" class="button outline small external" data-testid="url" title="{{ $.ConfigJS.RootURL }}/subscription/form">
{{ Icon "arrow-up-right" }} {{ .L.T "forms.publicSubPage" }}
</a>
{{- end }}
diff --git a/static/admin/views/list-role.html b/static/admin/views/list-role.html
index 7280c54f..27464c40 100644
--- a/static/admin/views/list-role.html
+++ b/static/admin/views/list-role.html
@@ -80,7 +80,7 @@
</a>
</div>
<div class="hstack gap-3 justify-end">
- <a href="{{ $base }}" class="button outline">{{ .L.T "globals.buttons.back" }}</a>
+ <a href="{{ $base }}" class="button outline external">{{ .L.T "globals.buttons.back" }}</a>
<button type="submit" data-variant="primary" data-testid="btn-save" x-show="!disabled" :disabled="isLoading('roles.save')" :aria-busy="isLoading('roles.save')">{{ .L.T "globals.buttons.save" }}</button>
</div>
</footer>
diff --git a/static/admin/views/lists.html b/static/admin/views/lists.html
index 0837c4c3..72f5d3d5 100644
--- a/static/admin/views/lists.html
+++ b/static/admin/views/lists.html
@@ -33,7 +33,7 @@
{{- $d.Page.FormFields "query" -}}
<fieldset class="group">
<input name="query" aria-label="Search" data-testid="query" placeholder="Search" value="{{ $d.Page.Query }}" autofocus />
- <button type="submit" class="outline" data-testid="btn-query" aria-label="Search">{{ Icon "search" }}</button>
+ <button type="submit" class="outline external" data-testid="btn-query" aria-label="Search">{{ Icon "search" }}</button>
</fieldset>
</form>
{{- if $d.Can "lists:manage_all" }}
diff --git a/static/admin/views/settings.html b/static/admin/views/settings.html
index 238db88c..ce6714ea 100644
--- a/static/admin/views/settings.html
+++ b/static/admin/views/settings.html
@@ -21,7 +21,7 @@
<fieldset class="group">
<input type="search" x-ref="search" data-cy="search" @input="onSearch($event)"
aria-label="{{ .L.T "globals.buttons.search" }}" placeholder="{{ .L.T "globals.buttons.search" }}" />
- <button type="button" class="outline" @click.prevent="clearSearch" aria-label="{{ .L.T "globals.buttons.search" }}">{{ Icon "search" }}</button>
+ <button type="button" class="outline external" @click.prevent="clearSearch" aria-label="{{ .L.T "globals.buttons.search" }}">{{ Icon "search" }}</button>
</fieldset>
</div>
{{- if $d.Can "settings:manage" }}
diff --git a/static/admin/views/subscriber.html b/static/admin/views/subscriber.html
index 0fa848f9..8c51b5fd 100644
--- a/static/admin/views/subscriber.html
+++ b/static/admin/views/subscriber.html
@@ -27,12 +27,12 @@
<div class="col-6 hstack justify-end">
{{- if and (eq $d.Tab "lists") ($d.Can "subscribers:manage") }}
{{ if ne $sub.Status "blocklisted" }}
- <button type="button" class="outline" data-testid="btn-send-optin" @click.prevent="onSendOptin" :disabled="!hasOptinSub">{{ Icon "mail" }} {{ .L.T "subscribers.sendOptinConfirm" }}</button>
+ <button type="button" class="outline external" data-testid="btn-send-optin" @click.prevent="onSendOptin" :disabled="!hasOptinSub">{{ Icon "mail" }} {{ .L.T "subscribers.sendOptinConfirm" }}</button>
{{ end }}
<button type="button" data-variant="primary" data-testid="btn-manage" @click.prevent="onOpenManage">{{ Icon "list" }} {{ .L.T "globals.buttons.manage" }}</button>
{{- end }}
{{- if and (eq $d.Tab "bounces") $d.Bounces }}
- <button type="button" class="outline" data-variant="danger" @click.prevent="onDeleteBounces">{{ Icon "trash-2" }} {{ .L.T "globals.buttons.clear" }}</button>
+ <button type="button" class="outline external" data-variant="danger" @click.prevent="onDeleteBounces">{{ Icon "trash-2" }} {{ .L.T "globals.buttons.clear" }}</button>
{{- end }}
</div>
</header>
diff --git a/static/admin/views/subscribers.html b/static/admin/views/subscribers.html
index 56f63882..14e37fc7 100644
--- a/static/admin/views/subscribers.html
+++ b/static/admin/views/subscribers.html
@@ -36,7 +36,7 @@
<ot-dropdown>
<fieldset class="group">
<input name="search" aria-label="Search" data-testid="search" placeholder="{{ .L.T "subscribers.queryPlaceholder" }}" value="{{ $d.Page.Search }}" :disabled="isSqlOpen || advanced" autofocus />
- <button type="button" class="outline sql-btn dot-indicator" :class="{ 'is-active': advanced }" popovertarget="sql-editor" data-testid="btn-advanced-search" :data-variant="advanced ? 'primary' : null" aria-label="{{ .L.T "subscribers.advancedQuery" }}">SQL {}</button>
+ <button type="button" class="outline sql-btn dot-indicator" :class="{ 'is-active': advanced, external: !advanced }" popovertarget="sql-editor" data-testid="btn-advanced-search" :data-variant="advanced ? 'primary' : null" aria-label="{{ .L.T "subscribers.advancedQuery" }}">SQL {}</button>
<button type="submit" data-testid="btn-search" aria-label="{{ .L.T "globals.buttons.search" }}">{{ Icon "search" }}</button>
</fieldset>
<div popover id="sql-editor" class="sql-editor" data-testid="query-editor" @toggle="isSqlOpen = ($event.newState === 'open'); if (isSqlOpen) $nextTick(() => $refs.queryInput.focus())">
diff --git a/static/admin/views/template.html b/static/admin/views/template.html
index 82dd52d3..3adb34a0 100644
--- a/static/admin/views/template.html
+++ b/static/admin/views/template.html
@@ -29,7 +29,7 @@
</div>
</div>
<div class="col-6 col-end hstack justify-end">
- <button type="button" class="outline" data-testid="btn-preview" @click="onPreviewBody" aria-keyshortcuts="F9">{{ Icon "eye" }} {{ .L.T "templates.preview" }}</button>
+ <button type="button" class="outline external" data-testid="btn-preview" @click="onPreviewBody" aria-keyshortcuts="F9">{{ Icon "eye" }} {{ .L.T "templates.preview" }}</button>
</div>
</header>
diff --git a/static/admin/views/user-role.html b/static/admin/views/user-role.html
index 6bb33b0d..41fbf5e0 100644
--- a/static/admin/views/user-role.html
+++ b/static/admin/views/user-role.html
@@ -84,7 +84,7 @@
</a>
</div>
<div class="hstack gap-3 justify-end">
- <a href="{{ $base }}" class="button outline">{{ .L.T "globals.buttons.back" }}</a>
+ <a href="{{ $base }}" class="button outline external">{{ .L.T "globals.buttons.back" }}</a>
<button type="submit" data-variant="primary" data-testid="btn-save" x-show="!disabled" :disabled="isLoading('roles.save')" :aria-busy="isLoading('roles.save')">{{ .L.T "globals.buttons.save" }}</button>
</div>
</footer>
diff --git a/static/admin/views/user.html b/static/admin/views/user.html
index 9e07e1fd..a9858ef7 100644
--- a/static/admin/views/user.html
+++ b/static/admin/views/user.html
@@ -108,7 +108,7 @@
{{- end }}
</div>
<div class="hstack gap-3 justify-end">
- <a href="{{ $base }}" class="button outline">{{ .L.T "globals.buttons.back" }}</a>
+ <a href="{{ $base }}" class="button outline external">{{ .L.T "globals.buttons.back" }}</a>
{{- if $canSave }}
<button type="submit" data-variant="primary" data-testid="btn-save" :disabled="isLoading('users.save')" :aria-busy="isLoading('users.save')">{{ .L.T "globals.buttons.save" }}</button>
{{- end }}