Skip to content

jekyll: keep paragraph of reading time and use include #15218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crazy-max merged 1 commit into from
Jul 27, 2022
Merged

jekyll: keep paragraph of reading time and use include #15218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion _includes/read_time.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{%- unless page.skip_read_time == true -%}
{%- assign words = content | number_of_words -%}
{%- if words >= 360 -%}
<p><em class="reading-time">Estimated reading time: {{ words | divided_by:180 }} minutes</em></p>
<em class="reading-time">Estimated reading time: {{ words | divided_by:180 }} minutes</em>
{%- endif -%}
{%- endunless -%}
7 changes: 1 addition & 6 deletions _layouts/docs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@ <h1>{{ page.title }}</h1>
{%- if page.advisory -%}
<blockquote>{{ site.data.advisories.texts[page.advisory] | markdownify }}</blockquote>
{%- endif -%}
{%- unless page.skip_read_time == true -%}
{%- assign words = content | number_of_words -%}
{%- if words >= 360 -%}
<p><em class="reading-time">Estimated reading time: {{ words | divided_by:180 }} minutes</em></p>
{%- endif -%}
{%- endunless -%}
<p>{%- include read_time.html -%}</p>
Copy link
Member

@thaJeztah thaJeztah Jul 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess alternatively, we could add a style for block quotes immediately following a H1;

h1+blockquote {
  margin-top: 24px;
}

Copy link
Member Author

@crazy-max crazy-max Jul 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes but looks like the <blockquote> is conditional?: https://github.com/docker/docker.github.io/blob/72a3a45c0e09a7c101d66dca13c7fae3916c96f3/_layouts/docs.html#L28

Maybe add a new css class to https://github.com/docker/docker.github.io/blob/72a3a45c0e09a7c101d66dca13c7fae3916c96f3/_layouts/docs.html#L26

{{ content }}
{%- unless page.notags == true -%}
{%- assign keywords = page.keywords | split:"," -%}
Expand Down