Merge branch 'master' of gitlab.com:amfoss/website

components/theme/footerNav.js

@@ -75,6 +75,9 @@ const FooterNav = () => (
  <li>
  <a href="/news">Press & Media</a>
  </li>
+ <li>
+ <a href="/branding">Branding</a>
+ </li>
  </ul>
  </div>
  </div>

content/alumniImage.json

@@ -33,24 +33,57 @@
  "image": "logos/alumni-company/11_vmware.svg"
  },
  {
- "image": "logos/alumni-company/flipkart.svg"
+ "image": "logos/alumni-company/12_amazon.svg"
  },
  {
- "image": "logos/alumni-company/goldman-sachs.svg"
+ "image": "logos/alumni-company/13_walmart.svg"
  },
  {
- "image": "logos/alumni-company/motorola.svg"
+ "image": "logos/alumni-company/14_cern.svg"
  },
  {
- "image": "logos/alumni-company/ola-cabs.svg"
+ "image": "logos/alumni-company/15_isro.svg"
  },
  {
- "image": "logos/alumni-company/reuters.svg"
+ "image": "logos/alumni-company/16_flipkart.svg"
  },
  {
- "image": "logos/alumni-company/sap.svg"
+ "image": "logos/alumni-company/17_goldman-sachs.svg"
  },
  {
- "image": "logos/alumni-company/verisign.svg"
+ "image": "logos/alumni-company/18_ola-cabs.svg"
+ },
+ {
+ "image": "logos/alumni-company/19_reuters.svg"
+ },
+ {
+ "image": "logos/alumni-company/20_oracle.svg"
+ },
+ {
+ "image": "logos/alumni-company/21_salesforce.svg"
+ },
+ {
+ "image": "logos/alumni-company/22_samsung.svg"
+ },
+ {
+ "image": "logos/alumni-company/23_sap.svg"
+ },
+ {
+ "image": "logos/alumni-company/24_bitergia.svg"
+ },
+ {
+ "image": "logos/alumni-company/25_dell.svg"
+ },
+ {
+ "image": "logos/alumni-company/26_motorola.svg"
+ },
+ {
+ "image": "logos/alumni-company/27_verisign.svg"
+ },
+ {
+ "image": "logos/alumni-company/28_hackerrank.svg"
+ },
+ {
+ "image": "logos/alumni-company/29_okta.svg"
  }
 ]

pages/blog/[slug].js

@@ -57,7 +57,6 @@ export default function BlogTemplate(props) {
  slug={data.slug}
  description={data.description.replace(/<\/?[^>]+(>|$)/g, "").substring(0,255)}
  keywords={data.tags ? data.tags.join(', ') : null}
- image={`https://api.amfoss.in/${data.cover}`}
  />
  <TitleBar title={data.title} type="h3" />
  <div className="row mx-2 my-4">

pages/blog/index.js

@@ -75,7 +75,7 @@ const News = () => {
  <Layout>
  <SEO
  title="Blog"
- description="Visit the official amFOSS blog to catch  everything latest in tech and FOSS"
+ description="Visit the official amFOSS blog to catch everything latest in tech and FOSS"
  />
  <TitleBar title="Blog" />
  <div className="row m-0 p-1">

pages/branding.js

@@ -0,0 +1,181 @@
+import React, { useEffect, useState } from 'react';
+import Layout from '../components/layout';
+import SEO from '../components/seo';
+import TitleBar from '../components/theme/titleBar';
+
+import Link from 'next/link';
+
+const Branding = () => (
+ <Layout>
+ <SEO title="Branding" />
+ <TitleBar title="Branding" />
+ <div class="container">
+ <div class="row m-0 my-4">
+ <div class="col-sm-8 col-md-4 offset-md-2 col-xl-4 bg-white vertical-align">
+ <div class=" col-12 ">
+ The official amFOSS logo is used to brand and identify amFOSS projects
+ and content.
+ </div>
+ </div>
+ <div class="col-sm-8 col-md-6 col-xl-4 bg-white">
+ <table class="table_view">
+ <tr>
+ <td colspan="2">
+ <div id="img-main">
+ <Link href="/branding/SLOGAN-BLACK.png">
+ <img class="img" src={'SLOGAN-BLACK.svg'} alt="logo" />
+ </Link>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div class="badge">
+ <div class="badge-yellow p-2 m-1">
+ <p>#FFC107</p>
+ <p>PMS 7548 C</p>
+ </div>
+ </div>
+ </td>
+ <td>
+ <div class="badge">
+ <div class="badge-black p-2 m-1">
+ <p>#000000</p>
+ <p>Black</p>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+
+ <div class="row m-0 my-4">
+ <div class="col-sm-6 col-md-3 col-xl-3 offset-sm-3 ">
+ <div class="card">
+ <div class="card-body">
+ <div id="img-top">
+ <img class="img" src={'SLOGAN-BLACK.png'} alt="logo" />
+ <p class="card-img-link">
+ <Link href="/branding/SLOGAN-BLACK.png">
+ <a>PNG</a>
+ </Link>{' '}
+ |{' '}
+ <Link href="/branding/SLOGAN-BLACK.svg">
+ <a>SVG</a>
+ </Link>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div className="col-sm-6 col-md-3 col-xl-3 ">
+ <div className="card-black ">
+ <div className="card-body">
+ <div id="img-black-top">
+ <img className="img" src={'SLOGAN-WHITE.png'} alt="logo" />
+ <p className="card-img-link">
+ <Link href="/branding/SLOGAN-WHITE.png">
+ <a>PNG |</a>
+ </Link>{' '}
+ <Link href="/branding/SLOGAN-WHITE.svg">
+ <a>SVG </a>
+ </Link>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div className="col-sm-8 col-md-6 offset-sm-3">
+ <p>
+ These variations can only be used when under size constraints and when the
+ primary logo is not prominent.
+ </p>
+ </div>
+ <div className="row m-0 my-4">
+ <div className="col-sm-6 col-md-3 col-xl-3 offset-sm-3">
+ <div className="card ">
+ <div className="card-body">
+ <div id="img-white-horizontal">
+ <img
+ className="img"
+ src={'HORIZONTAL-TEXT-BULB-BLACK.svg'}
+ alt="logo"
+ />
+ <p className="card-img-link">
+ <Link href="/branding/HORIZONTAL-TEXT-BULB-BLACK.png">
+ <a>PNG</a>
+ </Link>{' '}
+ |{' '}
+ <Link href="/branding/HORIZONTAL-TEXT-BULB-BLACK.svg">
+ <a>SVG</a>
+ </Link>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div className="col-sm-6 col-md-3 col-xl-3">
+ <div className="card-black">
+ <div className="card-body">
+ <div id="img-black-horizontal">
+ <img
+ className="img"
+ src={'HORIZONTAL-TEXT-BULB-WHITE.svg'}
+ alt="logo"
+ />
+ <p className="card-img-link">
+ <Link href="/branding/HORIZONTAL-TEXT-BULB-WHITE.png">
+ <a>PNG |</a>
+ </Link>{' '}
+ <Link href="/branding/HORIZONTAL-TEXT-BULB-WHITE.svg">
+ <a>SVG</a>
+ </Link>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div className="row m-0 my-4">
+ <div className="col-sm-6 col-md-3 col-xl-3 offset-sm-3">
+ <div className="card ">
+ <div className="card-body">
+ <div id="img-top">
+ <img className="img" src={'BULB-BLACK.png'} alt="logo" />
+ <p className="card-img-link">
+ <Link href="/branding/BULB-BLACK.png">
+ <a>PNG |</a>
+ </Link>{' '}
+ <Link href="/branding/BULB-BLACK.svg">
+ <a>SVG</a>
+ </Link>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div className="col-sm-6 col-md-3 col-xl-3">
+ <div className="card-black">
+ <div className="card-body">
+ <div id="img-black-top">
+ <img className="img" src={'BULB-WHITE.png'} alt="logo" />
+ <p className="card-img-link">
+ <Link href="/branding/BULB-WHITE.png">
+ <a>PNG |</a>
+ </Link>{' '}
+ <Link href="/branding/BULB-WHITE.svg">
+ <a>SVG </a>
+ </Link>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </Layout>
+);
+
+export default Branding;