Merge pull request #14 from AssetMantle/jathin-halloween

reverted back from halloween changes
AssetMantle · Nov 8, 2022 · e3f4ac4 · e3f4ac4
2 parents 1dbb99a + 09eef24
commit e3f4ac4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/src/assets/scss/index.css b/src/assets/scss/index.css
@@ -3701,11 +3701,6 @@ ul li em {
   display: block;
 }
 
-.halloween-logo{
-  width: 180px;
-  height: 30px;
-}
-
 .dark-mode .header .navbar .header-logo {
   background: url(../../../src/assets/images/footer_logo.svg) no-repeat;
   background-size: contain;

diff --git a/src/containers/Common/DashboardHeader.js b/src/containers/Common/DashboardHeader.js
@@ -4,7 +4,6 @@ import {NavLink, useHistory} from 'react-router-dom';
 import {Nav, Navbar, NavDropdown} from "react-bootstrap";
 import logo from "../../assets/images/footer_logo.svg";
 import ReactQRCode from "qrcode.react";
-import pumpkin from "../../assets/images/Pumpkin.svg";
 import Copy from "../../components/Copy";
 import {useTranslation} from "react-i18next";
 import Darktheme from "../DarkTheme";
@@ -96,8 +95,7 @@ const DashboardHeader = () => {
                     </div>
                     <Navbar.Brand>
                         <NavLink to="/" >
-                            <img className='halloween-logo' src={logo} alt="logo"/>
-                            <img style={{maxWidth: "30px",marginTop: "40px",marginLeft: "-10px",rotate: "15deg",}} src={pumpkin} alt="logo"/>
+                            <img className="header-logo" src={logo} alt="logo"/>
                         </NavLink>
                     </Navbar.Brand>
 

diff --git a/src/views/Homepage/index.js b/src/views/Homepage/index.js
@@ -1,7 +1,6 @@
 import React, {useState} from "react";
 import {Nav, Navbar, NavLink} from "react-bootstrap";
 import logo from "../../assets/images/footer_logo.svg";
-import pumpkin from "../../assets/images/Pumpkin.svg";
 // import dark_icon from "../../assets/images/dark_icon.svg";
 import ModalCreateWallet from "../../containers/CreateWallet/ModalCreateWallet";
 import Footer from "../../components/Footer";
@@ -39,7 +38,6 @@ const Homepage = () => {
                 <div className="container">
                     <Navbar.Brand><Nav.Link>
                         <img src={logo} alt="logo"/>
-                        <img style={{maxWidth: "30px",marginTop: "40px",marginLeft: "-10px",rotate: "15deg",}} src={pumpkin} alt="logo"/>
                     </Nav.Link></Navbar.Brand>
                     <Navbar.Toggle aria-controls="responsive-navbar-nav"/>
                     <Navbar.Collapse id="responsive-navbar-nav">