Skip to content

Commit b8b893f

Browse files
authored
Merge pull request #311 from joyofrails/chore/style-consistency-updates
Style consistency updates
2 parents bfdafe3 + e7ef64b commit b8b893f

File tree

5 files changed

+12
-14
lines changed

5 files changed

+12
-14
lines changed

app/content/layouts/article.html.erb

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@
1818
<%= render Pages::Header::Container.new do |c| %>
1919
<%= c.title { page.title } %>
2020
<%= c.description { page.description } if page.description %>
21-
<div class="flex flex-col lg:flex-row justify-between">
22-
<%= render Pages::Timestamp.new published_on: page.published_on, updated_on: page.revised_on, class: "text-small" %>
23-
<span class="text-small">
24-
<% topics = @page.topics.approved.pluck(:slug) %>
25-
<% if topics.present? %>
26-
<%= render Pages::Topics.new(topics: topics) %>
27-
<% end %>
28-
</span>
21+
<%= render Pages::Timestamp.new published_on: page.published_on, updated_on: page.revised_on, class: "text-small block" %>
22+
<div class="text-small">
23+
<% topics = @page.topics.approved.pluck(:slug) %>
24+
<% if topics.present? %>
25+
<%= render Pages::Topics.new(topics: topics) %>
26+
<% end %>
2927
</div>
3028
<% end %>
3129
<div class="article-content container" itemprop="articleBody">

app/javascript/css/components/poll.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
border-radius: 0.375rem;
1111
font-size: var(--step--1);
1212
font-weight: 700;
13+
border: 1px solid transparent;
1314
}
1415

1516
& .bar {
16-
border: 1px solid transparent;
1717
background-color: var(--joy-poll-result-default);
1818
position: absolute;
1919
top: 0;

app/views/components/pages/summary.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ def content(**)
4545
end
4646
p(class: "description") { description } if description
4747
if published_on
48-
render Pages::Timestamp.new published_on: published_on, class: "block"
48+
render Pages::Timestamp.new published_on: published_on, class: "text-small block"
4949
end
50-
a(href: request_path, class: "block uppercase strong") do
51-
small { "Read now" }
50+
a(href: request_path, class: "block uppercase text-small") do
51+
"Read now"
5252
end
5353
end
5454
end

app/views/searches/combobox.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def view_template
3535
} do |f|
3636
div(class: "flex items-center flex-row pl-2 col-gap-xs") do
3737
svg_tag "icons/search.svg", class: "w-[32px] fill-current text-theme"
38-
label(for: "query", class: "sr-only") { "Query" }
38+
label(for: combobox_dom_id, class: "sr-only") { "Query" }
3939
whitespace
4040
plain f.search_field :query,
4141
value: query,

app/views/share/polls/results.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def view_template
2020
end
2121

2222
div(class: "p-2") do
23-
p(class: "text-small font-extrabold") { pluralize question.votes_count, "vote" }
23+
p(class: "text-small text-theme") { pluralize question.votes_count, "vote" }
2424
end
2525
end
2626
end

0 commit comments

Comments
 (0)