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

Fix style issues on liquid tag embed page (#6445) [deploy]

Browse source
This commit is contained in:
Ben Halpern 2020-03-04 10:40:34 -05:00 • committed by GitHub
parent a5aa50f758
commit 1a95597ccd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/views/layouts/_styles.html.erb
View file

@ -16,7 +16,7 @@
<%= Rails.application.assets["comments.css"].to_s.html_safe %>
<%= Rails.application.assets["more-articles.css"].to_s.html_safe %>
<%= Rails.application.assets["syntax.css"].to_s.html_safe %>
<%= Rails.application.assets["ltags/LiquidTags.scss"].to_s.html_safe %>
<%= Rails.application.assets["ltags/LiquidTags.css"].to_s.html_safe %>
<%= Rails.application.assets["sticky-nav.css"].to_s.html_safe %>
<% else %>
<%= Rails.application.assets["article-show.css"].to_s.html_safe %>
@ -36,7 +36,7 @@
<%= Rails.application.assets["footer.css"].to_s.html_safe %>
<% unless @home_page %>
<%= Rails.application.assets["user-profile-header.css"].to_s.html_safe %>
<%= Rails.application.assets["sidebar-data.scss"].to_s.html_safe %>
<%= Rails.application.assets["sidebar-data.css"].to_s.html_safe %>
<%= Rails.application.assets["index-comments.css"].to_s.html_safe %>
<%= Rails.application.assets["footer.css"].to_s.html_safe %>
<% end %>
@ -58,7 +58,7 @@
<%= Rails.application.assets["top-bar.css"].to_s.html_safe %>
<%= Rails.application.assets["user-profile-header.css"].to_s.html_safe %>
<%= Rails.application.assets["footer.css"].to_s.html_safe %>
<%= Rails.application.assets["ltags/LiquidTags.scss"].to_s.html_safe %>
<%= Rails.application.assets["ltags/LiquidTags.css"].to_s.html_safe %>
</style>
<% elsif view_class.start_with? "comments" %>
<style>
@ -66,7 +66,7 @@
<%= Rails.application.assets["top-bar.css"].to_s.html_safe %>
<%= Rails.application.assets["comments.css"].to_s.html_safe %>
<%= Rails.application.assets["footer.css"].to_s.html_safe %>
<%= Rails.application.assets["ltags/LiquidTags.scss"].to_s.html_safe %>
<%= Rails.application.assets["ltags/LiquidTags.css"].to_s.html_safe %>
<%= Rails.application.assets["syntax.css"].to_s.html_safe %>
<% if view_class.include? "comments-settings" %>
<%= Rails.application.assets["article-show.css"].to_s.html_safe %>

2
app/views/liquid_embeds/show.html.erb
View file

@ -1,6 +1,6 @@
<base target="_parent">
<% cache "liquid_tag_styles_#{ApplicationConfig['HEROKU_SLUG_COMMIT']}", expires_in: 8.hours do #TODO: Render specific ltag class instead of everything %>
<style><%= Rails.application.assets["ltags/LiquidTags.scss"].to_s.html_safe %></style>
<style><%= Rails.application.assets["ltags/LiquidTags.css"].to_s.html_safe %></style>
<% end %>
<% begin %>
<% @liquid_node = Liquid::Template.parse("{% #{params[:embeddable]} #{params[:args]} %}").root.nodelist.first %>

5
spec/requests/liquid_embeds_spec.rb
View file

@ -12,6 +12,11 @@ RSpec.describe "LiquidEmbeds", type: :request, vcr: VCR_OPTIONS do
expect(response.body).to include("ltag__twitter-tweet")
end
it "renders proper css" do
get "/embed/tweet?args=1018911886862057472"
expect(response.body).to include("blockquote.ltag__twitter-tweet")
end
it "renders 404 if improper tweet" do
expect do
get "/embed/tweet?args=improper"