You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ka...@apache.org on 2019/10/26 12:19:59 UTC

[airflow-site] branch aip-11 updated: Add blog tags (#89)

This is an automated email from the ASF dual-hosted git repository.

kamilbregula pushed a commit to branch aip-11
in repository https://gitbox.apache.org/repos/asf/airflow-site.git


The following commit(s) were added to refs/heads/aip-11 by this push:
     new 0102ed4  Add blog tags (#89)
0102ed4 is described below

commit 0102ed486bdd9647ebba4dbedbebe8c3d57b20e6
Author: Kamil Gabryjelski <ka...@gmail.com>
AuthorDate: Sat Oct 26 14:19:51 2019 +0200

    Add blog tags (#89)
---
 landing-pages/site/assets/scss/_blog-page.scss     | 29 +++++++++++++++++++---
 landing-pages/site/config.toml                     |  3 +++
 landing-pages/site/layouts/blog/content.html       |  6 +++--
 landing-pages/site/layouts/blog/list.html          | 11 ++++++++
 .../site/layouts/partials/boxes/blogpost.html      |  6 +++--
 landing-pages/site/layouts/taxonomy/tag.html       | 13 ++++++++++
 6 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/landing-pages/site/assets/scss/_blog-page.scss b/landing-pages/site/assets/scss/_blog-page.scss
index 0c6f581..09f92ba 100644
--- a/landing-pages/site/assets/scss/_blog-page.scss
+++ b/landing-pages/site/assets/scss/_blog-page.scss
@@ -16,15 +16,36 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 @import "colors";
 
 .tag {
   @extend .bodytext__medium--cerulean-blue;
-  background-color: #d9ebfc; // cerulean-blue + opacity 0.15
-  padding: 1px 30px;
-  margin-right: 10px;
+  display: block;
+  background-color: rgba(map-get($colors, cerulean-blue), 0.25);
+  padding: 1px 15px;
   border-radius: 5px;
+  transition: .2s;
+  margin: 7px 7px;
+
+  &.active, &:hover {
+    background-color: map-get($colors, cerulean-blue);
+    color: map-get($colors, white);
+  }
+}
+
+.all-tags-container {
+  display: flex;
+  justify-content: center;
+  flex-wrap: wrap;
+  margin: 30px 15px;
+}
+
+.new-entry {
+  margin: 30px 0 20px;
+  &--link {
+    @extend .bodytext__medium--cerulean-blue;
+    font-weight: 500;
+  }
 }
 
 .blogpost-content {
diff --git a/landing-pages/site/config.toml b/landing-pages/site/config.toml
index 557b916..961a8ef 100644
--- a/landing-pages/site/config.toml
+++ b/landing-pages/site/config.toml
@@ -168,3 +168,6 @@ toLower = false
   [[related.indices]]
   name = "author"
   weight = 50.0
+
+[permalinks]
+tags = "/blog/tags/:slug/"
diff --git a/landing-pages/site/layouts/blog/content.html b/landing-pages/site/layouts/blog/content.html
index d44d157..a43beb9 100644
--- a/landing-pages/site/layouts/blog/content.html
+++ b/landing-pages/site/layouts/blog/content.html
@@ -19,8 +19,10 @@
 
 <div class="blogpost-content--header-wrapper">
     <div class="blogpost-content__metadata--container">
-        {{ range .Params.tags }}
-            <a class="tag" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a>
+        {{ range $tag := .Params.tags }}
+            {{ with $.Site.GetPage (printf "/tags/%s" $tag) }}
+                <a class="tag" href="{{ .Permalink }}">{{ humanize $tag }}</a>
+            {{ end }}
         {{ end }}
         <span class="bodytext__medium--brownish-grey">{{ .Date.Format "Mon, Jan 2, 2006" }}</span>
     </div>
diff --git a/landing-pages/site/layouts/blog/list.html b/landing-pages/site/layouts/blog/list.html
index 5856e62..c0bba46 100644
--- a/landing-pages/site/layouts/blog/list.html
+++ b/landing-pages/site/layouts/blog/list.html
@@ -20,6 +20,17 @@
 {{ define "main" }}
     <div>
         <h2 class="page-header">Blog</h2>
+        <div class="all-tags-container">
+            <a class="tag active" href="/blog/">All</a>
+            {{ range $name, $taxonomy := .Site.Taxonomies.tags }}
+                {{ with $.Site.GetPage (printf "/tags/%s" $name) }}
+                    <a class="tag" href="{{ .Permalink }}">{{ humanize $name }}</a>
+                {{ end }}
+            {{ end }}
+        </div>
+        <div class="new-entry">
+            <a class="new-entry--link" href="https://github.com">ADD YOUR ENTRY</a>
+        </div>
         <div class="list-items">
             {{ range .Pages }}
                 <div class="list-item list-item--wide">
diff --git a/landing-pages/site/layouts/partials/boxes/blogpost.html b/landing-pages/site/layouts/partials/boxes/blogpost.html
index cec82c4..91b1497 100644
--- a/landing-pages/site/layouts/partials/boxes/blogpost.html
+++ b/landing-pages/site/layouts/partials/boxes/blogpost.html
@@ -19,8 +19,10 @@
 
 <div class="box-event__blogpost">
     <div class="box-event__blogpost--metadata">
-        {{ range .Params.tags }}
-            <a class="tag" href="{{ "/tags/" | relLangURL }}{{ . | urlize }}">{{ . }}</a>
+        {{ range $tag := .Params.tags }}
+            {{ with $.Site.GetPage (printf "/tags/%s" $tag) }}
+                <a class="tag" href="{{ .Permalink }}">{{ humanize $tag }}</a>
+            {{ end }}
         {{ end }}
         <span class="bodytext__medium--brownish-grey">{{ .Date.Format "Mon, Jan 2, 2006" }}</span>
     </div>
diff --git a/landing-pages/site/layouts/taxonomy/tag.html b/landing-pages/site/layouts/taxonomy/tag.html
index 5856e62..81e55e8 100644
--- a/landing-pages/site/layouts/taxonomy/tag.html
+++ b/landing-pages/site/layouts/taxonomy/tag.html
@@ -18,8 +18,21 @@
 */}}
 
 {{ define "main" }}
+    {{ $pageUrl := .Permalink }}
     <div>
         <h2 class="page-header">Blog</h2>
+        <div class="all-tags-container">
+            <a class="tag" href="/blog/">All</a>
+            {{ range $name, $taxonomy := .Site.Taxonomies.tags }}
+                {{ with $.Site.GetPage (printf "/tags/%s" $name) }}
+                    <a class="tag {{if eq .Permalink $pageUrl}}active{{ end }}"
+                       href="{{ .Permalink }}">{{ humanize $name }}</a>
+                {{ end }}
+            {{ end }}
+        </div>
+        <div class="new-entry">
+            <a class="new-entry--link" href="https://github.com">ADD YOUR ENTRY</a>
+        </div>
         <div class="list-items">
             {{ range .Pages }}
                 <div class="list-item list-item--wide">