You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ru...@apache.org on 2020/08/31 23:41:30 UTC

[incubator-superset-site] 25/26: make required changes

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

rusackas pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-superset-site.git

commit 3297b572907c10839e60391b1a56d9d1cb13c67a
Author: Phillip Kelley-Dotson <pk...@yahoo.com>
AuthorDate: Mon Aug 31 16:37:39 2020 -0700

    make required changes
---
 gatsby-config.js                          |   5 +-
 src/components/footer.tsx                 | 110 +++++++++++++-----------------
 src/components/image.tsx                  |  10 +--
 src/components/layout.tsx                 |   3 +
 src/images/superset-logo-horiz-apache.png | Bin 0 -> 121779 bytes
 src/pages/index.tsx                       |  20 +++++-
 6 files changed, 73 insertions(+), 75 deletions(-)

diff --git a/gatsby-config.js b/gatsby-config.js
index e582ac4..dd2cace 100644
--- a/gatsby-config.js
+++ b/gatsby-config.js
@@ -25,10 +25,7 @@ module.exports = {
         name: `gatsby-starter-default`,
         short_name: `starter`,
         start_url: `/`,
-        //background_color: `#663399`,
-        //theme_color: `#663399`,
-        //display: `minimal-ui`,
-        //icon: `src/images/gatsby-icon.png`, // This path is relative to the root of the site.
+        icon: `src/images/s.png`, // This path is relative to the root of the site.
       },
     },
     // this (optional) plugin enables Progressive Web App + Offline functionality
diff --git a/src/components/footer.tsx b/src/components/footer.tsx
index 0c58b48..3a3e743 100644
--- a/src/components/footer.tsx
+++ b/src/components/footer.tsx
@@ -13,54 +13,41 @@ const footerStyle = css`
   background-color: #323232; 
   color: #ccc;
   .apacheLinks {
+    float: right;
+    margin-top: 25px;
     a {
       color: white;
       margin: 5px;
     }
   }
+  .disclaimer {
+    margin-top: 8px;
+  }
 `;
 
 const iconContainerStyle = css`
-  height: 100px;
   background-color: #323232; 
   display: flex;
   flex-direction: row;
+  margin-bottom: 8px;
   .icons {
     float: right;
     width: 50%;
     svg {
-      margin-top: 15px;
+      margin-top: 8px;
       color: #ccc;
-      width: 60px;
-      height: 60px;
+      width: 40px;
+      height: 40px;
       margin-left: 10px; 
     }
     .svg {
-      width: 60px;
-      height: 60px;
-      margin-top: -35px;
+      width: 50px;
+      height: 50px;
+      margin-top: -28px;
     }
   }
   .communityBtn {
     width: 50%;
-    .joinCommunity {
-      float: right;
-      display: flex;
-      flex-direction: row;
-      Button {
-        margin-top: 31px;
-        margin-right: 20px;
-        float: right;
-      }
-      #head {
-        margin-top: 38px;
-        margin-right: 15px;
-        font-size: 17px;
-        font-weight: 500;
-        color: white;
-        display: block;
-      }
-    }
   }
 `;
 
@@ -81,59 +68,54 @@ const LayoutFooter = () => (
           </a>
         </div>
         <div className="communityBtn">
-          <div className="joinCommunity">
-            <span id="head"> Want to be part of Apache Superset?</span>
-            <Link to="/community">
-              <Button type="primary" size="large">
-                Join the Community!
-              </Button>
-            </Link>
-          </div>
+          <div className="apacheLinks">
+            <a 
+              href="https://www.apache.org/security/" 
+              target="_blank"
+            >
+              Security &nbsp;|
+            </a>
+            <a 
+              href="https://www.apache.org/foundation/sponsorship.html" 
+              target="_blank"
+            >
+              Donate &nbsp;|
+            </a>
+
+            <a 
+              href="https://www.apache.org/foundation/thanks.html" 
+              target="_blank"
+            >
+              Thanks &nbsp;| 
+            </a>
+            <a 
+              href="https://www.apache.org/licenses/"
+              target="_blank" 
+            >
+              License
+            </a>
+          </div> 
         </div>
       </div>
-      © Copyright {new Date().getFullYear()}, 
+      © The Apache Software Foundation {new Date().getFullYear()} <br /> 
+      Apache Superset, Superset, Apache, the Apache feather logo, 
+      and the Apache Superset project logo are either registered trademarks <br />
+      or trademarks of 
       <a 
         href="http://www.apache.org/"
         target="_blank"
       >
         &nbsp;The Apache Software Fountation
       </a>
-       , &nbsp;Licensed under the Apache 
-      <a 
-        href="https://www.apache.org/licenses/"
-        target="_blank" 
-      >
-        &nbsp;License.
-      </a> <br/>
-
-      <div>
+      &nbsp;in the United States and other countries.
+      <div className="disclaimer">
         Disclaimer: Apache Superset is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. 
         Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, 
         and decision making process have stabilized in a manner consistent with other successful ASF projects. 
         While incubation status is not necessarily a reflection of the completeness or stability of the code,
         it does indicate that the project has yet to be fully endorsed by the ASF.  
       </div>
-      <div className="apacheLinks">
-        <a 
-          href="https://www.apache.org/security/" 
-          target="_blank"
-        >
-          Security &nbsp;|
-        </a>
-        <a 
-          href="https://www.apache.org/foundation/sponsorship.html" 
-          target="_blank"
-        >
-          Donate &nbsp;|
-        </a>
-
-        <a 
-          href="https://www.apache.org/foundation/thanks.html" 
-          target="_blank"
-        >
-          Thanks 
-        </a>
-      </div>
+      
     </Footer>
   </>
 );
diff --git a/src/components/image.tsx b/src/components/image.tsx
index 35a7d71..551eee7 100644
--- a/src/components/image.tsx
+++ b/src/components/image.tsx
@@ -1,6 +1,6 @@
-import React from "react"
-import { useStaticQuery, graphql } from "gatsby"
-import Img from "gatsby-image"
+import React from "react";
+import { useStaticQuery, graphql } from "gatsby";
+import Img from "gatsby-image";
 
 interface Props {
   imageName?: string;
@@ -13,9 +13,9 @@ interface Props {
 const Image = ({ imageName, type, width, height, ...otherProps}):Props => {
   const data = useStaticQuery(graphql`
     query {
-      logoSm: file(relativePath: { eq: "src/images/s.png" }) {
+      logoSm: file(relativePath: { eq: "src/images/superset-logo-horiz-apache.png" }) {
         childImageSharp {
-          fixed(width: 60) {
+          fixed(width: 223) {
             ...GatsbyImageSharpFixed
           }
         }
diff --git a/src/components/layout.tsx b/src/components/layout.tsx
index ee2b7fd..3a972ef 100644
--- a/src/components/layout.tsx
+++ b/src/components/layout.tsx
@@ -30,6 +30,9 @@ const headerStyle = css`
   width: 100%;
   box-shadow: 0 2px 6px 0 rgba(0,0,0,.12);
   z-index: 1;
+  .gatsby-image-wrapper {
+    margin-top: 6px;
+  }
   .ant-menu {
     background: transparent;
   }
diff --git a/src/images/superset-logo-horiz-apache.png b/src/images/superset-logo-horiz-apache.png
new file mode 100644
index 0000000..ea2b336
Binary files /dev/null and b/src/images/superset-logo-horiz-apache.png differ
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index 81c0bc7..34f80e2 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -126,7 +126,15 @@ const integrationSection = css`
       margin: 20px;
     }
   }
-
+  .joinCommunity {
+    text-align: center;
+    #head {
+      display: block;
+      font-size: 35px;
+      margin-bottom: 20px;
+      margin-top: 80px;
+    }
+  }
 `;
 
 const linkCarousel = css`
@@ -260,7 +268,7 @@ const Theme = () => {
                 <div className="toggle" onClick={()=>slider.current.goTo(2)}>
                   <h3>Investigate</h3>
                   <span>
-                    Use sqlab to write queries to explore your data
+                    Use SQL Lab to write queries to explore your data
                   </span>
                 </div>
             </div>
@@ -290,6 +298,14 @@ const Theme = () => {
             ))}
           </ul>
           <span className="databaseSub"> .. and any other SQLAlchemy <a href="https://superset.incubator.apache.org/installation.html#database-dependencies"> compatible data source. </a> </span>
+          <div className="joinCommunity">
+            <span id="head"> Want to be part of Apache Superset?</span>
+            <Link to="/community">
+              <Button type="primary" size="large">
+                Join the Community!
+              </Button>
+            </Link>
+          </div> 
         </div>
       </Layout>
     </ThemeProvider>