Skip to content
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.

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

2020 landing page content #950

Merged
merged 7 commits into from
Jul 6, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion src/config/2020.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"settings": [
{
"is_live": false,
"is_live": true,
rviscomi marked this conversation as resolved.
Show resolved Hide resolved
"supported_languages": ["en","es","fr","ja"],
"ebook_languages": []
}
Expand Down
41 changes: 40 additions & 1 deletion src/templates/base/2020/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,40 @@
{% block styles %}
{{ super() }}
<link rel="stylesheet" href="/static/css/index.css?v=20200630133215">
<style>
.intro {
max-width: 600px;
}
.intro p {
font-style: italic;
}
.intro p:first-child {
margin-bottom: 20px;
}
.methodology-container {
margin-top: 150px;
}
.methodology-characters {
z-index: unset;
}
@media (max-width: 600px) {
.intro h2 {
font-size: 2rem;
}
.intro h2 b {
display: block;
}
.intro-image-wrapper {
margin-right: -100px;
}
.methodology-container {
margin-top: 200px;
padding: 0;
}
}

rviscomi marked this conversation as resolved.
Show resolved Hide resolved
</style>

{% endblock %}

{# Hide the TOC, Contributors and Methodology for now #}
Expand All @@ -35,7 +69,7 @@
<div class="intro-year">{{ year }}</div>
<h1 class="title title-lg title-alt">{{ self.intro_title() }}</h1>
<h2>{{ self.intro_sub_title() }}</h2>
<p>{{ self.mission() }}</p>
<div>{{ self.mission() }}</div>
</div>
<div class="intro-image-year-wrapper">
<div class="intro-image-year"></div>
Expand All @@ -44,5 +78,10 @@ <h2>{{ self.intro_sub_title() }}</h2>
<div class="intro-image"></div>
</div>
</section>
<section class="methodology-container">
<div class="methodology">
<img class="methodology-characters" src="/static/images/methodology-characters.png" alt="" width="984" height="354" loading="lazy" />
</div>
</section>
</main>
{% endblock %}
16 changes: 12 additions & 4 deletions src/templates/en/2020/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,19 @@
{% block twitter_image_alt %}The {{ year }} Web Almanac{% endblock %}

{% block date_published %}2019-11-04T12:00:00.000Z{% endblock %}
{% block date_modified %}2020-06-27T00:00:00.000Z{% endblock %}
{% block date_modified %}2020-07-03T00:00:00.000Z{% endblock %}

{% block intro_title %}Web Almanac{% endblock %}
{% block intro_sub_title %}HTTP Archive's annual<br> <b>state of the web</b> report{% endblock %}
{% block intro_title %}Coming soon!{% endblock %}
{% block intro_sub_title %}The 2020 <b>state of the web</b> report{% endblock %}

{% block mission %}
Coming Soon...
<p>
Experts from around the web community are currently hard at work planning, analyzing, and writing content for the 2020 edition of the Web Almanac, which is on track to be published at the end of the year.
</p>

<p>
There are many opportunities available for new contributors to join the project, including: authors, reviewers, analysts, editors, translators, and developers. If you're interested in contributing to the 2020 edition, we'd love to have you!
</p>

<a href="https://github.com/HTTPArchive/almanac.httparchive.org#contributing" class="btn">Join us</a>
{% endblock %}
16 changes: 12 additions & 4 deletions src/templates/es/2020/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,19 @@
{% block twitter_image_alt %}Web Almanac {{ year }}{% endblock %}

{% block date_published %}2019-11-04T12:00:00.000Z{% endblock %}
{% block date_modified %}2020-06-27T00:00:00.000Z{% endblock %}
{% block date_modified %}2020-07-03T00:00:00.000Z{% endblock %}

{% block intro_title %}Web Almanac{% endblock %}
{% block intro_sub_title %}HTTP Archive informe del<br><b>estado de la web</b> anual{% endblock %}
{% block intro_title %}Coming soon!{% endblock %}
{% block intro_sub_title %}The 2020 <b>state of the web</b> report{% endblock %}
rviscomi marked this conversation as resolved.
Show resolved Hide resolved

{% block mission %}
Próximamente...
rviscomi marked this conversation as resolved.
Show resolved Hide resolved
<p>
Experts from around the web community are currently hard at work planning, analyzing, and writing content for the 2020 edition of the Web Almanac, which is on track to be published at the end of the year.
</p>

<p>
There are many opportunities available for new contributors to join the project, including: authors, reviewers, analysts, editors, translators, and developers. If you're interested in contributing to the 2020 edition, we'd love to have you!
</p>

<a href="https://github.com/HTTPArchive/almanac.httparchive.org#contributing" class="btn">Join us</a>
rviscomi marked this conversation as resolved.
Show resolved Hide resolved
{% endblock %}
16 changes: 12 additions & 4 deletions src/templates/fr/2020/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,19 @@
{% block twitter_image_alt %}Web Almanac {{ year }}{% endblock %}

{% block date_published %}2019-11-04T12:00:00.000Z{% endblock %}
{% block date_modified %}2020-06-27T00:00:00.000Z{% endblock %}
{% block date_modified %}2020-07-03T00:00:00.000Z{% endblock %}

{% block intro_title %}Web Almanac{% endblock %}
{% block intro_sub_title %}Rapport annuel<br>de HTTP Archive sur<br><b>l’état du Web</b>{% endblock %}
{% block intro_title %}Coming soon!{% endblock %}
{% block intro_sub_title %}The 2020 <b>state of the web</b> report{% endblock %}

{% block mission %}
Bientôt disponible...
rviscomi marked this conversation as resolved.
Show resolved Hide resolved
<p>
Experts from around the web community are currently hard at work planning, analyzing, and writing content for the 2020 edition of the Web Almanac, which is on track to be published at the end of the year.
</p>

<p>
There are many opportunities available for new contributors to join the project, including: authors, reviewers, analysts, editors, translators, and developers. If you're interested in contributing to the 2020 edition, we'd love to have you!
</p>

<a href="https://github.com/HTTPArchive/almanac.httparchive.org#contributing" class="btn">Join us</a>
{% endblock %}
16 changes: 12 additions & 4 deletions src/templates/ja/2020/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,19 @@
{% block twitter_image_alt %}The {{ year }} Web Almanac{% endblock %}

{% block date_published %}2019-11-04T12:00:00.000Z{% endblock %}
{% block date_modified %}2020-06-27T00:00:00.000Z{% endblock %}
{% block date_modified %}2020-07-03T00:00:00.000Z{% endblock %}

{% block intro_title %}Web Almanac{% endblock %}
{% block intro_sub_title %}HTTP Archiveの年次報告書<br> <b>ウェブの状態</b>レポート{% endblock %}
{% block intro_title %}Coming soon!{% endblock %}
{% block intro_sub_title %}The 2020 <b>state of the web</b> report{% endblock %}

{% block mission %}
近日公開
rviscomi marked this conversation as resolved.
Show resolved Hide resolved
<p>
Experts from around the web community are currently hard at work planning, analyzing, and writing content for the 2020 edition of the Web Almanac, which is on track to be published at the end of the year.
</p>

<p>
There are many opportunities available for new contributors to join the project, including: authors, reviewers, analysts, editors, translators, and developers. If you're interested in contributing to the 2020 edition, we'd love to have you!
</p>

<a href="https://github.com/HTTPArchive/almanac.httparchive.org#contributing" class="btn">Join us</a>
{% endblock %}