maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change feed billboard font size to fs-base and link embed adjustments (#19697)

Browse source
This commit is contained in:
Ben Halpern 2023-07-07 09:13:11 -04:00 • committed by GitHub
parent 8cc6f37a2d
commit b14f8c2325
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/stylesheets/components/stories.scss
View file

@ -107,6 +107,9 @@
padding-left: calc(var(--su-7) + var(--su-2));
padding-right: calc(var(--su-7) + var(--su-2));
}
.text-styles {
font-size: var(--fs-base);
}
}
&__top {

6
app/assets/stylesheets/ltags/LinkTag.scss
View file

@ -149,8 +149,8 @@
color: var(--tag-color);
}
.ltag__link__tag {
margin-right: calc(0.4vw + 4px);
font-size: 0.8em;
margin-right: calc(0.02vw + 4px);
font-size: 0.9em;
margin-left: 1px;
}
.ltag__link__servicename {
@ -167,7 +167,7 @@
}
}
.crayons-article-sticky {
.crayons-article-sticky, .crayons-story__indention-display-ad {
.ltag__link {
.ltag__link__org__pic {
width: 60px;

4
app/views/articles/_liquid.html.erb
View file

@ -19,7 +19,7 @@
<a href='<%= article.path %>' class='ltag__link__link'>
<div class='ltag__link__content'>
<h2><%= title %></h2>
<h3><%= article.user.name %><%= t("views.articles.for_org_html", org: article.organization.name, start: "", end: "") %> ・ <%= article.readable_publish_date %> ・ <%= t("views.articles.reading_time", count: article.reading_time < 2 ? 1 : article.reading_time) %></h3>
<h3><%= article.user.name %><%= t("views.articles.for_org_html", org: article.organization.name, start: "", end: "") %> ・ <%= article.readable_publish_date %></h3>
<div class='ltag__link__taglist'>
<% article.tag_list.each do |t| %>
<span class='ltag__link__tag'>#<%= t %></span>
@ -36,7 +36,7 @@
<a href='<%= article.path %>' class='ltag__link__link'>
<div class='ltag__link__content'>
<h2><%= title %></h2>
<h3><%= article.user.name %> ・ <%= article.readable_publish_date %> ・ <%= t("views.articles.reading_time", count: article.reading_time < 2 ? 1 : article.reading_time) %></h3>
<h3><%= article.user.name %> ・ <%= article.readable_publish_date %></h3>
<div class='ltag__link__taglist'>
<% article.tag_list.each do |t| %>
<span class='ltag__link__tag'>#<%= t %></span>

16
spec/liquid_tags/link_tag_spec.rb
View file

@ -41,7 +41,7 @@ RSpec.describe LinkTag, type: :liquid_tag do
<a href='#{article.path}' class='ltag__link__link'>
<div class='ltag__link__content'>
<h2>#{CGI.escapeHTML(article.title)}</h2>
<h3>#{CGI.escapeHTML(article.user.name)} ・ #{article.readable_publish_date} ・ #{article.reading_time} min read</h3>
<h3>#{CGI.escapeHTML(article.user.name)} ・ #{article.readable_publish_date}</h3>
<div class='ltag__link__taglist'>
#{tags}
</div>
@ -67,7 +67,7 @@ RSpec.describe LinkTag, type: :liquid_tag do
<a href='#{article.path}' class='ltag__link__link'>
<div class='ltag__link__content'>
<h2>#{CGI.escapeHTML(article.title)}</h2>
<h3>#{CGI.escapeHTML(article.user.name)} for #{CGI.escapeHTML(article.organization.name)} ・ #{article.readable_publish_date} ・ #{article.reading_time} min read</h3>
<h3>#{CGI.escapeHTML(article.user.name)} for #{CGI.escapeHTML(article.organization.name)} ・ #{article.readable_publish_date}</h3>
<div class='ltag__link__taglist'>
#{tags}
</div>
@ -135,18 +135,6 @@ RSpec.describe LinkTag, type: :liquid_tag do
end.to raise_error(StandardError)
end
it "renders default reading time of 1 minute for short articles" do
liquid = generate_new_liquid(slug: "/#{user.username}/#{article.slug}/")
expect(liquid.render).to include("1 min read")
end
it "renders reading time of article lengthy articles" do
template = file_fixture("article_long_content.txt").read
article = create(:article, user: user, body_markdown: template)
liquid = generate_new_liquid(slug: "/#{user.username}/#{article.slug}/")
expect(liquid.render).to include("3 min read")
end
it "renders with a full link with a trailing slash" do
liquid = generate_new_liquid(slug: "https://#{Settings::General.app_domain}/#{user.username}/#{article.slug}/")
expect(liquid.render).to eq(correct_link_html(article))