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/11/15 12:04:29 UTC

[airflow-site] branch aip-11 updated: Add disclaimer to footer (#163)

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 cd5d8cd  Add disclaimer to footer (#163)
cd5d8cd is described below

commit cd5d8cd291d1288f1244f372908c789b9199d9ee
Author: Kamil Gabryjelski <ka...@gmail.com>
AuthorDate: Fri Nov 15 13:04:22 2019 +0100

    Add disclaimer to footer (#163)
---
 landing-pages/site/assets/scss/_footer.scss        | 13 ++++-
 landing-pages/site/layouts/partials/footer.html    | 28 +++++----
 .../sphinx_airflow_theme/footer.html               | 66 ++++++++++++----------
 3 files changed, 65 insertions(+), 42 deletions(-)

diff --git a/landing-pages/site/assets/scss/_footer.scss b/landing-pages/site/assets/scss/_footer.scss
index 3e4fa66..9d56a37 100644
--- a/landing-pages/site/assets/scss/_footer.scss
+++ b/landing-pages/site/assets/scss/_footer.scss
@@ -26,7 +26,6 @@ footer {
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;
-    align-items: center;
 
     span {
       @extend .bodytext__medium--white;
@@ -54,6 +53,7 @@ footer {
       padding: 30px 60px;
       background-color: map-get($colors, slate-grey);
       font-size: 12px;
+      flex-direction: column !important;
 
       span {
         font-size: 12px;
@@ -79,6 +79,17 @@ footer {
           }
         }
       }
+
+      &--disclaimer {
+        display: block;
+        max-width: 600px;
+        color: map-get($colors, very-light-pink) !important;
+        margin-top: 16px;
+
+        @media (min-width: $fullhd) {
+          max-width: 800px;
+        }
+      }
     }
   }
 
diff --git a/landing-pages/site/layouts/partials/footer.html b/landing-pages/site/layouts/partials/footer.html
index a7ea861..2ccdc27 100644
--- a/landing-pages/site/layouts/partials/footer.html
+++ b/landing-pages/site/layouts/partials/footer.html
@@ -39,20 +39,26 @@
         </div>
     </div>
     <div class="footer-section footer-section__policies-section">
-        {{ with .Site.Params.copyright }}<span>&copy; {{ . }} {{ now.Format "2006" }}</span>{{ end }}
-        <div class="footer-section__policies-section--policies">
-            {{ with $links }}
-                {{ with index . "policies"}}
-                    {{ range . }}
-                        <a href="{{ .url }}" class="footer-section__policies-section--policy-item">
-                            <span>{{ .name }}</span>
-                        </a>
+        <div class="footer-section">
+            {{ with .Site.Params.copyright }}<span>&copy; {{ . }} {{ now.Format "2006" }}</span>{{ end }}
+            <div class="footer-section__policies-section--policies">
+                {{ with $links }}
+                    {{ with index . "policies"}}
+                        {{ range . }}
+                            <a href="{{ .url }}" class="footer-section__policies-section--policy-item">
+                                <span>{{ .name }}</span>
+                            </a>
+                        {{ end }}
                     {{ end }}
                 {{ end }}
-            {{ end }}
-            <div class="footer-section__policies-section--language-toggle">
-                {{ partial "lang-selector" . }}
+                <div class="footer-section__policies-section--language-toggle">
+                    {{ partial "lang-selector" . }}
+                </div>
             </div>
         </div>
+        <span class="footer-section__policies-section--disclaimer">
+            Apache Airflow, Apache, Airflow, the Airflow logo, and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation.
+            All other products or name brands are trademarks of their respective holders, including The Apache Software Foundation.
+        </span>
     </div>
 </footer>
diff --git a/sphinx_airflow_theme/sphinx_airflow_theme/footer.html b/sphinx_airflow_theme/sphinx_airflow_theme/footer.html
index f0a3c11..c7ce5e5 100644
--- a/sphinx_airflow_theme/sphinx_airflow_theme/footer.html
+++ b/sphinx_airflow_theme/sphinx_airflow_theme/footer.html
@@ -100,49 +100,55 @@
         </div>
     </div>
     <div class="footer-section footer-section__policies-section">
-        <span>© The Apache Software Foundation 2019</span>
-        <div class="footer-section__policies-section--policies">
+        <div class="footer-section">
+            <span>© The Apache Software Foundation 2019</span>
+            <div class="footer-section__policies-section--policies">
 
-            <a href="https://www.apache.org/licenses/" class="footer-section__policies-section--policy-item">
-                <span>License</span>
-            </a>
+                <a href="https://www.apache.org/licenses/" class="footer-section__policies-section--policy-item">
+                    <span>License</span>
+                </a>
 
-            <a href="https://www.apache.org/foundation/sponsorship.html" class="footer-section__policies-section--policy-item">
-                <span>Donate</span>
-            </a>
+                <a href="https://www.apache.org/foundation/sponsorship.html" class="footer-section__policies-section--policy-item">
+                    <span>Donate</span>
+                </a>
 
-            <a href="https://www.apache.org/foundation/thanks.html" class="footer-section__policies-section--policy-item">
-                <span>Thanks</span>
-            </a>
+                <a href="https://www.apache.org/foundation/thanks.html" class="footer-section__policies-section--policy-item">
+                    <span>Thanks</span>
+                </a>
 
-            <a href="https://www.apache.org/security/" class="footer-section__policies-section--policy-item">
-                <span>Security</span>
-            </a>
+                <a href="https://www.apache.org/security/" class="footer-section__policies-section--policy-item">
+                    <span>Security</span>
+                </a>
 
-            <a href="/docs" class="footer-section__policies-section--policy-item">
-                <span>Season of Docs</span>
-            </a>
+                <a href="/docs" class="footer-section__policies-section--policy-item">
+                    <span>Season of Docs</span>
+                </a>
 
-            <a href="/" class="footer-section__policies-section--policy-item">
-                <span>Privacy policy &amp; terms</span>
-            </a>
+                <a href="/" class="footer-section__policies-section--policy-item">
+                    <span>Privacy policy &amp; terms</span>
+                </a>
 
-            <a href="/" class="footer-section__policies-section--policy-item">
-                <span>Cookies</span>
-            </a>
+                <a href="/" class="footer-section__policies-section--policy-item">
+                    <span>Cookies</span>
+                </a>
 
-            <div class="footer-section__policies-section--language-toggle">
+                <div class="footer-section__policies-section--language-toggle">
 
-                <a class="dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <span>English</span>
-                </a>
-                <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
+                    <a class="dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <span>English</span>
+                    </a>
+                    <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
 
-                    <a class="dropdown-item" href="/no/">Norsk</a>
+                        <a class="dropdown-item" href="/no/">Norsk</a>
 
-                </div>
+                    </div>
 
+                </div>
             </div>
         </div>
+        <span class="footer-section__policies-section--disclaimer">
+            Apache Airflow, Apache, Airflow, the Airflow logo, and the Apache feather logo are either registered trademarks or trademarks of The Apache Software Foundation.
+            All other products or name brands are trademarks of their respective holders, including The Apache Software Foundation.
+        </span>
     </div>
 </footer>