forum: change style of new/approved/pending/rejected labels.
Change the new, approved, pending, and rejected labels in the forum to use an outlined pill style (like user levels in user tooltips) instead of a filled background style. This is less obtrusive and more readable in dark mode.
This commit is contained in:
@@ -18,6 +18,8 @@ module ForumTopicsHelper
|
|||||||
:approved
|
:approved
|
||||||
elsif topic.category_name == "Tags" && topic.bulk_update_requests.present? && topic.bulk_update_requests.all?(&:is_rejected?)
|
elsif topic.category_name == "Tags" && topic.bulk_update_requests.present? && topic.bulk_update_requests.all?(&:is_rejected?)
|
||||||
:rejected
|
:rejected
|
||||||
|
else
|
||||||
|
nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -161,7 +161,7 @@ html {
|
|||||||
--forum-vote-down-color: var(--red-5);
|
--forum-vote-down-color: var(--red-5);
|
||||||
|
|
||||||
--forum-topic-status-new-color: var(--red-4);
|
--forum-topic-status-new-color: var(--red-4);
|
||||||
--forum-topic-status-pending-color: var(--azure-5);
|
--forum-topic-status-pending-color: var(--blue-5);
|
||||||
--forum-topic-status-approved-color: var(--green-4);
|
--forum-topic-status-approved-color: var(--green-4);
|
||||||
--forum-topic-status-rejected-color: var(--red-4);
|
--forum-topic-status-rejected-color: var(--red-4);
|
||||||
|
|
||||||
@@ -368,10 +368,10 @@ body[data-current-user-theme="dark"] {
|
|||||||
--forum-vote-meh-color: var(--yellow-2);
|
--forum-vote-meh-color: var(--yellow-2);
|
||||||
--forum-vote-down-color: var(--red-4);
|
--forum-vote-down-color: var(--red-4);
|
||||||
|
|
||||||
--forum-topic-status-new-color: var(--red-4);
|
--forum-topic-status-new-color: var(--red-3);
|
||||||
--forum-topic-status-pending-color: var(--blue-4);
|
--forum-topic-status-pending-color: var(--azure-3);
|
||||||
--forum-topic-status-approved-color: var(--green-4);
|
--forum-topic-status-approved-color: var(--green-3);
|
||||||
--forum-topic-status-rejected-color: var(--red-4);
|
--forum-topic-status-rejected-color: var(--red-3);
|
||||||
|
|
||||||
--moderation-report-text-color: var(--red-4);
|
--moderation-report-text-color: var(--red-4);
|
||||||
--moderation-report-background-color: var(--red-9);
|
--moderation-report-background-color: var(--red-9);
|
||||||
|
|||||||
@@ -8,37 +8,49 @@ div#c-forum-topics {
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.topic-status {
|
a.topic-status {
|
||||||
margin-right: 0.25em;
|
margin-right: 0.25em;
|
||||||
vertical-align: bottom;
|
|
||||||
|
|
||||||
&.label {
|
&.label {
|
||||||
|
display: inline-block;
|
||||||
font-size: 0.7em;
|
font-size: 0.7em;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
border-radius: 3px;
|
border: 1px solid;
|
||||||
padding: 4px;
|
border-radius: 0.25rem;
|
||||||
color: white;
|
background-color: var(--body-background-color);
|
||||||
|
padding: 0.125rem 0.25rem;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
color: var(--inverse-text-color);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&.icon {
|
&.icon {
|
||||||
color: var(--muted-text-color);
|
color: var(--muted-text-color);
|
||||||
font-size: 1em;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&.new {
|
&.new {
|
||||||
background-color: var(--forum-topic-status-new-color);
|
color: var(--forum-topic-status-new-color);
|
||||||
|
border-color: var(--forum-topic-status-new-color);
|
||||||
|
&:hover { background-color: var(--forum-topic-status-new-color); }
|
||||||
}
|
}
|
||||||
|
|
||||||
&.pending {
|
&.pending {
|
||||||
background-color: var(--forum-topic-status-pending-color);
|
color: var(--forum-topic-status-pending-color);
|
||||||
|
border-color: var(--forum-topic-status-pending-color);
|
||||||
|
&:hover { background-color: var(--forum-topic-status-pending-color); }
|
||||||
}
|
}
|
||||||
|
|
||||||
&.approved {
|
&.approved {
|
||||||
background-color: var(--forum-topic-status-approved-color);
|
color: var(--forum-topic-status-approved-color);
|
||||||
|
border-color: var(--forum-topic-status-approved-color);
|
||||||
|
&:hover { background-color: var(--forum-topic-status-approved-color); }
|
||||||
}
|
}
|
||||||
|
|
||||||
&.rejected {
|
&.rejected {
|
||||||
background-color: var(--forum-topic-status-rejected-color);
|
color: var(--forum-topic-status-rejected-color);
|
||||||
|
border-color: var(--forum-topic-status-rejected-color);
|
||||||
|
&:hover { background-color: var(--forum-topic-status-rejected-color); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,33 +1,23 @@
|
|||||||
<%= table_for forum_topics, width: "100%" do |t| %>
|
<%= table_for forum_topics, width: "100%" do |t| %>
|
||||||
<% t.column "Title" do |topic| %>
|
<% t.column "Title" do |topic| %>
|
||||||
<% if !topic.is_read? %>
|
<% if !topic.is_read? %>
|
||||||
<%= link_to forum_topics_path(search: { is_read: false }) do %>
|
<%= link_to "New", forum_topics_path(search: { is_read: false }), class: "topic-status label new" %>
|
||||||
<span class="topic-status label new">New</span>
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if topic.is_sticky? %>
|
<% if topic.is_sticky? %>
|
||||||
<%= link_to forum_topics_path(search: { is_sticky: true }) do %>
|
<%= link_to sticky_icon, forum_topics_path(search: { is_sticky: true }), class: "topic-status icon stickied", title: "Stickied" %>
|
||||||
<%= sticky_icon(class: "topic-status stickied", title: "Stickied") %>
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if topic.is_locked? %>
|
<% if topic.is_locked? %>
|
||||||
<%= link_to forum_topics_path(search: { is_locked: true }) do %>
|
<%= link_to lock_icon, forum_topics_path(search: { is_locked: true }), class: "topic-status icon locked", title: "Locked" %>
|
||||||
<%= lock_icon(class: "topic-status locked", title: "Locked") %>
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if topic.is_deleted? %>
|
<% if topic.is_deleted? %>
|
||||||
<%= link_to forum_topics_path(search: { is_deleted: true }) do %>
|
<%= link_to delete_icon, forum_topics_path(search: { is_deleted: true }), class: "topic-status icon deleted", title: "Deleted" %>
|
||||||
<%= delete_icon(class: "topic-status deleted", title: "Deleted") %>
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if topic.is_private? %>
|
<% if topic.is_private? %>
|
||||||
<%= link_to forum_topics_path(search: { is_private: true }) do %>
|
<%= link_to private_icon, forum_topics_path(search: { is_private: true }), class: "topic-status icon private", title: "#{User.level_string(topic.min_level)} only" %>
|
||||||
<%= private_icon(class: "topic-status private", title: "#{User.level_string(topic.min_level)} only") %>
|
|
||||||
<% end %>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if forum_topic_status(topic).present? %>
|
<% if forum_topic_status(topic).present? %>
|
||||||
@@ -42,8 +32,8 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
<% t.column "Status", width: "1%" do |topic| %>
|
<% t.column "Status", width: "1%" do |topic| %>
|
||||||
<% status = forum_topic_status(topic) %>
|
<% status = forum_topic_status(topic) %>
|
||||||
<%= link_to forum_topics_path(search: { status: status }) do %>
|
<% if status.present? %>
|
||||||
<span class="topic-status label <%= status %>"><%= status %></span>
|
<%= link_to status, forum_topics_path(search: { status: status }), class: "topic-status label #{status}" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% t.column "Creator", width: "8%" do |topic| %>
|
<% t.column "Creator", width: "8%" do |topic| %>
|
||||||
|
|||||||
Reference in New Issue
Block a user