Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion app/assets/stylesheets/components/activities.css
Original file line number Diff line number Diff line change
@@ -1,14 +1,31 @@
.activities-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: var(--spacing-3);
border-bottom: var(--border-width) solid var(--color-border);

& h2 {
font-size: var(--font-size-2xl);
font-weight: var(--font-weight-semibold);
color: var(--color-text-primary);
margin: 0;
}
}

.activity-search {
display: flex;
gap: var(--spacing-3);
margin: var(--spacing-3) 0;
padding: 0 var(--spacing-3);
}

.activities-list {
display: flex;
flex-direction: column;
gap: var(--spacing-3);
margin-top: var(--spacing-2);
margin: var(--spacing-2) 0;
padding: 0 var(--spacing-3);
}

.activity-card {
Expand Down
16 changes: 0 additions & 16 deletions app/assets/stylesheets/components/topics.css
Original file line number Diff line number Diff line change
Expand Up @@ -59,22 +59,6 @@

/* ─────────────────────────────────────────────────────────────────── */

.section-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: var(--spacing-6);
padding-bottom: var(--spacing-3);
border-bottom: var(--border-width) solid var(--color-border);

& h2 {
font-size: var(--font-size-2xl);
font-weight: var(--font-weight-semibold);
color: var(--color-text-primary);
margin: 0;
}
}

.new-topics-banner {
background: linear-gradient(to right, var(--color-primary-50), var(--color-primary-100));
border: var(--border-width) solid var(--color-primary-300);
Expand Down
2 changes: 1 addition & 1 deletion app/views/activities/index.html.slim
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- content_for :title, "Activity"

.section-header
.activities-header
h2 Activity
- if @unread_count.positive?
= button_to "Mark all read (#{@unread_count})", mark_all_read_activities_path, method: :post, class: "button-secondary"
Expand Down