Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
rhnmht30 authored May 30, 2020
2 parents 3a92f4a + 03b7aba commit 6e0fa19
Show file tree
Hide file tree
Showing 11 changed files with 1,518 additions and 37 deletions.
57 changes: 29 additions & 28 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
.next
# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build
/out
.netlify

# misc
.DS_Store
.env
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*

.vercel
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
.next
# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build
/out
.netlify

# misc
.DS_Store
.env
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*

.vercel
out
2 changes: 1 addition & 1 deletion components/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const LottieImage = styled.div`
@media (max-width: 768px) {
display: none;
}
pointer-events: none;
/* pointer-events: none; mak ko isse dikkt hai*/
`;

const Header = () => {
Expand Down
3 changes: 3 additions & 0 deletions components/Layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import SEO from "./Seo";
const Layout = props => (
<div>
<SEO metaData={config} />
<script>
{(console.log = console.warn = console.error = () => {})}
</script>
<Navbar />
<div className="container">{props.children}</div>
<Footer />
Expand Down
6 changes: 3 additions & 3 deletions components/Notice.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import React, { useState, useEffect } from "react";
import styled from "styled-components";
import Link from "next/link";

const NoticeTitle = styled.h4`
const NoticeTitle = styled.h5`
font-family: Sen;
font-weight: 700;
`;

const NoticeHeading = styled.h5`
const NoticeHeading = styled.h4`
font-family: Sen;
font-weight: 900;
`;
Expand Down Expand Up @@ -80,7 +80,7 @@ const Notice = ({ notice }) => {
<Paragraph>{text}</Paragraph>
</div>
<div>
<Button target="_blank" href={link}>
<Button target="_blank" href={link} rel="noopener">
Register
</Button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions components/Seo.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const SEO = ({ metaData }) => {
content="width=device-width,initial-scale=1, shrink-to-fit=no"
/>
<meta name="theme-color" content="#222222" />
<link rel="shortcut icon" href="/static/favicon_io/favicon.ico" />
<link rel="shortcut icon" href="/favicon.ico" />
<link
rel="apple-touch-icon"
sizes="180x180"
Expand All @@ -31,7 +31,7 @@ const SEO = ({ metaData }) => {
/>
<link
rel="manifest"
href="/static/favicon_io/site.webmanifest"
href="/manifest.json"
></link>

<link rel="canonical" href={metaData.url} />
Expand Down
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[build]
command = "npm run build && npm run export"
command = "yarn build && yarn export"
publish = "out"
Loading

0 comments on commit 6e0fa19

Please sign in to comment.